* 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 "gtkhbox.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
static void gtk_hbox_class_init (GtkHBoxClass *klass);
GtkAllocation *allocation);
-GtkType
+GType
gtk_hbox_get_type (void)
{
- static GtkType hbox_type = 0;
+ static GType hbox_type = 0;
if (!hbox_type)
{
- static const GtkTypeInfo hbox_info =
+ static const GTypeInfo hbox_info =
{
- "GtkHBox",
- sizeof (GtkHBox),
sizeof (GtkHBoxClass),
- (GtkClassInitFunc) gtk_hbox_class_init,
- (GtkObjectInitFunc) gtk_hbox_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_hbox_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkHBox),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_hbox_init,
};
- hbox_type = gtk_type_unique (GTK_TYPE_BOX, &hbox_info);
+ hbox_type = g_type_register_static (GTK_TYPE_BOX, I_("GtkHBox"),
+ &hbox_info, 0);
}
return hbox_type;
}
GtkWidget*
-gtk_hbox_new (gint homogeneous,
+gtk_hbox_new (gboolean homogeneous,
gint spacing)
{
GtkHBox *hbox;
- hbox = gtk_type_new (gtk_hbox_get_type ());
+ hbox = g_object_new (GTK_TYPE_HBOX, NULL);
GTK_BOX (hbox)->spacing = spacing;
GTK_BOX (hbox)->homogeneous = homogeneous ? TRUE : FALSE;
gint nvis_children;
gint width;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_HBOX (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);
+ GtkRequisition child_requisition;
+
+ gtk_widget_size_request (child->widget, &child_requisition);
if (box->homogeneous)
{
- width = child->widget->requisition.width + child->padding * 2;
+ width = child_requisition.width + child->padding * 2;
requisition->width = MAX (requisition->width, width);
}
else
{
- requisition->width += child->widget->requisition.width + child->padding * 2;
+ requisition->width += child_requisition.width + child->padding * 2;
}
- requisition->height = MAX (requisition->height, child->widget->requisition.height);
+ requisition->height = MAX (requisition->height, child_requisition.height);
nvis_children += 1;
}
gint width;
gint extra;
gint x;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_HBOX (widget));
- g_return_if_fail (allocation != NULL);
+ GtkTextDirection direction;
box = GTK_BOX (widget);
widget->allocation = *allocation;
+ direction = gtk_widget_get_direction (widget);
+
nvis_children = 0;
nexpand_children = 0;
children = box->children;
}
else if (nexpand_children > 0)
{
- width = (gint)allocation->width - (gint)widget->requisition.width;
+ width = (gint) allocation->width - (gint) widget->requisition.width;
extra = width / nexpand_children;
}
else
x = allocation->x + GTK_CONTAINER (box)->border_width;
child_allocation.y = allocation->y + GTK_CONTAINER (box)->border_width;
- child_allocation.height = MAX (1, allocation->height - GTK_CONTAINER (box)->border_width * 2);
+ child_allocation.height = MAX (1, (gint) allocation->height - (gint) GTK_CONTAINER (box)->border_width * 2);
children = box->children;
while (children)
}
else
{
- child_width = child->widget->requisition.width + child->padding * 2;
+ GtkRequisition child_requisition;
+
+ gtk_widget_get_child_requisition (child->widget, &child_requisition);
+
+ child_width = child_requisition.width + child->padding * 2;
if (child->expand)
{
if (child->fill)
{
- child_allocation.width = MAX (1, child_width - child->padding * 2);
+ child_allocation.width = MAX (1, (gint) child_width - (gint) child->padding * 2);
child_allocation.x = x + child->padding;
}
else
{
- child_allocation.width = child->widget->requisition.width;
+ GtkRequisition child_requisition;
+
+ gtk_widget_get_child_requisition (child->widget, &child_requisition);
+ child_allocation.width = child_requisition.width;
child_allocation.x = x + (child_width - child_allocation.width) / 2;
}
+ if (direction == GTK_TEXT_DIR_RTL)
+ child_allocation.x = allocation->x + allocation->width - (child_allocation.x - allocation->x) - child_allocation.width;
+
gtk_widget_size_allocate (child->widget, &child_allocation);
x += child_width + box->spacing;
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_width = child->widget->requisition.width + child->padding * 2;
+ child_width = child_requisition.width + child->padding * 2;
if (child->expand)
{
if (child->fill)
{
- child_allocation.width = MAX (1, child_width - child->padding * 2);
+ child_allocation.width = MAX (1, (gint)child_width - (gint)child->padding * 2);
child_allocation.x = x + child->padding - child_width;
}
else
{
- child_allocation.width = child->widget->requisition.width;
+ child_allocation.width = child_requisition.width;
child_allocation.x = x + (child_width - child_allocation.width) / 2 - child_width;
}
+ if (direction == GTK_TEXT_DIR_RTL)
+ child_allocation.x = allocation->x + allocation->width - (child_allocation.x - allocation->x) - child_allocation.width;
+
gtk_widget_size_allocate (child->widget, &child_allocation);
x -= (child_width + box->spacing);
}
}
}
+
+#define __GTK_HBOX_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff