src/ui/gui/windows-menu.c (repopulate_windows_menu): Avoid memory leak

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

diff --git a/src/ui/gui/psppire-keypad.c b/src/ui/gui/psppire-keypad.c
index 7f238fb5d8ab270447c838faac441438535799ce..417d6a99c341da49e2560d9428f69cc634a78108 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, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2010, 2011, 2015 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
@@ -17,7 +17,6 @@
 #include <config.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkkeysyms-compat.h>
 #include "psppire-keypad.h"
 
 enum {
@@ -140,7 +139,7 @@ button_click (GtkButton *b, PsppireKeypad *kp)
   const gchar *s = g_hash_table_lookup (kp->frag_table, b);
 
 
-  if ( s )
+  if (s)
     g_signal_emit (kp, keypad_signals [INSERT_SYNTAX], 0, s);
   else
     g_signal_emit (kp, keypad_signals [ERASE], 0);
@@ -160,14 +159,14 @@ add_button (PsppireKeypad *kp, GtkWidget **button,
 {
   g_object_set (G_OBJECT (*button), "focus-on-click", FALSE, NULL);
 
-  gtk_grid_attach (GTK_GRID(kp->table), *button, x1, y1, 1, 1);
+  gtk_grid_attach (GTK_GRID(kp->table), *button, x1, y1, x2 - x1, y2 - y1);
 
   gtk_widget_set_size_request (*button,
                               30 * rows / (float) cols,
                               30 * cols / (float) rows);
 
   g_hash_table_insert (kp->frag_table, *button,
-                      (void *) keypad_insert_text[(button - &kp->digit[0])] );
+                      (void *) keypad_insert_text[(button - &kp->digit[0])]);
 
   g_signal_connect (*button, "clicked",
                    G_CALLBACK (button_click), kp);
@@ -212,7 +211,7 @@ key_release_callback (GtkWidget   *widget,
                      GdkEventKey *event,
                      gpointer     user_data)
 {
-  if ( ! gtk_widget_has_focus (widget))
+  if (! gtk_widget_has_focus (widget))
     return FALSE;
 
   switch (event->keyval)
@@ -229,67 +228,67 @@ key_release_callback (GtkWidget   *widget,
     case '<':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "<");
       break;
-    case GDK_KP_Equal :
+    case GDK_KEY_KP_Equal :
     case '=':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "=");
       break;
-    case GDK_KP_Multiply :
+    case GDK_KEY_KP_Multiply :
     case '*':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "*");
       break;
-    case GDK_KP_Add :
+    case GDK_KEY_KP_Add :
     case '+':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "+");
       break;
-    case GDK_KP_Subtract :
+    case GDK_KEY_KP_Subtract :
     case '-':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "-");
       break;
-    case GDK_KP_Decimal :
+    case GDK_KEY_KP_Decimal :
     case '.':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, ".");
       break;
-    case GDK_KP_Divide :
+    case GDK_KEY_KP_Divide :
     case '/':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "/");
       break;
-    case GDK_KP_0 :
+    case GDK_KEY_KP_0 :
     case '0':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "0");
       break;
-    case GDK_KP_1 :
+    case GDK_KEY_KP_1 :
     case '1':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "1");
       break;
-    case GDK_KP_2 :
+    case GDK_KEY_KP_2 :
     case '2':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "2");
       break;
-    case GDK_KP_3 :
+    case GDK_KEY_KP_3 :
     case '3':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "3");
       break;
-    case GDK_KP_4 :
+    case GDK_KEY_KP_4 :
     case '4':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "4");
       break;
-    case GDK_KP_5 :
+    case GDK_KEY_KP_5 :
     case '5':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "5");
       break;
-    case GDK_KP_6 :
+    case GDK_KEY_KP_6 :
     case '6':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "6");
       break;
-    case GDK_KP_7 :
+    case GDK_KEY_KP_7 :
     case '7':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "7");
       break;
-    case GDK_KP_8 :
+    case GDK_KEY_KP_8 :
     case '8':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "8");
       break;
-    case GDK_KP_9 :
+    case GDK_KEY_KP_9 :
     case '9':
       g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "9");
       break;
@@ -333,7 +332,7 @@ psppire_keypad_init (PsppireKeypad *kp)
       g_snprintf (buf, 5, "%d", i);
       kp->digit[i] = gtk_button_new_with_label (buf);
 
-      if ( i == 0 )
+      if (i == 0)
        add_button (kp, &kp->digit[i],
                    digit_hoffset + 0, digit_hoffset + 2,
                    digit_voffset + 3, digit_voffset + 4);