summaryrefslogtreecommitdiff
path: root/gtk/gtkassistant.c
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2010-09-14 03:33:06 +0200
committerJavier Jardón <jjardon@gnome.org>2010-09-15 03:02:58 +0200
commitb140884fec56d0ac5f15fe3937879a7a1dd6f0c1 (patch)
treec891f7828f125fd533e0a36fe6a031c060fbc536 /gtk/gtkassistant.c
parenta18e2370bf7349aa61f9c236dd785a45c77d0a84 (diff)
downloadgtk+-b140884fec56d0ac5f15fe3937879a7a1dd6f0c1.tar.gz
Use gtk_size_request_get_size() instead deprecated gtk_widget_size_request()
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=629598 Signed-off-by: Javier Jardón <jjardon@gnome.org> Signed-off-by: Tristan Van Berkom <tristanvb@openismus.com>
Diffstat (limited to 'gtk/gtkassistant.c')
-rw-r--r--gtk/gtkassistant.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 334e789202..a866413de8 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -1157,11 +1157,13 @@ gtk_assistant_size_request (GtkWidget *widget,
GtkAssistantPage *page = list->data;
gint w, h;
- gtk_widget_size_request (page->page, &child_requisition);
+ gtk_size_request_get_size (GTK_SIZE_REQUEST (page->page),
+ &child_requisition, NULL);
width = MAX (width, child_requisition.width);
height = MAX (height, child_requisition.height);
- gtk_widget_size_request (page->title, &child_requisition);
+ gtk_size_request_get_size (GTK_SIZE_REQUEST (page->title),
+ &child_requisition, NULL);
w = child_requisition.width;
h = child_requisition.height;
@@ -1177,16 +1179,19 @@ gtk_assistant_size_request (GtkWidget *widget,
list = list->next;
}
- gtk_widget_size_request (priv->sidebar_image, &child_requisition);
+ gtk_size_request_get_size (GTK_SIZE_REQUEST (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_widget_size_request (priv->header_image, &child_requisition);
+ gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->header_image),
+ &child_requisition, NULL);
width = MAX (width, header_width) + 2 * header_padding;
height += header_height + 2 * header_padding;
- gtk_widget_size_request (priv->action_area, &child_requisition);
+ gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->action_area),
+ &child_requisition, NULL);
width = MAX (width, child_requisition.width);
height += child_requisition.height + ACTION_AREA_SPACING;