From 1b2e4d525f5e5686afdbec09c7b796ff546c6357 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 3 Oct 2015 12:28:24 +0100 Subject: [PATCH] GTK 3 port: change API functions for widget sizing. set_usize is deprecated, and get_preferred_size is the GTK 3 thing we should use in place of size_request. --- gtk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gtk.c b/gtk.c index a4db53e..6e1ef53 100644 --- a/gtk.c +++ b/gtk.c @@ -2563,11 +2563,12 @@ static frontend *new_window(char *arg, int argtype, char **error) (GTK_STATUSBAR(fe->statusbar), "game"); gtk_statusbar_push(GTK_STATUSBAR(fe->statusbar), fe->statusctx, "test"); +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_get_preferred_size(fe->statusbar, &req, NULL); +#else gtk_widget_size_request(fe->statusbar, &req); -#if 0 - /* For GTK 2.0, should we be using gtk_widget_set_size_request? */ #endif - gtk_widget_set_usize(viewport, -1, req.height); + gtk_widget_set_size_request(viewport, -1, req.height); } else fe->statusbar = NULL; -- 2.30.2