* 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 "gtkvbox.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
-static void gtk_vbox_class_init (GtkVBoxClass *klass);
-static void gtk_vbox_init (GtkVBox *box);
static void gtk_vbox_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_vbox_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-
-GtkType
-gtk_vbox_get_type (void)
-{
- static GtkType vbox_type = 0;
-
- if (!vbox_type)
- {
- static const GtkTypeInfo vbox_info =
- {
- "GtkVBox",
- sizeof (GtkVBox),
- sizeof (GtkVBoxClass),
- (GtkClassInitFunc) gtk_vbox_class_init,
- (GtkObjectInitFunc) gtk_vbox_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- vbox_type = gtk_type_unique (GTK_TYPE_BOX, &vbox_info);
- }
-
- return vbox_type;
-}
+G_DEFINE_TYPE (GtkVBox, gtk_vbox, GTK_TYPE_BOX)
static void
gtk_vbox_class_init (GtkVBoxClass *class)
{
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;
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;
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;
}
}
}
+
+#define __GTK_VBOX_C__
+#include "gtkaliasdef.c"