call the base class init fucntions from all parent types upon class
Sun Jun 28 04:29:10 1998 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.c (gtk_type_class_init): call the base class init fucntions from all parent types upon class initialization. * gtk/gtkcontainer.c: (gtk_container_get_type): announce gtk_container_base_class_init to the type system. (gtk_container_base_class_init): new function to feature base class initialization. (gtk_container_get_child_arg): (gtk_container_set_child_arg): call the GtkContainerClass get_child_arg and set_child_arg methods of the class indicated through the argument name. * gtk/gtkobject.c: (gtk_object_base_class_init): new function to feature base class initialization. (gtk_object_init_type): announce gtk_object_base_class_init to the type system. (gtk_object_class_init): setup the get_arg and set_arg pointers for GtkObjectClass. (gtk_object_setv): (gtk_object_getv): call the GtkObjectClass get_arg and set_arg methods, instead of bothering the type system with this. * gtk/gtkaccellabel.c: * gtk/gtkbutton.c: * gtk/gtkradiobutton.c: * gtk/gtktable.c: * gtk/gtktogglebutton.c: * gtk/gtktipsquery.c: * gtk/gtkbox.c: * gtk/gtkpacker.c: * gtk/gtkwidget.c: * gtk/gtkwindow.c: * gtk/gtkframe.c: * gtk/gtkmisc.c: * gtk/gtklabel.c: set the object_class->{g|s}et_arg pointers to the corresponding gtk_*_{g|s]et_arg functions and updated the gtk_*_get_type functions wrt GtkTypeInfo initialization. changed a lot of the set/get arg functions to take a GtkObject argument. gtk/gtkadjustment.c: gtk/gtkalignment.c: gtk/gtkarrow.c: gtk/gtkaspectframe.c: gtk/gtkbbox.c: gtk/gtkbin.c: gtk/gtkcheckbutton.c: gtk/gtkcheckmenuitem.c: gtk/gtkclist.c: gtk/gtkcolorsel.c: gtk/gtkcombo.c: gtk/gtkctree.c: gtk/gtkcurve.c: gtk/gtkdata.c: gtk/gtkdialog.c: gtk/gtkdrawingarea.c: gtk/gtkeditable.c: gtk/gtkentry.c: gtk/gtkeventbox.c: gtk/gtkfilesel.c: gtk/gtkfixed.c: gtk/gtkfontsel.c: gtk/gtkgamma.c: gtk/gtkhandlebox.c: gtk/gtkhbbox.c: gtk/gtkhbox.c: gtk/gtkhpaned.c: gtk/gtkhruler.c: gtk/gtkhscale.c: gtk/gtkhscrollbar.c: gtk/gtkhseparator.c: gtk/gtkimage.c: gtk/gtkinputdialog.c: gtk/gtkitem.c: gtk/gtkitemfactory.c: gtk/gtklist.c: gtk/gtklistitem.c: gtk/gtkmenu.c: gtk/gtkmenubar.c: gtk/gtkmenuitem.c: gtk/gtkmenushell.c: gtk/gtknotebook.c: gtk/gtkoptionmenu.c: gtk/gtkpaned.c: gtk/gtkpixmap.c: gtk/gtkpreview.c: gtk/gtkprogressbar.c: gtk/gtkradiomenuitem.c: gtk/gtkrange.c: gtk/gtkruler.c: gtk/gtkscale.c: gtk/gtkscrollbar.c: gtk/gtkscrolledwindow.c: gtk/gtkseparator.c: gtk/gtkspinbutton.c: gtk/gtkstatusbar.c: gtk/gtktext.c: gtk/gtktoolbar.c: gtk/gtktooltips.c: gtk/gtktree.c: gtk/gtktreeitem.c: gtk/gtkvbbox.c: gtk/gtkvbox.c: gtk/gtkviewport.c: gtk/gtkvpaned.c: gtk/gtkvruler.c: gtk/gtkvscale.c: gtk/gtkvscrollbar.c: gtk/gtkvseparator.c: updated the GtkTypeInfo initialization code to match the modified GtkTypeInfo structure.
This commit is contained in:
Tim Janik
@ -61,24 +61,25 @@ struct _GtkArgInfo
|
||||
};
|
||||
|
||||
|
||||
void gtk_object_init_type (void);
|
||||
static void gtk_object_class_init (GtkObjectClass *klass);
|
||||
static void gtk_object_init (GtkObject *object);
|
||||
static void gtk_object_set_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_object_get_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_object_shutdown (GtkObject *object);
|
||||
static void gtk_object_real_destroy (GtkObject *object);
|
||||
static void gtk_object_finalize (GtkObject *object);
|
||||
static void gtk_object_notify_weaks (GtkObject *object);
|
||||
void gtk_object_init_type (void);
|
||||
static void gtk_object_base_class_init (GtkObjectClass *klass);
|
||||
static void gtk_object_class_init (GtkObjectClass *klass);
|
||||
static void gtk_object_init (GtkObject *object);
|
||||
static void gtk_object_set_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_object_get_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_object_shutdown (GtkObject *object);
|
||||
static void gtk_object_real_destroy (GtkObject *object);
|
||||
static void gtk_object_finalize (GtkObject *object);
|
||||
static void gtk_object_notify_weaks (GtkObject *object);
|
||||
|
||||
GtkArg* gtk_object_collect_args (guint *nargs,
|
||||
GtkType (*) (const gchar*),
|
||||
va_list args1,
|
||||
va_list args2);
|
||||
GtkArg* gtk_object_collect_args (guint *nargs,
|
||||
GtkType (*) (const gchar*),
|
||||
va_list args1,
|
||||
va_list args2);
|
||||
|
||||
static guint object_signals[LAST_SIGNAL] = { 0 };
|
||||
|
||||
@ -140,8 +141,9 @@ gtk_object_init_type (void)
|
||||
sizeof (GtkObjectClass),
|
||||
(GtkClassInitFunc) gtk_object_class_init,
|
||||
(GtkObjectInitFunc) gtk_object_init,
|
||||
gtk_object_set_arg,
|
||||
gtk_object_get_arg,
|
||||
/* reversed_1 */ NULL,
|
||||
/* reversed_2 */ NULL,
|
||||
(GtkClassInitFunc) gtk_object_base_class_init,
|
||||
};
|
||||
|
||||
object_type = gtk_type_unique (0, &object_info);
|
||||
@ -160,12 +162,21 @@ gtk_object_get_type (void)
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_object_class_init (GtkObjectClass *class)
|
||||
gtk_object_base_class_init (GtkObjectClass *class)
|
||||
{
|
||||
/* reset instance specific fields that don't get inhrited */
|
||||
class->signals = NULL;
|
||||
class->nsignals = 0;
|
||||
class->n_args = 0;
|
||||
|
||||
/* reset instance specifc methods that don't get inherited */
|
||||
class->get_arg = NULL;
|
||||
class->set_arg = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_object_class_init (GtkObjectClass *class)
|
||||
{
|
||||
gtk_object_add_arg_type ("GtkObject::user_data",
|
||||
GTK_TYPE_POINTER,
|
||||
GTK_ARG_READWRITE,
|
||||
@ -189,6 +200,8 @@ gtk_object_class_init (GtkObjectClass *class)
|
||||
|
||||
gtk_object_class_add_signals (class, object_signals, LAST_SIGNAL);
|
||||
|
||||
class->get_arg = gtk_object_get_arg;
|
||||
class->set_arg = gtk_object_set_arg;
|
||||
class->shutdown = gtk_object_shutdown;
|
||||
class->destroy = gtk_object_real_destroy;
|
||||
class->finalize = gtk_object_finalize;
|
||||
@ -286,7 +299,7 @@ gtk_object_set_arg (GtkObject *object,
|
||||
case ARG_SIGNAL:
|
||||
if ((arg->name[9 + 2 + 6] != ':') || (arg->name[9 + 2 + 7] != ':'))
|
||||
{
|
||||
g_warning ("invalid signal argument: \"%s\"\n", arg->name);
|
||||
g_warning ("gtk_object_set_arg(): invalid signal argument: \"%s\"\n", arg->name);
|
||||
return;
|
||||
}
|
||||
gtk_signal_connect (object, arg->name + 9 + 2 + 6 + 2,
|
||||
@ -296,7 +309,7 @@ gtk_object_set_arg (GtkObject *object,
|
||||
case ARG_OBJECT_SIGNAL:
|
||||
if ((arg->name[9 + 2 + 13] != ':') || (arg->name[9 + 2 + 14] != ':'))
|
||||
{
|
||||
g_warning ("invalid signal argument: \"%s\"\n", arg->name);
|
||||
g_warning ("gtk_object_set_arg(): invalid signal argument: \"%s\"\n", arg->name);
|
||||
return;
|
||||
}
|
||||
gtk_signal_connect_object (object, arg->name + 9 + 2 + 13 + 2,
|
||||
@ -677,6 +690,7 @@ gtk_object_getv (GtkObject *object,
|
||||
GtkArgInfo *info;
|
||||
gchar *lookup_name;
|
||||
gchar *d;
|
||||
GtkObjectClass *oclass;
|
||||
|
||||
|
||||
/* hm, the name cutting shouldn't be needed on gets, but what the heck...
|
||||
@ -722,7 +736,16 @@ gtk_object_getv (GtkObject *object,
|
||||
g_free (lookup_name);
|
||||
|
||||
args[i].type = info->type;
|
||||
|
||||
oclass = gtk_type_class (info->class_type);
|
||||
if (oclass && oclass->get_arg)
|
||||
oclass->get_arg (object, &args[i], info->arg_id);
|
||||
else
|
||||
args[i].type = GTK_TYPE_INVALID;
|
||||
|
||||
#if 0
|
||||
gtk_type_get_arg (object, info->class_type, &args[i], info->arg_id);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@ -882,6 +905,7 @@ gtk_object_setv (GtkObject *object,
|
||||
gchar *lookup_name;
|
||||
gchar *d;
|
||||
gboolean arg_ok;
|
||||
GtkObjectClass *oclass;
|
||||
|
||||
lookup_name = g_strdup (args[i].name);
|
||||
d = strchr (lookup_name, ':');
|
||||
@ -928,7 +952,13 @@ gtk_object_setv (GtkObject *object,
|
||||
if (!arg_ok)
|
||||
continue;
|
||||
|
||||
oclass = gtk_type_class (info->class_type);
|
||||
if (oclass && oclass->set_arg)
|
||||
oclass->set_arg (object, &args[i], info->arg_id);
|
||||
|
||||
#if 0
|
||||
gtk_type_set_arg (object, info->class_type, &args[i], info->arg_id);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user