projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed the categoricals such that now both GLM and ONEWAY work
[pspp]
/
src
/
ui
/
gui
/
psppire-keypad.c
diff --git
a/src/ui/gui/psppire-keypad.c
b/src/ui/gui/psppire-keypad.c
index 19b8cabf4ebee05b24ef8fe82041120da35d3e8a..6f7865eb770afd775187a6cef0e4f10de5a0292c 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 Free Software Foundation, Inc.
+ 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
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 <http://www.gnu.org/licenses/>. */
#include <config.h>
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "psppire-keypad.h"
#include <gdk/gdkkeysyms.h>
#include "psppire-keypad.h"
@@
-220,7
+217,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)
@@
-339,7
+336,7
@@
psppire_keypad_init (PsppireKeypad *kp)
{
int j = i - 1;
char buf[5];
{
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 )
kp->digit[i] = gtk_button_new_with_label (buf);
if ( i == 0 )