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 <berrange@redhat.com>
Message-id: 1361805646-6425-9-git-send-email-berrange@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Daniel P. Berrange 2013-02-25 15:20:41 +00:00 committed by Anthony Liguori
parent 8906de769b
commit 1ed76b59c4

View File

@ -305,7 +305,11 @@ static void gd_resize(DisplayState *ds)
gtk_widget_set_size_request(s->drawing_area, gtk_widget_set_size_request(s->drawing_area,
ds_get_width(ds) * s->scale_x, ds_get_width(ds) * s->scale_x,
ds_get_height(ds) * s->scale_y); 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); gtk_widget_size_request(s->vbox, &req);
#endif
gtk_window_resize(GTK_WINDOW(s->window), gtk_window_resize(GTK_WINDOW(s->window),
req.width * sx, req.height * sy); req.width * sx, req.height * sy);