X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=gtk%2Fgtkvbox.c;h=ecea06e3755bcda13c5ade6b575acb5c73e8ec81;hb=11396cb71fead96005e002d60c7065bc944bafce;hp=1c359f4d0864557b25b3f9c86831351dac315af9;hpb=279e878bddb61086f813385dc94fd04a5465473a;p=~andy%2Fgtk

diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c
index 1c359f4d0..ecea06e37 100644
--- a/gtk/gtkvbox.c
+++ b/gtk/gtkvbox.c
@@ -2,28 +2,30 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
+#include "gtkalias.h"
 #include "gtkvbox.h"
 
 
@@ -35,26 +37,28 @@ static void gtk_vbox_size_allocate (GtkWidget      *widget,
 				    GtkAllocation  *allocation);
 
 
-GtkType
+GType
 gtk_vbox_get_type (void)
 {
-  static GtkType vbox_type = 0;
+  static GType vbox_type = 0;
 
   if (!vbox_type)
     {
-      static const GtkTypeInfo vbox_info =
+      static const GTypeInfo vbox_info =
       {
-	"GtkVBox",
-	sizeof (GtkVBox),
 	sizeof (GtkVBoxClass),
-	(GtkClassInitFunc) gtk_vbox_class_init,
-	(GtkObjectInitFunc) gtk_vbox_init,
-	/* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
+	NULL,		/* base_init */
+	NULL,		/* base_finalize */
+	(GClassInitFunc) gtk_vbox_class_init,
+	NULL,		/* class_finalize */
+	NULL,		/* class_data */
+	sizeof (GtkVBox),
+	0,		/* n_preallocs */
+	(GInstanceInitFunc) gtk_vbox_init,
       };
 
-      vbox_type = gtk_type_unique (GTK_TYPE_BOX, &vbox_info);
+      vbox_type = g_type_register_static (GTK_TYPE_BOX, "GtkVBox",
+					  &vbox_info, 0);
     }
 
   return vbox_type;
@@ -82,7 +86,7 @@ gtk_vbox_new (gboolean homogeneous,
 {
   GtkVBox *vbox;
 
-  vbox = gtk_type_new (gtk_vbox_get_type ());
+  vbox = g_object_new (GTK_TYPE_VBOX, NULL);
 
   GTK_BOX (vbox)->spacing = spacing;
   GTK_BOX (vbox)->homogeneous = homogeneous ? TRUE : FALSE;
@@ -102,10 +106,6 @@ gtk_vbox_size_request (GtkWidget      *widget,
   gint nvis_children;
   gint height;
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_VBOX (widget));
-  g_return_if_fail (requisition != NULL);
-
   box = GTK_BOX (widget);
   requisition->width = 0;
   requisition->height = 0;
@@ -163,10 +163,6 @@ gtk_vbox_size_allocate (GtkWidget     *widget,
   gint extra;
   gint y;
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_VBOX (widget));
-  g_return_if_fail (allocation != NULL);
-
   box = GTK_BOX (widget);
   widget->allocation = *allocation;