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.

1 files changed, 18 insertions, 7 deletions

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index da5ee65f0e..1b2bf893bd 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -28,10 +28,10 @@ enum {
 
 static void gtk_label_class_init   (GtkLabelClass  *klass);
 static void gtk_label_init	   (GtkLabel	   *label);
-static void gtk_label_set_arg	   (GtkLabel	   *label,
+static void gtk_label_set_arg	   (GtkObject	   *object,
 				    GtkArg	   *arg,
 				    guint	    arg_id);
-static void gtk_label_get_arg	   (GtkLabel	   *label,
+static void gtk_label_get_arg	   (GtkObject      *object,
 				    GtkArg	   *arg,
 				    guint	    arg_id);
 static void gtk_label_finalize	   (GtkObject	   *object);
@@ -63,8 +63,9 @@ gtk_label_get_type (void)
 	sizeof (GtkLabelClass),
 	(GtkClassInitFunc) gtk_label_class_init,
 	(GtkObjectInitFunc) gtk_label_init,
-	(GtkArgSetFunc) gtk_label_set_arg,
-	(GtkArgGetFunc) gtk_label_get_arg,
+        /* reversed_1 */ NULL,
+	/* reversed_2 */ NULL,
+	(GtkClassInitFunc) NULL,
       };
       
       label_type = gtk_type_unique (gtk_misc_get_type (), &label_info);
@@ -87,7 +88,9 @@ gtk_label_class_init (GtkLabelClass *class)
   
   gtk_object_add_arg_type ("GtkLabel::label", GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_LABEL);
   gtk_object_add_arg_type ("GtkLabel::justify", GTK_TYPE_JUSTIFICATION, GTK_ARG_READWRITE, ARG_JUSTIFY);
-  
+
+  object_class->set_arg = gtk_label_set_arg;
+  object_class->get_arg = gtk_label_get_arg;
   object_class->finalize = gtk_label_finalize;
   
   widget_class->size_request = gtk_label_size_request;
@@ -97,10 +100,14 @@ gtk_label_class_init (GtkLabelClass *class)
 }
 
 static void
-gtk_label_set_arg (GtkLabel	  *label,
+gtk_label_set_arg (GtkObject	  *object,
 		   GtkArg	  *arg,
 		   guint	   arg_id)
 {
+  GtkLabel *label;
+
+  label = GTK_LABEL (object);
+
   switch (arg_id)
     {
     case ARG_LABEL:
@@ -115,10 +122,14 @@ gtk_label_set_arg (GtkLabel	  *label,
 }
 
 static void
-gtk_label_get_arg (GtkLabel	  *label,
+gtk_label_get_arg (GtkObject	  *object,
 		   GtkArg	  *arg,
 		   guint	   arg_id)
 {
+  GtkLabel *label;
+
+  label = GTK_LABEL (object);
+
   switch (arg_id)
     {
     case ARG_LABEL: