vlabels tests

[pspp] / src / ui / gui / psppire-keypad.h

diff --git a/src/ui/gui/psppire-keypad.h b/src/ui/gui/psppire-keypad.h
index 340696c6d0479b97ea194bd5512ce7436e2802f2..89ae6b7d31d776980d6c3a29f71270d044b951eb 100644 (file)
--- a/src/ui/gui/psppire-keypad.h
+++ b/src/ui/gui/psppire-keypad.h
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2007, 2010 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. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 /*
  This module implements a keypad widget, similar to that dipicted
@@ -33,7 +31,7 @@
  |                          |
  | /  >=     0            . |
  +                  +
- | y  !=   =   (   ) |
+ | y  !=   =   () |
  |x                 |
  +---+---+---+---+---+
 
@@ -51,14 +49,14 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtk.h>
 
 
 G_BEGIN_DECLS
 
 #define PSPPIRE_KEYPAD_TYPE            (psppire_keypad_get_type ())
-#define PSPPIRE_KEYPAD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_KEYPAD_TYPE, Psppire_Keypad))
-#define PSPPIRE_KEYPAD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_KEYPAD_TYPE, Psppire_KeypadClass))
+#define PSPPIRE_KEYPAD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_KEYPAD_TYPE, PsppireKeypad))
+#define PSPPIRE_KEYPAD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_KEYPAD_TYPE, PsppireKeypadClass))
 #define PSPPIRE_IS_KEYPAD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_KEYPAD_TYPE))
 #define PSPPIRE_IS_KEYPAD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PSPPIRE_KEYPAD_TYPE))
 
@@ -104,7 +102,7 @@ struct _PsppireKeypad
 
 struct _PsppireKeypadClass
 {
-  GtkTableClass parent_class;
+  GtkEventBoxClass parent_class;
   void (*keypad)(PsppireKeypad*);
 };