static void
gtk_menu_bar_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+ GtkOrientation orientation,
+ gint *minimum,
+ gint *natural)
{
GtkMenuBar *menu_bar;
GtkMenuBarPrivate *priv;
GtkWidget *child;
GList *children;
GtkRequisition child_requisition;
+ GtkRequisition requisition;
gint ipadding;
guint border_width;
- requisition->width = 0;
- requisition->height = 0;
+ requisition.width = 0;
+ requisition.height = 0;
menu_bar = GTK_MENU_BAR (widget);
menu_shell = GTK_MENU_SHELL (widget);
if (priv->pack_direction == GTK_PACK_DIRECTION_LTR ||
priv->pack_direction == GTK_PACK_DIRECTION_RTL)
{
- requisition->width += child_requisition.width;
- requisition->height = MAX (requisition->height, child_requisition.height);
+ requisition.width += child_requisition.width;
+ requisition.height = MAX (requisition.height, child_requisition.height);
}
else
{
- requisition->width = MAX (requisition->width, child_requisition.width);
- requisition->height += child_requisition.height;
+ requisition.width = MAX (requisition.width, child_requisition.width);
+ requisition.height += child_requisition.height;
}
}
}
gtk_widget_style_get (widget, "internal-padding", &ipadding, NULL);
border_width = gtk_container_get_border_width (GTK_CONTAINER (menu_bar));
- requisition->width += (border_width +
- ipadding +
+ requisition.width += (border_width +
+ ipadding +
+ BORDER_SPACING) * 2;
+ requisition.height += (border_width +
+ ipadding +
BORDER_SPACING) * 2;
- requisition->height += (border_width +
- ipadding +
- BORDER_SPACING) * 2;
if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
{
"border-width", &border,
NULL);
- requisition->width += border->left + border->right;
- requisition->height += border->top + border->bottom;
+ requisition.width += border->left + border->right;
+ requisition.height += border->top + border->bottom;
gtk_border_free (border);
}
+
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ *minimum = *natural = requisition.width;
+ else
+ *minimum = *natural = requisition.height;
}
static void
gint *minimum,
gint *natural)
{
- GtkRequisition requisition;
-
- gtk_menu_bar_size_request (widget, &requisition);
-
- *minimum = *natural = requisition.width;
+ gtk_menu_bar_size_request (widget, GTK_ORIENTATION_HORIZONTAL, minimum, natural);
}
static void
gint *minimum,
gint *natural)
{
- GtkRequisition requisition;
-
- gtk_menu_bar_size_request (widget, &requisition);
-
- *minimum = *natural = requisition.height;
+ gtk_menu_bar_size_request (widget, GTK_ORIENTATION_VERTICAL, minimum, natural);
}
static void