Move version dependent constructs to gtk.in.h

diff --git a/src/ui/gui/include/gtk/gtk.in.h b/src/ui/gui/include/gtk/gtk.in.h
index 75ef3799839408286b0f3d22338a0a9efa4f3f8c..c7fe1921f41bd57084e6bbf7e45a88803725d6e2 100644 (file)
--- a/src/ui/gui/include/gtk/gtk.in.h
+++ b/src/ui/gui/include/gtk/gtk.in.h
@@ -44,4 +44,9 @@
 
 #define gdk_cursor_unref(X) g_object_unref (X)
 
+#if (GTK_CHECK_VERSION(3,8,0) == 0)
+#define gtk_widget_register_window(widget, window) gdk_window_set_user_data (window, widget);
+#endif
+
+
 #endif /* PSPP_GTK_GTK_H */

diff --git a/src/ui/gui/pspp-sheet-view.c b/src/ui/gui/pspp-sheet-view.c
index 138f86fd4213df848fec6491d71e2238aef1e39e..ab0694bd45521840737b02598a8c3f2023cb97f7 100644 (file)
--- a/src/ui/gui/pspp-sheet-view.c
+++ b/src/ui/gui/pspp-sheet-view.c
@@ -1523,11 +1523,7 @@ pspp_sheet_view_realize (GtkWidget *widget)
                            &attributes, attributes_mask);
   gtk_widget_set_window (widget, window);
 
-#if GTK_CHECK_VERSION(3,8,0)
   gtk_widget_register_window (widget, window);
-#else
-  gdk_window_set_user_data (window, widget);
-#endif
   gtk_widget_get_allocation (widget, &allocation);
 
   /* Make the window for the tree */
@@ -1546,11 +1542,7 @@ pspp_sheet_view_realize (GtkWidget *widget)
 
   tree_view->priv->bin_window = gdk_window_new (window,
                                                &attributes, attributes_mask);
-#if GTK_CHECK_VERSION(3,8,0)
   gtk_widget_register_window (widget, tree_view->priv->bin_window);
-#else
-  gdk_window_set_user_data (tree_view->priv->bin_window, widget);
-#endif
   gtk_widget_get_allocation (widget, &allocation);
 
   /* Make the column header window */
@@ -1568,11 +1560,7 @@ pspp_sheet_view_realize (GtkWidget *widget)
 
   tree_view->priv->header_window = gdk_window_new (window,
                                                   &attributes, attributes_mask);
-#if GTK_CHECK_VERSION(3,8,0)
   gtk_widget_register_window (widget, tree_view->priv->header_window);
-#else
-  gdk_window_set_user_data (tree_view->priv->header_window, widget);
-#endif
 
   { /* Ensure Background */
     GtkStyleContext *context;