X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-buttonbox.c;h=68a147f74ca1322777fb681bab993a2423f15e0b;hb=refs%2Fheads%2Fctables7;hp=bcd6e78cf633902805289b35852090327dd38725;hpb=91c3dcd855f75c3f6ca8b58957f9f663ca01470a;p=pspp

diff --git a/src/ui/gui/psppire-buttonbox.c b/src/ui/gui/psppire-buttonbox.c
index bcd6e78cf6..68a147f74c 100644
--- a/src/ui/gui/psppire-buttonbox.c
+++ b/src/ui/gui/psppire-buttonbox.c
@@ -31,37 +31,7 @@
 
 GType psppire_button_flags_get_type (void);
 
-
-static void psppire_button_box_class_init          (PsppireButtonBoxClass *);
-static void psppire_button_box_init                (PsppireButtonBox      *);
-
-
-GType
-psppire_button_box_get_type (void)
-{
-  static GType button_box_type = 0;
-
-  if (!button_box_type)
-    {
-      static const GTypeInfo button_box_info =
-      {
-	sizeof (PsppireButtonBoxClass),
-	NULL, /* base_init */
-        NULL, /* base_finalize */
-	(GClassInitFunc) psppire_button_box_class_init,
-        NULL, /* class_finalize */
-	NULL, /* class_data */
-        sizeof (PsppireButtonBox),
-	0,
-	(GInstanceInitFunc) psppire_button_box_init,
-      };
-
-      button_box_type = g_type_register_static (GTK_TYPE_BUTTON_BOX,
-					    "PsppireButtonBox", &button_box_info, 0);
-    }
-
-  return button_box_type;
-}
+G_DEFINE_TYPE (PsppireButtonBox, psppire_button_box, GTK_TYPE_BUTTON_BOX)
 
 enum {
   PROP_BUTTONS = 1,
@@ -138,6 +108,7 @@ psppire_buttonbox_get_property (GObject         *object,
 
     case PROP_DEFAULT:
       g_value_set_flags (value, bb->def);
+      break;
 
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -146,18 +117,6 @@ psppire_buttonbox_get_property (GObject         *object,
 }
 
 
-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;
-
 static GParamSpec *button_flags;
 static GParamSpec *default_flags;
 
@@ -445,3 +404,8 @@ psppire_button_flags_get_type (void)
   return ftype;
 }
 
+GtkWidget*
+psppire_button_box_new (void)
+{
+  return GTK_WIDGET (g_object_new (psppire_button_box_get_type (), NULL));
+}