X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-buttonbox.h;h=dc6eb5cf3178ae21b27c0586896edd2935fa7426;hb=6e80abcaeb7c361477eff4b8a578e54f1def81c4;hp=03f9fe34e6a737e5ae12558a704f80042cd81ce7;hpb=9a331fe64eb814ae5c1322e21717a04fb254bf65;p=pspp

diff --git a/src/ui/gui/psppire-buttonbox.h b/src/ui/gui/psppire-buttonbox.h
index 03f9fe34e6..dc6eb5cf31 100644
--- a/src/ui/gui/psppire-buttonbox.h
+++ b/src/ui/gui/psppire-buttonbox.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  Free Software Foundation
+   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
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkbbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -41,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,
@@ -53,6 +54,7 @@ struct _PsppireButtonBox
 
   /* <private> */
   GtkWidget *button[n_PsppireButtonBoxButtons];
+  guint def;
 };
 
 struct _PsppireButtonBoxClass
@@ -69,12 +71,10 @@ _psppire_button_box_child_requisition (GtkWidget *widget,
 				       int       *nvis_children,
 				       int       *nvis_secondaries,
 				       int       *width,
-
-
-#define PSPPIRE_TYPE_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__ */