tReplace GtkObject with GObject - 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 b8b897faa17d39c4d8ab40b7fa0a11614158dd59
(DIR) parent 1f6a577947dc2b283f22d04d6e7f9a59d0d1b9d2
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Thu, 26 Nov 2020 00:42:45 -0800
Replace GtkObject with GObject
Diffstat:
M src/gtkport/gtkport.c | 42 ++++++++++++++++----------------
M src/gtkport/gtkport.h | 36 ++++++++++++++++----------------
M src/gtkport/gtktypes.h | 10 +++++-----
3 files changed, 44 insertions(+), 44 deletions(-)
---
(DIR) diff --git a/src/gtkport/gtkport.c b/src/gtkport/gtkport.c
t@@ -260,7 +260,7 @@ static GtkSignalType GtkObjectSignals[] = {
};
static GtkClass GtkObjectClass = {
- "object", NULL, sizeof(GtkObject), GtkObjectSignals, NULL
+ "object", NULL, sizeof(GObject), GtkObjectSignals, NULL
};
static GtkClass GtkAdjustmentClass = {
t@@ -636,9 +636,9 @@ void gtk_set_default_font(HWND hWnd)
mySendMessage(hWnd, WM_SETFONT, (WPARAM)defFont, MAKELPARAM(FALSE, 0));
}
-GtkObject *GtkNewObject(GtkClass *klass)
+GObject *GtkNewObject(GtkClass *klass)
{
- GtkObject *newObj;
+ GObject *newObj;
newObj = g_malloc0(klass->Size);
newObj->klass = klass;
t@@ -3373,13 +3373,13 @@ typedef struct _GtkSignal GtkSignal;
struct _GtkSignal {
GtkSignalFunc func;
- GtkObject *slot_object;
+ GObject *slot_object;
gpointer func_data;
};
typedef gint (*GtkGIntSignalFunc) ();
-void gtk_marshal_BOOL__GINT(GtkObject *object, GSList *actions,
+void gtk_marshal_BOOL__GINT(GObject *object, GSList *actions,
GtkSignalFunc default_action, va_list args)
{
gboolean *retval;
t@@ -3411,7 +3411,7 @@ void gtk_marshal_BOOL__GINT(GtkObject *object, GSList *actions,
*retval = (*sigfunc) (object, arg1);
}
-void gtk_marshal_BOOL__GPOIN(GtkObject *object, GSList *actions,
+void gtk_marshal_BOOL__GPOIN(GObject *object, GSList *actions,
GtkSignalFunc default_action, va_list args)
{
gboolean *retval;
t@@ -3443,7 +3443,7 @@ void gtk_marshal_BOOL__GPOIN(GtkObject *object, GSList *actions,
*retval = (*sigfunc) (object, arg1);
}
-void gtk_marshal_VOID__VOID(GtkObject *object, GSList *actions,
+void gtk_marshal_VOID__VOID(GObject *object, GSList *actions,
GtkSignalFunc default_action, va_list args)
{
GtkSignal *signal;
t@@ -3460,7 +3460,7 @@ void gtk_marshal_VOID__VOID(GtkObject *object, GSList *actions,
(*default_action) (object);
}
-void gtk_marshal_VOID__GINT(GtkObject *object, GSList *actions,
+void gtk_marshal_VOID__GINT(GObject *object, GSList *actions,
GtkSignalFunc default_action, va_list args)
{
gint arg1;
t@@ -3480,7 +3480,7 @@ void gtk_marshal_VOID__GINT(GtkObject *object, GSList *actions,
(*default_action) (object, arg1);
}
-void gtk_marshal_VOID__GPOIN(GtkObject *object, GSList *actions,
+void gtk_marshal_VOID__GPOIN(GObject *object, GSList *actions,
GtkSignalFunc default_action, va_list args)
{
gpointer arg1;
t@@ -3500,7 +3500,7 @@ void gtk_marshal_VOID__GPOIN(GtkObject *object, GSList *actions,
(*default_action) (object, arg1);
}
-void gtk_marshal_VOID__BOOL(GtkObject *object, GSList *actions,
+void gtk_marshal_VOID__BOOL(GObject *object, GSList *actions,
GtkSignalFunc default_action, va_list args)
{
gboolean arg1;
t@@ -3520,7 +3520,7 @@ void gtk_marshal_VOID__BOOL(GtkObject *object, GSList *actions,
(*default_action) (object, arg1);
}
-void gtk_marshal_VOID__GINT_GINT_EVENT(GtkObject *object, GSList *actions,
+void gtk_marshal_VOID__GINT_GINT_EVENT(GObject *object, GSList *actions,
GtkSignalFunc default_action,
va_list args)
{
t@@ -3544,7 +3544,7 @@ void gtk_marshal_VOID__GINT_GINT_EVENT(GtkObject *object, GSList *actions,
(*default_action) (object, arg1, arg2, arg3);
}
-static GtkSignalType *gtk_get_signal_type(GtkObject *object,
+static GtkSignalType *gtk_get_signal_type(GObject *object,
const gchar *name)
{
GtkClass *klass;
t@@ -3559,7 +3559,7 @@ static GtkSignalType *gtk_get_signal_type(GtkObject *object,
return NULL;
}
-void gtk_signal_emit(GtkObject *object, const gchar *name, ...)
+void gtk_signal_emit(GObject *object, const gchar *name, ...)
{
GSList *signal_list;
GtkSignalType *signal_type;
t@@ -3580,7 +3580,7 @@ void gtk_signal_emit(GtkObject *object, const gchar *name, ...)
g_warning("gtk_signal_emit: unknown signal %s", name);
}
-guint gtk_signal_connect(GtkObject *object, const gchar *name,
+guint gtk_signal_connect(GObject *object, const gchar *name,
GtkSignalFunc func, gpointer func_data)
{
GtkSignal *signal;
t@@ -3604,8 +3604,8 @@ guint gtk_signal_connect(GtkObject *object, const gchar *name,
return 0;
}
-guint gtk_signal_connect_object(GtkObject *object, const gchar *name,
- GtkSignalFunc func, GtkObject *slot_object)
+guint gtk_signal_connect_object(GObject *object, const gchar *name,
+ GtkSignalFunc func, GObject *slot_object)
{
GtkSignal *signal;
GtkSignalType *signal_type;
t@@ -4107,9 +4107,9 @@ void gtk_notebook_size_request(GtkWidget *widget,
requisition->height = rect.bottom - rect.top;
}
-GtkObject *gtk_adjustment_new(gfloat value, gfloat lower, gfloat upper,
- gfloat step_increment, gfloat page_increment,
- gfloat page_size)
+GObject *gtk_adjustment_new(gfloat value, gfloat lower, gfloat upper,
+ gfloat step_increment, gfloat page_increment,
+ gfloat page_size)
{
GtkAdjustment *adj;
t@@ -4273,13 +4273,13 @@ void gtk_separator_realize(GtkWidget *widget)
0, 0, 0, 0, Parent, NULL, hInst, NULL);
}
-void gtk_object_set_data(GtkObject *object, const gchar *key,
+void gtk_object_set_data(GObject *object, const gchar *key,
gpointer data)
{
g_datalist_set_data(&object->object_data, key, data);
}
-gpointer gtk_object_get_data(GtkObject *object, const gchar *key)
+gpointer gtk_object_get_data(GObject *object, const gchar *key)
{
return g_datalist_get_data(&object->object_data, key);
}
(DIR) diff --git a/src/gtkport/gtkport.h b/src/gtkport/gtkport.h
t@@ -292,7 +292,7 @@ extern GtkClass GtkContainerClass;
extern HFONT defFont;
extern HINSTANCE hInst;
-#define GTK_OBJECT(obj) ((GtkObject *)(obj))
+#define G_OBJECT(obj) ((GObject *)(obj))
#define GTK_CONTAINER(obj) ((GtkContainer *)(obj))
#define GTK_PANED(obj) ((GtkPaned *)(obj))
#define GTK_VPANED(obj) ((GtkVPaned *)(obj))
t@@ -414,13 +414,13 @@ void gtk_toggle_button_set_active(GtkToggleButton *toggle_button,
gboolean is_active);
void gtk_main_quit();
void gtk_main();
-guint gtk_signal_connect(GtkObject *object, const gchar *name,
+guint gtk_signal_connect(GObject *object, const gchar *name,
GtkSignalFunc func, gpointer func_data);
#define g_signal_connect gtk_signal_connect
-guint gtk_signal_connect_object(GtkObject *object, const gchar *name,
+guint gtk_signal_connect_object(GObject *object, const gchar *name,
GtkSignalFunc func,
- GtkObject *slot_object);
-void gtk_signal_emit(GtkObject *object, const gchar *name, ...);
+ GObject *slot_object);
+void gtk_signal_emit(GObject *object, const gchar *name, ...);
void SetCustomWndProc(WNDPROC wndproc);
void win32_init(HINSTANCE hInstance, HINSTANCE hPrevInstance,
char *MainIcon);
t@@ -449,9 +449,9 @@ void gtk_notebook_insert_page(GtkNotebook *notebook, GtkWidget *child,
GtkWidget *tab_label, gint position);
void gtk_notebook_set_page(GtkNotebook *notebook, gint page_num);
gint gtk_notebook_get_current_page(GtkNotebook *notebook);
-GtkObject *gtk_adjustment_new(gfloat value, gfloat lower, gfloat upper,
- gfloat step_increment, gfloat page_increment,
- gfloat page_size);
+GObject *gtk_adjustment_new(gfloat value, gfloat lower, gfloat upper,
+ gfloat step_increment, gfloat page_increment,
+ gfloat page_size);
GtkWidget *gtk_spin_button_new(GtkAdjustment *adjustment,
gfloat climb_rate, guint digits);
t@@ -461,9 +461,9 @@ guint dp_g_timeout_add(guint interval, GSourceFunc function, gpointer data);
gboolean dp_g_source_remove(guint tag);
GtkWidget *gtk_separator_new(GtkOrientation orientation);
-void gtk_object_set_data(GtkObject *object, const gchar *key,
+void gtk_object_set_data(GObject *object, const gchar *key,
gpointer data);
-gpointer gtk_object_get_data(GtkObject *object, const gchar *key);
+gpointer gtk_object_get_data(GObject *object, const gchar *key);
GtkAccelGroup *gtk_accel_group_new();
void gtk_accel_group_destroy(GtkAccelGroup *accel_group);
void gtk_widget_grab_default(GtkWidget *widget);
t@@ -513,7 +513,7 @@ void gtk_misc_set_alignment(GtkMisc *misc, gfloat xalign, gfloat yalign);
GtkWidget *gtk_progress_bar_new();
void gtk_progress_bar_set_fraction(GtkProgressBar *pbar, gfloat percentage);
guint gtk_main_level(void);
-GtkObject *GtkNewObject(GtkClass *klass);
+GObject *GtkNewObject(GtkClass *klass);
BOOL GetTextSize(HWND hWnd, char *text, LPSIZE lpSize, HFONT hFont);
void gtk_container_realize(GtkWidget *widget);
void gtk_set_default_font(HWND hWnd);
t@@ -524,25 +524,25 @@ void gtk_window_set_type_hint(GtkWindow *window, GdkWindowTypeHint hint);
void gtk_window_set_position(GtkWindow *window, GtkWindowPosition position);
/* Functions for handling emitted signals */
-void gtk_marshal_BOOL__GPOIN(GtkObject *object, GSList *actions,
+void gtk_marshal_BOOL__GPOIN(GObject *object, GSList *actions,
GtkSignalFunc default_action,
va_list args);
-void gtk_marshal_BOOL__GINT(GtkObject *object, GSList *actions,
+void gtk_marshal_BOOL__GINT(GObject *object, GSList *actions,
GtkSignalFunc default_action,
va_list args);
-void gtk_marshal_VOID__VOID(GtkObject *object, GSList *actions,
+void gtk_marshal_VOID__VOID(GObject *object, GSList *actions,
GtkSignalFunc default_action,
va_list args);
-void gtk_marshal_VOID__BOOL(GtkObject *object, GSList *actions,
+void gtk_marshal_VOID__BOOL(GObject *object, GSList *actions,
GtkSignalFunc default_action,
va_list args);
-void gtk_marshal_VOID__GPOIN(GtkObject *object, GSList *actions,
+void gtk_marshal_VOID__GPOIN(GObject *object, GSList *actions,
GtkSignalFunc default_action,
va_list args);
-void gtk_marshal_VOID__GINT(GtkObject *object, GSList *actions,
+void gtk_marshal_VOID__GINT(GObject *object, GSList *actions,
GtkSignalFunc default_action,
va_list args);
-void gtk_marshal_VOID__GINT_GINT_EVENT(GtkObject *object, GSList *actions,
+void gtk_marshal_VOID__GINT_GINT_EVENT(GObject *object, GSList *actions,
GtkSignalFunc default_action,
va_list args);
(DIR) diff --git a/src/gtkport/gtktypes.h b/src/gtkport/gtktypes.h
t@@ -54,7 +54,7 @@ typedef gint (*GtkFunction) (gpointer data);
typedef void (*GtkDestroyNotify) (gpointer data);
typedef struct _GtkClass GtkClass;
-typedef struct _GtkObject GtkObject;
+typedef struct _GObject GObject;
typedef struct _GtkRequisition GtkRequisition;
typedef struct _GtkAllocation GtkAllocation;
t@@ -63,7 +63,7 @@ typedef struct _GtkSignalType GtkSignalType;
typedef struct _GtkContainer GtkContainer;
typedef void (*GtkSignalFunc) ();
-typedef void (*GtkSignalMarshaller) (GtkObject *object, GSList *actions,
+typedef void (*GtkSignalMarshaller) (GObject *object, GSList *actions,
GtkSignalFunc default_action,
va_list args);
t@@ -122,7 +122,7 @@ struct _GtkClass {
typedef GtkClass *GtkType;
-struct _GtkObject {
+struct _GObject {
GtkClass *klass;
GData *object_data;
GData *signals;
t@@ -130,7 +130,7 @@ struct _GtkObject {
};
struct _GtkAdjustment {
- GtkObject object;
+ GObject object;
gfloat value, lower, upper;
gfloat step_increment, page_increment, page_size;
};
t@@ -144,7 +144,7 @@ struct _GtkAllocation {
};
struct _GtkWidget {
- GtkObject object;
+ GObject object;
HWND hWnd;
GtkRequisition requisition;
GtkAllocation allocation;