Add more keyboard controls to Slant.

[sgt-puzzles.git] / gtk.c

diff --git a/gtk.c b/gtk.c
index 5c65838e1f8e398f025641c88351059a6d86c6e5..26b3ce0dfe44c6c654b8d7f6b3f80d36362bf49c 100644 (file)
--- a/gtk.c
+++ b/gtk.c
@@ -45,6 +45,9 @@
 #endif
 
 #if GTK_CHECK_VERSION(3,0,0)
+/* The old names are still more concise! */
+#define gtk_hbox_new(x,y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,y)
+#define gtk_vbox_new(x,y) gtk_box_new(GTK_ORIENTATION_VERTICAL,y)
 /* GTK 3 has retired stock button labels */
 #define LABEL_OK "_OK"
 #define LABEL_CANCEL "_Cancel"
@@ -2560,16 +2563,17 @@ 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;
 
     fe->area = gtk_drawing_area_new();
-#if GTK_CHECK_VERSION(2,0,0)
+#if GTK_CHECK_VERSION(2,0,0) && !GTK_CHECK_VERSION(3,0,0)
     gtk_widget_set_double_buffered(fe->area, FALSE);
 #endif
     {