diff options
Diffstat (limited to 'gtk/gtktoolitemgroup.c')
| -rw-r--r-- | gtk/gtktoolitemgroup.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c index b54c22f68e..29ef624ab3 100644 --- a/gtk/gtktoolitemgroup.c +++ b/gtk/gtktoolitemgroup.c @@ -554,7 +554,8 @@ gtk_tool_item_group_size_request (GtkWidget *widget, if (priv->children && gtk_tool_item_group_get_label_widget (group)) { - gtk_widget_size_request (priv->header, requisition); + gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->header), + requisition, NULL); gtk_widget_show (priv->header); } else @@ -687,7 +688,8 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget, GtkRequisition req = {0, 0}; guint width; - gtk_widget_size_request (GTK_WIDGET (child->item), &req); + gtk_size_request_get_size (GTK_SIZE_REQUEST (child->item), + &req, NULL); width = udiv (req.width, item_size.width); col += width; @@ -745,7 +747,8 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget, GtkRequisition req = {0, 0}; guint width; - gtk_widget_size_request (GTK_WIDGET (child->item), &req); + gtk_size_request_get_size (GTK_SIZE_REQUEST (child->item), + &req, NULL); width = udiv (req.width, item_size.width); @@ -800,7 +803,8 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget, GtkRequisition req = {0, 0}; guint width; - gtk_widget_size_request (GTK_WIDGET (child->item), &req); + gtk_size_request_get_size (GTK_SIZE_REQUEST (child->item), + &req, NULL); width = udiv (req.width, item_size.width); col += width; @@ -832,7 +836,8 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget, { GtkRequisition child_requisition; - gtk_widget_size_request (priv->header, &child_requisition); + gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->header), + &child_requisition, NULL); if (GTK_ORIENTATION_VERTICAL == orientation) inquery->height += child_requisition.height; @@ -882,7 +887,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget, /* place the header widget */ if (gtk_widget_get_visible (priv->header)) { - gtk_widget_size_request (priv->header, &child_requisition); + gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->header), + &child_requisition, NULL); if (GTK_ORIENTATION_VERTICAL == orientation) { @@ -966,7 +972,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget, if (!child->homogeneous) { - gtk_widget_size_request (GTK_WIDGET (child->item), &child_requisition); + gtk_size_request_get_size (GTK_SIZE_REQUEST (child->item), + &child_requisition, NULL); child_requisition.width = MIN (child_requisition.width, item_area.width); } @@ -2297,7 +2304,8 @@ _gtk_tool_item_group_item_size_request (GtkToolItemGroup *group, if (!child->homogeneous && child->expand) new_row = TRUE; - gtk_widget_size_request (GTK_WIDGET (child->item), &child_requisition); + gtk_size_request_get_size (GTK_SIZE_REQUEST (child->item), + &child_requisition, NULL); if (!homogeneous_only || child->homogeneous) item_size->width = MAX (item_size->width, child_requisition.width); @@ -2383,7 +2391,8 @@ _gtk_tool_item_group_get_size_for_limit (GtkToolItemGroup *group, GtkRequisition requisition; GtkToolItemGroupPrivate* priv = group->priv; - gtk_widget_size_request (GTK_WIDGET (group), &requisition); + gtk_size_request_get_size (GTK_SIZE_REQUEST (group), + &requisition, NULL); if (!priv->collapsed || priv->animation_timeout) { |