diff options
| author | Simon Tatham <anakin@pobox.com> | 2015-10-03 12:28:24 +0100 |
|---|---|---|
| committer | Simon Tatham <anakin@pobox.com> | 2015-10-03 16:07:20 +0100 |
| commit | 1b2e4d525f5e5686afdbec09c7b796ff546c6357 (patch) | |
| tree | 6323a0330d6b20a4df260e71b21a4ca98879a4f7 | |
| parent | 90b73ebcb7f0d2c834e00ba0ad74084ad5a5695b (diff) | |
| download | puzzles-1b2e4d525f5e5686afdbec09c7b796ff546c6357.zip puzzles-1b2e4d525f5e5686afdbec09c7b796ff546c6357.tar.gz puzzles-1b2e4d525f5e5686afdbec09c7b796ff546c6357.tar.bz2 puzzles-1b2e4d525f5e5686afdbec09c7b796ff546c6357.tar.xz | |
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.
| -rw-r--r-- | gtk.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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; |