Included gdkkeysyms-compat.h where necessary

[pspp] / src / ui / gui / psppire-keypad.c

diff --git a/src/ui/gui/psppire-keypad.c b/src/ui/gui/psppire-keypad.c
index 2c4f4b0ba833564dae505cba0ff917c5f6f18ee9..5f60e7c2e50e70228455197dc84a5ad2749a74ad 100644 (file)
--- a/src/ui/gui/psppire-keypad.c
+++ b/src/ui/gui/psppire-keypad.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,11 +14,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-#include <gtk/gtksignal.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
+#include <config.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#include <gdk/gdkkeysyms-compat.h>
 #include "psppire-keypad.h"
 
 enum {
@@ -30,7 +29,7 @@ enum {
 static void psppire_keypad_class_init          (PsppireKeypadClass *klass);
 static void psppire_keypad_init                (PsppireKeypad      *kp);
 
-static guint keypad_signals[n_SIGNALS] = { 0 };
+static guint keypad_signals [n_SIGNALS] = { 0 };
 
 GType
 psppire_keypad_get_type (void)
@@ -124,7 +123,7 @@ psppire_keypad_class_init (PsppireKeypadClass *klass)
    The order of these must correspond
    to the order of the button declarations
 */
-static const char *keypad_insert_text[] = {
+static const char * const keypad_insert_text[] = {
   "0",  "1",  "2", "3", "4", "5", "6", "7", "8", "9",
   ".", "+", "-", "*", "**", "/", "=", "<>", "<", "<=",
   ">", ">=", "&", "|", "~", "()", NULL
@@ -208,9 +207,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;
 }
 
@@ -219,7 +215,7 @@ key_release_callback (GtkWidget   *widget,
                      GdkEventKey *event,
                      gpointer     user_data)
 {
-  if ( ! (GTK_WIDGET_FLAGS (widget) & GTK_HAS_FOCUS) )
+  if ( ! gtk_widget_has_focus (widget))
     return FALSE;
 
   switch (event->keyval)
@@ -315,8 +311,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;
 
@@ -338,7 +333,7 @@ psppire_keypad_init (PsppireKeypad *kp)
     {
       int j = i - 1;
       char buf[5];
-      snprintf (buf, 5, "%d", i);
+      g_snprintf (buf, 5, "%d", i);
       kp->digit[i] = gtk_button_new_with_label (buf);
 
       if ( i == 0 )