Avoid deprecation warnings by use of gtk2 -> gtk3 wrapper macros.

Arguably this is somewhat kludgy.  But it will reduce the number
of merge conflicts between master and gtk3 branches.  After the
canonical branch has switched to gtk3, this commit can be reverted,
and the proper fixes applied.

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 283e8220da1807f526a9b05a5bbe4ee02456769e..1b6492ad92321175959e36772782e39af80dd1db 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -57,7 +57,7 @@ if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
 noinst_PROGRAMS += src/ui/gui/spreadsheet-test
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 -DGDK_DISABLE_DEPRECATION_WARNINGS=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 
 src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 
 
 

diff --git a/src/ui/gui/include/gtk/gtk.in.h b/src/ui/gui/include/gtk/gtk.in.h
index 1eb802aa2104a0d665457628e51f449818e14716..75ef3799839408286b0f3d22338a0a9efa4f3f8c 100644 (file)
--- a/src/ui/gui/include/gtk/gtk.in.h
+++ b/src/ui/gui/include/gtk/gtk.in.h
@@ -33,4 +33,15 @@
 /* Like GSEAL but only used in PSPP */
 #define PSEAL(X) X
 
+#define gtk_hbox_new(HOMOGENOUS,SPACING) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, SPACING)
+#define gtk_vbox_new(HOMOGENOUS,SPACING) gtk_box_new (GTK_ORIENTATION_VERTICAL, SPACING)
+
+#define gtk_vbutton_box_new() gtk_button_box_new (GTK_ORIENTATION_VERTICAL)
+#define gtk_hbutton_box_new() gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL)
+
+#define gtk_vpaned_new() gtk_paned_new (GTK_ORIENTATION_VERTICAL)
+#define gtk_hpaned_new() gtk_paned_new (GTK_ORIENTATION_HORIZONTAL)
+
+#define gdk_cursor_unref(X) g_object_unref (X)
+
 #endif /* PSPP_GTK_GTK_H */