X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-keypad.c;h=7f238fb5d8ab270447c838faac441438535799ce;hb=f50fd75b45786d9cd4f2c98d4076804d46795bec;hp=c68307c98cae7c0aecc9cc06012251610325fcfc;hpb=146997e1690f055481e2003529eaa4f8848ca4a8;p=pspp diff --git a/src/ui/gui/psppire-keypad.c b/src/ui/gui/psppire-keypad.c index c68307c98c..7f238fb5d8 100644 --- a/src/ui/gui/psppire-keypad.c +++ b/src/ui/gui/psppire-keypad.c @@ -1,26 +1,23 @@ -/* PSPP - computes sample statistics. - Copyright (C) 2007 Free Software Foundation, Inc. +/* PSPPIRE - a graphical user interface for PSPP. + 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ - -#include -#include -#include -#include + along with this program. If not, see . */ + +#include +#include #include +#include #include "psppire-keypad.h" enum { @@ -32,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) @@ -126,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 @@ -163,10 +160,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, 1, 1); gtk_widget_set_size_request (*button, 30 * rows / (float) cols, @@ -210,9 +204,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; } @@ -221,7 +212,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) @@ -317,8 +308,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; @@ -333,14 +323,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 )