X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-buttonbox.h;h=3cc25e945013f236cf23877648d7aa4114a7951d;hb=37c21ba9301956091823dea7d84ff0400330bd4b;hp=632e0fd3c629489763c1345c7049df8b4606f10d;hpb=2b998cd1a6d72214726d05cc050b816d131399e6;p=pspp
diff --git a/src/ui/gui/psppire-buttonbox.h b/src/ui/gui/psppire-buttonbox.h
index 632e0fd3c6..3cc25e9450 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, 2010 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
@@ -15,8 +15,8 @@
along with this program. If not, see . */
-#ifndef __PSPPIRE_BUTTONBOX_H__
-#define __PSPPIRE_BUTTONBOX_H__
+#ifndef __PSPPIRE_BUTTON_BOX_H__
+#define __PSPPIRE_BUTTON_BOX_H__
#include
@@ -25,34 +25,49 @@
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
};
+typedef enum
+ {
+ PSPPIRE_BUTTON_OK_MASK = (1 << PSPPIRE_BUTTON_OK),
+ PSPPIRE_BUTTON_GOTO_MASK = (1 << PSPPIRE_BUTTON_GOTO),
+ PSPPIRE_BUTTON_CONTINUE_MASK = (1 << PSPPIRE_BUTTON_CONTINUE),
+ PSPPIRE_BUTTON_CANCEL_MASK = (1 << PSPPIRE_BUTTON_CANCEL),
+ PSPPIRE_BUTTON_CLOSE_MASK = (1 << PSPPIRE_BUTTON_CLOSE),
+ PSPPIRE_BUTTON_HELP_MASK = (1 << PSPPIRE_BUTTON_HELP),
+ PSPPIRE_BUTTON_RESET_MASK = (1 << PSPPIRE_BUTTON_RESET),
+ PSPPIRE_BUTTON_PASTE_MASK = (1 << PSPPIRE_BUTTON_PASTE)
+ } PsppireButtonMask;
+
struct _PsppireButtonBox
{
GtkButtonBox parent;
/* */
GtkWidget *button[n_PsppireButtonBoxButtons];
+ guint def;
};
struct _PsppireButtonBoxClass
@@ -61,21 +76,12 @@ struct _PsppireButtonBoxClass
};
GType psppire_button_box_get_type (void);
+GtkWidget* psppire_button_box_new (void);
-/* Internal function. Do not use */
-void
-_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__ */
+#endif /* __PSPPIRE_BUTTON_BOX_H__ */