diff options
Diffstat (limited to 'gtk/gtkassistant.c')
| -rw-r--r-- | gtk/gtkassistant.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index 2a16a22eac..00b40606c9 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -1157,13 +1157,13 @@ gtk_assistant_size_request (GtkWidget *widget, GtkAssistantPage *page = list->data; gint w, h; - gtk_size_request_get_size (GTK_SIZE_REQUEST (page->page), - &child_requisition, NULL); + gtk_widget_get_preferred_size (page->page, + &child_requisition, NULL); width = MAX (width, child_requisition.width); height = MAX (height, child_requisition.height); - gtk_size_request_get_size (GTK_SIZE_REQUEST (page->title), - &child_requisition, NULL); + gtk_widget_get_preferred_size (page->title, + &child_requisition, NULL); w = child_requisition.width; h = child_requisition.height; @@ -1179,19 +1179,19 @@ gtk_assistant_size_request (GtkWidget *widget, list = list->next; } - gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->sidebar_image), - &child_requisition, NULL); + gtk_widget_get_preferred_size (priv->sidebar_image, + &child_requisition, NULL); width += child_requisition.width; height = MAX (height, child_requisition.height); gtk_widget_set_size_request (priv->header_image, header_width, header_height); - gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->header_image), - &child_requisition, NULL); + gtk_widget_get_preferred_size (priv->header_image, + &child_requisition, NULL); width = MAX (width, header_width) + 2 * header_padding; height += header_height + 2 * header_padding; - gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->action_area), - &child_requisition, NULL); + gtk_widget_get_preferred_size (priv->action_area, + &child_requisition, NULL); width = MAX (width, child_requisition.width); height += child_requisition.height + ACTION_AREA_SPACING; @@ -1230,8 +1230,8 @@ gtk_assistant_size_allocate (GtkWidget *widget, border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); /* Header */ - gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->header_image), - &header_requisition, NULL); + gtk_widget_get_preferred_size (priv->header_image, + &header_requisition, NULL); header_allocation.x = border_width + header_padding; header_allocation.y = border_width + header_padding; @@ -1241,8 +1241,8 @@ gtk_assistant_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (priv->header_image, &header_allocation); /* Action area */ - gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->action_area), - &action_requisition, NULL); + gtk_widget_get_preferred_size (priv->action_area, + &action_requisition, NULL); child_allocation.x = border_width; child_allocation.y = allocation->height - border_width - action_requisition.height; @@ -1255,8 +1255,8 @@ gtk_assistant_size_allocate (GtkWidget *widget, gtk_widget_get_allocation (priv->action_area, &action_area_allocation); /* Sidebar */ - gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->sidebar_image), - &sidebar_requisition, NULL); + gtk_widget_get_preferred_size (priv->sidebar_image, + &sidebar_requisition, NULL); if (rtl) child_allocation.x = allocation->width - border_width - sidebar_requisition.width; |