projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated version number to 0.9.0 ( 9 indicating unstable version )
[pspp]
/
src
/
ui
/
gui
/
psppire-keypad.c
diff --git
a/src/ui/gui/psppire-keypad.c
b/src/ui/gui/psppire-keypad.c
index 6f7865eb770afd775187a6cef0e4f10de5a0292c..7f238fb5d8ab270447c838faac441438535799ce 100644
(file)
--- a/
src/ui/gui/psppire-keypad.c
+++ b/
src/ui/gui/psppire-keypad.c
@@
-17,6
+17,7
@@
#include <config.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <config.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkkeysyms-compat.h>
#include "psppire-keypad.h"
enum {
#include "psppire-keypad.h"
enum {
@@
-159,10
+160,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, 1, 1);
gtk_widget_set_size_request (*button,
30 * rows / (float) cols,
gtk_widget_set_size_request (*button,
30 * rows / (float) cols,
@@
-206,9
+204,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;
}
@@
-313,8
+308,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
+323,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++)