X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-buttonbox.h;h=dc6eb5cf3178ae21b27c0586896edd2935fa7426;hb=refs%2Fheads%2Fpivot-table2;hp=c002fd4b8a7f6cb715329902073c1c5e0e88386c;hpb=b06c888cf2e8c126b04d4678120439533a5086e5;p=pspp

diff --git a/src/ui/gui/psppire-buttonbox.h b/src/ui/gui/psppire-buttonbox.h
index c002fd4b8a..dc6eb5cf31 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,7 +21,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkbbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -44,6 +41,7 @@ enum
     PSPPIRE_BUTTON_GOTO,
     PSPPIRE_BUTTON_CONTINUE,
     PSPPIRE_BUTTON_CANCEL,
+    PSPPIRE_BUTTON_CLOSE,
     PSPPIRE_BUTTON_HELP,
     PSPPIRE_BUTTON_RESET,
     PSPPIRE_BUTTON_PASTE,
@@ -56,6 +54,7 @@ struct _PsppireButtonBox
 
   /* <private> */
   GtkWidget *button[n_PsppireButtonBoxButtons];
+  guint def;
 };
 
 struct _PsppireButtonBoxClass
@@ -72,12 +71,10 @@ _psppire_button_box_child_requisition (GtkWidget *widget,
 				       int       *nvis_children,
 				       int       *nvis_secondaries,
 				       int       *width,
-
-
-#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
 
 #endif /* __PSPPIRE_BUTTONBOX_H__ */