Merge remote-tracking branch 'origin/master' into sheet

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

diff --git a/src/ui/gui/psppire-buttonbox.h b/src/ui/gui/psppire-buttonbox.h
index 03f9fe34e6a737e5ae12558a704f80042cd81ce7..d4b53787b34e79489e3fc7b3f682af0b11ca489b 100644 (file)
--- 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,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
   {
@@ -41,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 PSPPIRE_TYPE_BUTTON_MASK \
-  (psppire_button_flags_get_type())
-                                      int       *height);
+#define PSPPIRE_TYPE_BUTTON_MASK psppire_button_flags_get_type()
 
 G_END_DECLS