X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-buttonbox.h;h=d4b53787b34e79489e3fc7b3f682af0b11ca489b;hb=c115ee191738e0c382d151f10e96e255acc74d83;hp=c002fd4b8a7f6cb715329902073c1c5e0e88386c;hpb=b06c888cf2e8c126b04d4678120439533a5086e5;p=pspp

diff --git a/src/ui/gui/psppire-buttonbox.h b/src/ui/gui/psppire-buttonbox.h
index c002fd4b8a..d4b53787b3 100644
--- a/src/ui/gui/psppire-buttonbox.h
+++ b/src/ui/gui/psppire-buttonbox.h
@@ -1,21 +1,18 @@
-/*
-    PSPPIRE --- A Graphical User Interface for PSPP
-    Copyright (C) 2007  Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2007, 2010, 2011, 2012  Free Software Foundation
 
-    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. */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 
 #ifndef __PSPPIRE_BUTTONBOX_H__
@@ -24,19 +21,20 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkbbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
-#define PSPPIRE_BUTTONBOX_TYPE            (psppire_button_box_get_type ())
-#define PSPPIRE_BUTTONBOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_BUTTONBOX_TYPE, PsppireButtonBox))
-#define PSPPIRE_BUTTONBOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_BUTTONBOX_TYPE, PsppireButtonBoxClass))
+#define PSPPIRE_BUTTONBOX_TYPE            (psppire_buttonbox_get_type ())
+#define PSPPIRE_BUTTONBOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_BUTTONBOX_TYPE, PsppireButtonbox))
+#define PSPPIRE_BUTTONBOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_BUTTONBOX_TYPE, PsppireButtonboxClass))
 #define PSPPIRE_IS_BUTTONBOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_BUTTONBOX_TYPE))
 #define PSPPIRE_IS_BUTTONBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PSPPIRE_BUTTONBOX_TYPE))
 
 
-typedef struct _PsppireButtonBox       PsppireButtonBox;
-typedef struct _PsppireButtonBoxClass  PsppireButtonBoxClass;
+typedef struct _PsppireButtonbox       PsppireButtonbox;
+typedef struct _PsppireButtonboxClass  PsppireButtonboxClass;
+
 
 enum
   {
@@ -44,39 +42,32 @@ enum
     PSPPIRE_BUTTON_GOTO,
     PSPPIRE_BUTTON_CONTINUE,
     PSPPIRE_BUTTON_CANCEL,
+    PSPPIRE_BUTTON_CLOSE,
     PSPPIRE_BUTTON_HELP,
     PSPPIRE_BUTTON_RESET,
     PSPPIRE_BUTTON_PASTE,
-    n_PsppireButtonBoxButtons
+    n_PsppireButtonboxButtons
   };
 
-struct _PsppireButtonBox
+
+struct _PsppireButtonbox
 {
   GtkButtonBox parent;
 
   /* <private> */
-  GtkWidget *button[n_PsppireButtonBoxButtons];
+  GtkWidget *button[n_PsppireButtonboxButtons];
+  guint def;
 };
 
-struct _PsppireButtonBoxClass
+struct _PsppireButtonboxClass
 {
   GtkButtonBoxClass parent_class;
 };
 
-GType          psppire_button_box_get_type        (void);
-
-
-/* Internal function.  Do not use */
-void
-_psppire_button_box_child_requisition (GtkWidget *widget,
-				       int       *nvis_children,
-				       int       *nvis_secondaries,
-				       int       *width,
+GType          psppire_buttonbox_get_type        (void);
 
 
-#define G_TYPE_PSPPIRE_BUTTON_MASK \
-  (psppire_button_flags_get_type())
-				       int       *height);
+#define PSPPIRE_TYPE_BUTTON_MASK psppire_button_flags_get_type()
 
 G_END_DECLS