projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed perl regression problem due to Version name - Fixes Bug #51218
[pspp]
/
src
/
ui
/
gui
/
psppire-keypad.c
diff --git
a/src/ui/gui/psppire-keypad.c
b/src/ui/gui/psppire-keypad.c
index 84107c743ab89302d6972a12b6a96c2bf87fa014..f3b1df39c067851ac1ae5d6a57dbbd51a1fef927 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.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2010 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
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
@@
-159,10
+159,7
@@
add_button (PsppireKeypad *kp, GtkWidget **button,
{
g_object_set (G_OBJECT (*button), "focus-on-click", FALSE, NULL);
{
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,
gtk_widget_set_size_request (*button,
30 * rows / (float) cols,
@@
-206,9
+203,6
@@
enter_leave_notify (GtkWidget *widget,
if (event->type == GDK_ENTER_NOTIFY)
gtk_widget_grab_focus (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;
}
return FALSE;
}
@@
-217,7
+211,7
@@
key_release_callback (GtkWidget *widget,
GdkEventKey *event,
gpointer user_data)
{
GdkEventKey *event,
gpointer user_data)
{
- if ( !
(GTK_WIDGET_FLAGS (widget) & GTK_HAS_FOCUS)
)
+ if ( !
gtk_widget_has_focus (widget)
)
return FALSE;
switch (event->keyval)
return FALSE;
switch (event->keyval)
@@
-234,67
+228,67
@@
key_release_callback (GtkWidget *widget,
case '<':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "<");
break;
case '<':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "<");
break;
- case GDK_KP_Equal :
+ case GDK_K
EY_K
P_Equal :
case '=':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "=");
break;
case '=':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "=");
break;
- case GDK_KP_Multiply :
+ case GDK_K
EY_K
P_Multiply :
case '*':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "*");
break;
case '*':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "*");
break;
- case GDK_KP_Add :
+ case GDK_K
EY_K
P_Add :
case '+':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "+");
break;
case '+':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "+");
break;
- case GDK_KP_Subtract :
+ case GDK_K
EY_K
P_Subtract :
case '-':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "-");
break;
case '-':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "-");
break;
- case GDK_KP_Decimal :
+ case GDK_K
EY_K
P_Decimal :
case '.':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, ".");
break;
case '.':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, ".");
break;
- case GDK_KP_Divide :
+ case GDK_K
EY_K
P_Divide :
case '/':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "/");
break;
case '/':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "/");
break;
- case GDK_KP_0 :
+ case GDK_K
EY_K
P_0 :
case '0':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "0");
break;
case '0':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "0");
break;
- case GDK_KP_1 :
+ case GDK_K
EY_K
P_1 :
case '1':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "1");
break;
case '1':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "1");
break;
- case GDK_KP_2 :
+ case GDK_K
EY_K
P_2 :
case '2':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "2");
break;
case '2':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "2");
break;
- case GDK_KP_3 :
+ case GDK_K
EY_K
P_3 :
case '3':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "3");
break;
case '3':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "3");
break;
- case GDK_KP_4 :
+ case GDK_K
EY_K
P_4 :
case '4':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "4");
break;
case '4':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "4");
break;
- case GDK_KP_5 :
+ case GDK_K
EY_K
P_5 :
case '5':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "5");
break;
case '5':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "5");
break;
- case GDK_KP_6 :
+ case GDK_K
EY_K
P_6 :
case '6':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "6");
break;
case '6':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "6");
break;
- case GDK_KP_7 :
+ case GDK_K
EY_K
P_7 :
case '7':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "7");
break;
case '7':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "7");
break;
- case GDK_KP_8 :
+ case GDK_K
EY_K
P_8 :
case '8':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "8");
break;
case '8':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "8");
break;
- case GDK_KP_9 :
+ case GDK_K
EY_K
P_9 :
case '9':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "9");
break;
case '9':
g_signal_emit (widget, keypad_signals [INSERT_SYNTAX], 0, "9");
break;
@@
-313,8
+307,7
@@
psppire_keypad_init (PsppireKeypad *kp)
const int digit_voffset = 0;
const int digit_hoffset = 3;
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;
kp->dispose_has_run = FALSE;
@@
-329,7
+322,7
@@
psppire_keypad_init (PsppireKeypad *kp)
kp->frag_table = g_hash_table_new (g_direct_hash, g_direct_equal);
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++)
/* Buttons for the digits */
for (i = 0; i < 10; i++)