From: Rogier Wolff <R.E.Wolff@BitWizard.nl>
Date: Fri, 9 Aug 2019 06:59:39 +0000 (+0200)
Subject: in hindsight my previous patch wasn't so nice. And nobody told me.
X-Git-Tag: v0.94~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a23e7f1793949b2dccc9a1e59619a348e82d3859;p=thirdparty%2Fmtr.git

in hindsight my previous patch wasn't so nice. And nobody told me.
---

diff --git a/ui/gtk.c b/ui/gtk.c
index a417cfc..58e98f4 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -567,11 +567,11 @@ void gtk_redraw(
 // GTK 3 has changed the interface a bit. Here a few defines so that we can
 // work with GTK2 or GTK3 as required. 
 #ifdef HAVE_GTK3
-#define GTK_VBOX_NEW(flag,orientation,sz) gtk_box_new(orientation, sz)
-#define GTK_HBOX_NEW(flag,orientation,sz) gtk_box_new(orientation, sz)
+#define gtk_vbox_new_(orientation,sz) gtk_box_new(orientation, sz)
+#define gtk_hbox_new_(orientation,sz) gtk_box_new(orientation, sz)
 #else
-#define GTK_VBOX_NEW(flag,orientation,sz) gtk_vbox_new(flag, sz)
-#define GTK_HBOX_NEW(flag,orientation,sz) gtk_hbox_new(flag, sz)
+#define gtk_vbox_new_(orientation,sz) gtk_vbox_new(FALSE, sz)
+#define gtk_hbox_new_(orientation,sz) gtk_hbox_new(FALSE, sz)
 #endif
 
 static void Window_fill(
@@ -586,8 +586,8 @@ static void Window_fill(
     gtk_window_set_default_size(GTK_WINDOW(Window), 650, 400);
     gtk_container_set_border_width(GTK_CONTAINER(Window), 10);
 
-    VBox = GTK_VBOX_NEW(FALSE, GTK_ORIENTATION_VERTICAL, 10);
-    Toolbar = GTK_HBOX_NEW(FALSE, GTK_ORIENTATION_HORIZONTAL, 10);
+    VBox    = gtk_vbox_new_(GTK_ORIENTATION_VERTICAL,   10);
+    Toolbar = gtk_hbox_new_(GTK_ORIENTATION_HORIZONTAL, 10);
 
     Toolbar_fill(ctl, Toolbar);
     gtk_box_pack_start(GTK_BOX(VBox), Toolbar, FALSE, FALSE, 0);