Replace some obsolete Gtk macro calls

diff --git a/src/ui/gui/customentry.c b/src/ui/gui/customentry.c
index 04e738f23b335bca9b413eecb1b8b7a04bff3c2a..b7d0ce2d27c25eef7d4874e1ef5a178b240fadb3 100644 (file)
--- a/src/ui/gui/customentry.c
+++ b/src/ui/gui/customentry.c
@@ -57,7 +57,7 @@
 
 #include <gtk/gtk.h>
 #include "customentry.h"
-
+#include "helper.h"
 
 static void psppire_custom_entry_class_init          (PsppireCustomEntryClass *klass);
 static void psppire_custom_entry_init                (PsppireCustomEntry      *ce);

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index 597fdd78b48171c68098950879b8379491815475..afd3f9f2e378aa65ffc13d499ef9d1cd91263f77 100644 (file)
--- a/src/ui/gui/helper.h
+++ b/src/ui/gui/helper.h
@@ -76,4 +76,19 @@ GtkListStore * clone_list_store (const GtkListStore *src);
 void psppire_box_pack_start_defaults (GtkBox *box, GtkWidget *widget);
 
 
+\f
+
+#if ! GTK_CHECK_VERSION (2,20,0)
+static inline gboolean gtk_widget_get_realized (GtkWidget *w)
+{
+  return GTK_WIDGET_REALIZED (w);
+}
+
+static inline gboolean gtk_widget_get_mapped (GtkWidget *w)
+{
+  return GTK_WIDGET_MAPPED (w);
+}
+#endif
+
+
 #endif

diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c
index e7e0ad042daa1763ce2ff0c5b29242fcad56727d..6f27aa54d13e41883c1adb0037acd7c8e6224383 100644 (file)
--- a/src/ui/gui/psppire-dialog.c
+++ b/src/ui/gui/psppire-dialog.c
@@ -23,6 +23,7 @@
 #include "psppire-selector.h"
 #include "psppire-conf.h"
 #include <string.h>
+#include "helper.h"
 
 static void psppire_dialog_class_init          (PsppireDialogClass *);
 static void psppire_dialog_init                (PsppireDialog      *);

diff --git a/src/ui/gui/psppire-keypad.c b/src/ui/gui/psppire-keypad.c
index 6f7865eb770afd775187a6cef0e4f10de5a0292c..d4eeff6119a177926a19a38cc79355e09297c462 100644 (file)
--- a/src/ui/gui/psppire-keypad.c
+++ b/src/ui/gui/psppire-keypad.c
@@ -206,9 +206,6 @@ enter_leave_notify (GtkWidget   *widget,
  if (event->type == GDK_ENTER_NOTIFY)
    gtk_widget_grab_focus (widget);
 
- if (event->type == GDK_LEAVE_NOTIFY)
-   GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
  return FALSE;
 }
 
@@ -313,8 +310,7 @@ psppire_keypad_init (PsppireKeypad *kp)
   const int digit_voffset = 0;
   const int digit_hoffset = 3;
 
-  GTK_WIDGET_SET_FLAGS (kp, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (kp, GTK_HAS_FOCUS);
+  gtk_widget_set_can_focus (GTK_WIDGET (kp), TRUE);
 
   kp->dispose_has_run = FALSE;