* 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-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)
- {
- GtkTypeInfo vbox_info =
- {
- "GtkVBox",
- sizeof (GtkVBox),
- sizeof (GtkVBoxClass),
- (GtkClassInitFunc) gtk_vbox_class_init,
- (GtkObjectInitFunc) gtk_vbox_init,
- /* reversed_1 */ NULL,
- /* reversed_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)
}
GtkWidget*
-gtk_vbox_new (gint homogeneous,
+gtk_vbox_new (gboolean homogeneous,
gint spacing)
{
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;
{
GtkBox *box;
GtkBoxChild *child;
+ GtkRequisition child_requisition;
GList *children;
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;
if (GTK_WIDGET_VISIBLE (child->widget))
{
- gtk_widget_size_request (child->widget, &child->widget->requisition);
+ gtk_widget_size_request (child->widget, &child_requisition);
if (box->homogeneous)
{
- height = child->widget->requisition.height + child->padding * 2;
+ height = child_requisition.height + child->padding * 2;
requisition->height = MAX (requisition->height, height);
}
else
{
- requisition->height += child->widget->requisition.height + child->padding * 2;
+ requisition->height += child_requisition.height + child->padding * 2;
}
- requisition->width = MAX (requisition->width, child->widget->requisition.width);
+ requisition->width = MAX (requisition->width, child_requisition.width);
nvis_children += 1;
}
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;
}
else if (nexpand_children > 0)
{
- height = (gint)allocation->height - (gint)widget->requisition.height;
+ height = (gint) allocation->height - (gint) widget->requisition.height;
extra = height / nexpand_children;
}
else
y = allocation->y + GTK_CONTAINER (box)->border_width;
child_allocation.x = allocation->x + GTK_CONTAINER (box)->border_width;
- child_allocation.width = MAX (1, allocation->width - GTK_CONTAINER (box)->border_width * 2);
+ child_allocation.width = MAX (1, (gint) allocation->width - (gint) GTK_CONTAINER (box)->border_width * 2);
children = box->children;
while (children)
}
else
{
- child_height = child->widget->requisition.height + child->padding * 2;
+ GtkRequisition child_requisition;
+
+ gtk_widget_get_child_requisition (child->widget, &child_requisition);
+ child_height = child_requisition.height + child->padding * 2;
if (child->expand)
{
if (child->fill)
{
- child_allocation.height = MAX (1, child_height - child->padding * 2);
+ child_allocation.height = MAX (1, child_height - (gint)child->padding * 2);
child_allocation.y = y + child->padding;
}
else
{
- child_allocation.height = child->widget->requisition.height;
+ GtkRequisition child_requisition;
+
+ gtk_widget_get_child_requisition (child->widget, &child_requisition);
+ child_allocation.height = child_requisition.height;
child_allocation.y = y + (child_height - child_allocation.height) / 2;
}
if ((child->pack == GTK_PACK_END) && GTK_WIDGET_VISIBLE (child->widget))
{
+ GtkRequisition child_requisition;
+ gtk_widget_get_child_requisition (child->widget, &child_requisition);
+
if (box->homogeneous)
{
if (nvis_children == 1)
}
else
{
- child_height = child->widget->requisition.height + child->padding * 2;
+ child_height = child_requisition.height + child->padding * 2;
if (child->expand)
{
if (child->fill)
{
- child_allocation.height = MAX (1, child_height - child->padding * 2);
+ child_allocation.height = MAX (1, child_height - (gint)child->padding * 2);
child_allocation.y = y + child->padding - child_height;
}
else
{
- child_allocation.height = child->widget->requisition.height;
+ child_allocation.height = child_requisition.height;
child_allocation.y = y + (child_height - child_allocation.height) / 2 - child_height;
}
}
}
}
+
+#define __GTK_VBOX_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff