tUse glib2 style callback function types - vaccinewars - be a doctor and try to vaccinate the world
(HTM) git clone git://src.adamsgaard.dk/vaccinewars
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 17194d6b571cc6c6eb35dbe7303cfb7a37fd03c9
(DIR) parent 0c0c599637def06697fab0a32d67dd6e1f0c7f0a
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Thu, 26 Nov 2020 00:59:19 -0800
Use glib2 style callback function types
Diffstat:
M src/gtkport/gtkport.c | 20 ++++++++++----------
M src/gtkport/gtkport.h | 20 ++++++++++----------
M src/gtkport/gtktypes.h | 6 +++---
M src/gtkport/treeview.h | 5 -----
4 files changed, 23 insertions(+), 28 deletions(-)
---
(DIR) diff --git a/src/gtkport/gtkport.c b/src/gtkport/gtkport.c
t@@ -3372,7 +3372,7 @@ void gtk_main()
typedef struct _GtkSignal GtkSignal;
struct _GtkSignal {
- GtkSignalFunc func;
+ GCallback func;
GObject *slot_object;
gpointer func_data;
};
t@@ -3380,7 +3380,7 @@ struct _GtkSignal {
typedef gint (*GtkGIntSignalFunc) ();
void gtk_marshal_BOOL__GINT(GObject *object, GSList *actions,
- GtkSignalFunc default_action, va_list args)
+ GCallback default_action, va_list args)
{
gboolean *retval;
gint arg1;
t@@ -3412,7 +3412,7 @@ void gtk_marshal_BOOL__GINT(GObject *object, GSList *actions,
}
void gtk_marshal_BOOL__GPOIN(GObject *object, GSList *actions,
- GtkSignalFunc default_action, va_list args)
+ GCallback default_action, va_list args)
{
gboolean *retval;
gpointer arg1;
t@@ -3444,7 +3444,7 @@ void gtk_marshal_BOOL__GPOIN(GObject *object, GSList *actions,
}
void gtk_marshal_VOID__VOID(GObject *object, GSList *actions,
- GtkSignalFunc default_action, va_list args)
+ GCallback default_action, va_list args)
{
GtkSignal *signal;
t@@ -3461,7 +3461,7 @@ void gtk_marshal_VOID__VOID(GObject *object, GSList *actions,
}
void gtk_marshal_VOID__GINT(GObject *object, GSList *actions,
- GtkSignalFunc default_action, va_list args)
+ GCallback default_action, va_list args)
{
gint arg1;
GtkSignal *signal;
t@@ -3481,7 +3481,7 @@ void gtk_marshal_VOID__GINT(GObject *object, GSList *actions,
}
void gtk_marshal_VOID__GPOIN(GObject *object, GSList *actions,
- GtkSignalFunc default_action, va_list args)
+ GCallback default_action, va_list args)
{
gpointer arg1;
GtkSignal *signal;
t@@ -3501,7 +3501,7 @@ void gtk_marshal_VOID__GPOIN(GObject *object, GSList *actions,
}
void gtk_marshal_VOID__BOOL(GObject *object, GSList *actions,
- GtkSignalFunc default_action, va_list args)
+ GCallback default_action, va_list args)
{
gboolean arg1;
GtkSignal *signal;
t@@ -3521,7 +3521,7 @@ void gtk_marshal_VOID__BOOL(GObject *object, GSList *actions,
}
void gtk_marshal_VOID__GINT_GINT_EVENT(GObject *object, GSList *actions,
- GtkSignalFunc default_action,
+ GCallback default_action,
va_list args)
{
gint arg1, arg2;
t@@ -3581,7 +3581,7 @@ void gtk_signal_emit(GObject *object, const gchar *name, ...)
}
guint g_signal_connect(GObject *object, const gchar *name,
- GtkSignalFunc func, gpointer func_data)
+ GCallback func, gpointer func_data)
{
GtkSignal *signal;
GtkSignalType *signal_type;
t@@ -3605,7 +3605,7 @@ guint g_signal_connect(GObject *object, const gchar *name,
}
guint g_signal_connect_swapped(GObject *object, const gchar *name,
- GtkSignalFunc func, GObject *slot_object)
+ GCallback func, GObject *slot_object)
{
GtkSignal *signal;
GtkSignalType *signal_type;
(DIR) diff --git a/src/gtkport/gtkport.h b/src/gtkport/gtkport.h
t@@ -324,7 +324,7 @@ extern HINSTANCE hInst;
#define GTK_MENU(obj) ((GtkMenu *)(obj))
#define GTK_MISC(obj) ((GtkMisc *)(obj))
#define GTK_PROGRESS_BAR(obj) ((GtkProgressBar *)(obj))
-#define GTK_SIGNAL_FUNC(f) ((GtkSignalFunc) f)
+#define G_CALLBACK(f) ((GCallback) (f))
#define GTK_OBJECT_FLAGS(obj) (GTK_OBJECT(obj)->flags)
#define GTK_WIDGET_FLAGS(wid) (GTK_OBJECT_FLAGS(wid))
t@@ -417,9 +417,9 @@ void gtk_toggle_button_set_active(GtkToggleButton *toggle_button,
void gtk_main_quit();
void gtk_main();
guint g_signal_connect(GObject *object, const gchar *name,
- GtkSignalFunc func, gpointer func_data);
+ GCallback func, gpointer func_data);
guint g_signal_connect_swapped(GObject *object, const gchar *name,
- GtkSignalFunc func,
+ GCallback func,
GObject *slot_object);
void gtk_signal_emit(GObject *object, const gchar *name, ...);
void SetCustomWndProc(WNDPROC wndproc);
t@@ -526,25 +526,25 @@ void gtk_window_set_position(GtkWindow *window, GtkWindowPosition position);
/* Functions for handling emitted signals */
void gtk_marshal_BOOL__GPOIN(GObject *object, GSList *actions,
- GtkSignalFunc default_action,
+ GCallback default_action,
va_list args);
void gtk_marshal_BOOL__GINT(GObject *object, GSList *actions,
- GtkSignalFunc default_action,
+ GCallback default_action,
va_list args);
void gtk_marshal_VOID__VOID(GObject *object, GSList *actions,
- GtkSignalFunc default_action,
+ GCallback default_action,
va_list args);
void gtk_marshal_VOID__BOOL(GObject *object, GSList *actions,
- GtkSignalFunc default_action,
+ GCallback default_action,
va_list args);
void gtk_marshal_VOID__GPOIN(GObject *object, GSList *actions,
- GtkSignalFunc default_action,
+ GCallback default_action,
va_list args);
void gtk_marshal_VOID__GINT(GObject *object, GSList *actions,
- GtkSignalFunc default_action,
+ GCallback default_action,
va_list args);
void gtk_marshal_VOID__GINT_GINT_EVENT(GObject *object, GSList *actions,
- GtkSignalFunc default_action,
+ GCallback default_action,
va_list args);
/* Private functions */
(DIR) diff --git a/src/gtkport/gtktypes.h b/src/gtkport/gtktypes.h
t@@ -62,9 +62,9 @@ typedef struct _GtkWidget GtkWidget;
typedef struct _GtkSignalType GtkSignalType;
typedef struct _GtkContainer GtkContainer;
-typedef void (*GtkSignalFunc) ();
+typedef void (*GCallback) (void);
typedef void (*GtkSignalMarshaller) (GObject *object, GSList *actions,
- GtkSignalFunc default_action,
+ GCallback default_action,
va_list args);
typedef struct _GdkColor GdkColor;
t@@ -94,7 +94,7 @@ struct _GtkAccelGroup {
struct _GtkSignalType {
gchar *name;
GtkSignalMarshaller marshaller;
- GtkSignalFunc default_action;
+ GCallback default_action;
};
struct _GdkColor {
(DIR) diff --git a/src/gtkport/treeview.h b/src/gtkport/treeview.h
t@@ -144,11 +144,6 @@ GtkCellRenderer *gtk_cell_renderer_text_new(void);
void g_object_unref(gpointer object);
gpointer g_object_ref(gpointer object);
-typedef void (*GCallback) (void);
-#define G_CALLBACK(f) ((GCallback) (f))
-void g_signal_connect(gpointer instance, const char *signal,
- GCallback handler, gpointer data);
-
/* Private functions */
void InitTreeViewClass(HINSTANCE hInstance);
#endif /* CYGWIN */