projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PsppireKeypad: Correct the attachment of buttons to the grid.
[pspp]
/
src
/
ui
/
gui
/
psppire-keypad.c
diff --git
a/src/ui/gui/psppire-keypad.c
b/src/ui/gui/psppire-keypad.c
index 5f60e7c2e50e70228455197dc84a5ad2749a74ad..5cc7f52a6fff88679688fa8ba78d7167a875a556 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, 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
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
@@
-160,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, x2 - x1, y2 - y1);
gtk_widget_set_size_request (*button,
30 * rows / (float) cols,
gtk_widget_set_size_request (*button,
30 * rows / (float) cols,
@@
-326,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++)