summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-25 17:18:24 +0100
committerinfirit <[email protected]>2014-11-25 17:18:24 +0100
commitf1c78bf12b539430e2327b83e64a86649ed2faa9 (patch)
treed841d002675b2e8e0043c08ccdd4407a588fb46d /src
parentf6b6f2be4d109ecf899ccee2b2fae2f0a2beecbe (diff)
downloadmarco-f1c78bf12b539430e2327b83e64a86649ed2faa9.tar.bz2
marco-f1c78bf12b539430e2327b83e64a86649ed2faa9.tar.xz
Gtk3: Silence the GtkVBox and GtkHBox deprecations warnings
Diffstat (limited to 'src')
-rw-r--r--src/tools/marco-window-demo.c5
-rw-r--r--src/ui/tabpopup.c2
-rw-r--r--src/ui/theme-viewer.c6
3 files changed, 13 insertions, 0 deletions
diff --git a/src/tools/marco-window-demo.c b/src/tools/marco-window-demo.c
index d78d0130..b28e0818 100644
--- a/src/tools/marco-window-demo.c
+++ b/src/tools/marco-window-demo.c
@@ -24,6 +24,11 @@
#include <X11/Xatom.h>
#include <unistd.h>
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_vbox_new(X, Y) gtk_box_new(GTK_ORIENTATION_VERTICAL, Y)
+#define gtk_hbox_new(X, Y) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, Y)
+#endif
+
static GtkWidget* do_appwindow (void);
static gboolean aspect_on;
diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c
index 934874e8..4c4cf308 100644
--- a/src/ui/tabpopup.c
+++ b/src/ui/tabpopup.c
@@ -41,6 +41,8 @@
#define gdk_region_subtract cairo_region_subtract
#define gdk_region_destroy cairo_region_destroy
#define gdk_region_rectangle cairo_region_create_rectangle
+ /* Silence Gtk{V,H}Box deprecations warnings */
+ #define gtk_vbox_new(X, Y) gtk_box_new(GTK_ORIENTATION_VERTICAL, Y)
#endif
#define OUTSIDE_SELECT_RECT 2
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index cecfcb05..6bc6953a 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -35,6 +35,12 @@
#define _(x) dgettext (GETTEXT_PACKAGE, x)
#define N_(x) x
+/* Silence Gtk{V,H}Box deprecations warnings */
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_vbox_new(X, Y) gtk_box_new(GTK_ORIENTATION_VERTICAL, Y)
+#define gtk_hbox_new(X, Y) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, Y)
+#endif
+
/* We need to compute all different button arrangements
* in terms of button location. We don't care about
* different arrangements in terms of button function.