From: Daniel P. Berrange Date: Mon, 25 Feb 2013 15:20:41 +0000 (+0000) Subject: Conditionalize use of gtk_widget_size_request X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~1001 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1ed76b59c4f8670eb06df48cebe086da06111e1f;p=qemu-xen.git Conditionalize use of gtk_widget_size_request The gtk_widget_size_request method has been replaced by the gtk_widget_get_preferred_size method in GTK3. Conditionally call the new method in GTK3 Signed-off-by: Daniel P. Berrange Message-id: 1361805646-6425-9-git-send-email-berrange@redhat.com Signed-off-by: Anthony Liguori --- diff --git a/ui/gtk.c b/ui/gtk.c index 93c3b43fc4..c89c7c4f8b 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -305,7 +305,11 @@ static void gd_resize(DisplayState *ds) gtk_widget_set_size_request(s->drawing_area, ds_get_width(ds) * s->scale_x, ds_get_height(ds) * s->scale_y); +#if GTK_CHECK_VERSION(3, 0, 0) + gtk_widget_get_preferred_size(s->vbox, NULL, &req); +#else gtk_widget_size_request(s->vbox, &req); +#endif gtk_window_resize(GTK_WINDOW(s->window), req.width * sx, req.height * sy);