Use clean-temp module instead of tmpdir module

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

diff --git a/src/ui/gui/psppire-buttonbox.h b/src/ui/gui/psppire-buttonbox.h
index 8d3d6efdfe0fab23f18e1a47ef82552c422f4a86..518a614898b9059850c57c8b221bd417d63951bc 100644 (file)
--- a/src/ui/gui/psppire-buttonbox.h
+++ b/src/ui/gui/psppire-buttonbox.h
@@ -15,8 +15,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 
-#ifndef __PSPPIRE_BUTTONBOX_H__
-#define __PSPPIRE_BUTTONBOX_H__
+#ifndef __PSPPIRE_BUTTON_BOX_H__
+#define __PSPPIRE_BUTTON_BOX_H__
 
 
 #include <glib.h>
@@ -25,28 +25,31 @@
 
 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_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))
+#define PSPPIRE_BUTTON_BOX_TYPE            (psppire_button_box_get_type ())
+#define PSPPIRE_BUTTON_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_BUTTON_BOX_TYPE, PsppireButtonBox))
+#define PSPPIRE_BUTTON_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_BUTTON_BOX_TYPE, PsppireButtonBoxClass))
+#define PSPPIRE_IS_BUTTON_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_BUTTON_BOX_TYPE))
+#define PSPPIRE_IS_BUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PSPPIRE_BUTTON_BOX_TYPE))
 
 
 typedef struct _PsppireButtonBox       PsppireButtonBox;
 typedef struct _PsppireButtonBoxClass  PsppireButtonBoxClass;
 
+
 enum
   {
     PSPPIRE_BUTTON_OK = 0,
     PSPPIRE_BUTTON_GOTO,
     PSPPIRE_BUTTON_CONTINUE,
     PSPPIRE_BUTTON_CANCEL,
+    PSPPIRE_BUTTON_CLOSE,
     PSPPIRE_BUTTON_HELP,
     PSPPIRE_BUTTON_RESET,
     PSPPIRE_BUTTON_PASTE,
     n_PsppireButtonBoxButtons
   };
 
+
 struct _PsppireButtonBox
 {
   GtkButtonBox parent;
@@ -64,17 +67,9 @@ struct _PsppireButtonBoxClass
 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,
-                                      int       *height);
-
 #define PSPPIRE_TYPE_BUTTON_MASK psppire_button_flags_get_type()
 
 G_END_DECLS
 
-#endif /* __PSPPIRE_BUTTONBOX_H__ */
+#endif /* __PSPPIRE_BUTTON_BOX_H__ */