X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-keypad.c;h=f3b1df39c067851ac1ae5d6a57dbbd51a1fef927;hb=dd0534adaf2831e6857185aa6580fa44aff19545;hp=54e6d4314fd2f2ba324ae9cfd419ad1e6c5af38c;hpb=97a777315ec2f2000ac67da1f405323a5e2294e2;p=pspp diff --git a/src/ui/gui/psppire-keypad.c b/src/ui/gui/psppire-keypad.c index 54e6d4314f..f3b1df39c0 100644 --- 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, 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 @@ -15,10 +15,7 @@ along with this program. If not, see . */ #include -#include -#include -#include -#include +#include #include #include "psppire-keypad.h" @@ -31,7 +28,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) @@ -125,7 +122,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 @@ -162,10 +159,7 @@ add_button (PsppireKeypad *kp, GtkWidget **button, { g_object_set (G_OBJECT (*button), "focus-on-click", FALSE, NULL); - gtk_table_attach_defaults (GTK_TABLE (kp->table), - *button, - x1, x2, - y1, y2); + gtk_grid_attach (GTK_GRID(kp->table), *button, x1, y1, x2 - x1, y2 - y1); gtk_widget_set_size_request (*button, 30 * rows / (float) cols, @@ -209,9 +203,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; } @@ -220,7 +211,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) @@ -237,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; @@ -316,8 +307,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; @@ -332,14 +322,14 @@ psppire_keypad_init (PsppireKeypad *kp) kp->frag_table = g_hash_table_new (g_direct_hash, g_direct_equal); - kp->table = gtk_table_new (rows, cols, TRUE); + kp->table = gtk_grid_new (); /* Buttons for the digits */ for (i = 0; i < 10; i++) { 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 )