From e3750652eceb727eaeaf27c017d470b311c4a1aa Mon Sep 17 00:00:00 2001 From: John Darrington Date: Thu, 18 Jun 2015 17:06:18 +0200 Subject: [PATCH] Move version dependent constructs to gtk.in.h --- src/ui/gui/include/gtk/gtk.in.h | 5 +++++ src/ui/gui/pspp-sheet-view.c | 12 ------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/ui/gui/include/gtk/gtk.in.h b/src/ui/gui/include/gtk/gtk.in.h index 75ef379983..c7fe1921f4 100644 --- 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 138f86fd42..ab0694bd45 100644 --- 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; -- 2.30.2