Yuri Chornoivan contributed some typo fixes

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

diff --git a/src/ui/gui/psppire-buttonbox.c b/src/ui/gui/psppire-buttonbox.c
index 18ce4a0dd1a01c33b979368f6c0c915d820d46b1..a01518994738513898083b8d878572224239548a 100644 (file)
--- 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_buttonbox_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,
@@ -69,11 +39,11 @@ enum {
 };
 
 static void
-set_default (PsppireButtonbox *bb)
+set_default (PsppireButtonBox *bb)
 {
   int i;
 
-  for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i)
+  for (i = 0 ; i < n_PsppireButtonBoxButtons ; ++i)
     if (bb->def == (1 << i))
       {
         gtk_widget_set_can_default (bb->button[i], TRUE);
@@ -89,13 +59,13 @@ psppire_buttonbox_set_property (GObject         *object,
 {
   gint i;
   guint flags;
-  PsppireButtonbox *bb = PSPPIRE_BUTTONBOX (object);
+  PsppireButtonBox *bb = PSPPIRE_BUTTON_BOX (object);
 
   switch (prop_id)
     {
     case PROP_BUTTONS:
       flags = g_value_get_flags (value);
-      for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i)
+      for (i = 0 ; i < n_PsppireButtonBoxButtons ; ++i)
         g_object_set (bb->button[i], "visible", 0x01 & (flags >> i)  , NULL);
       break;
 
@@ -119,12 +89,12 @@ psppire_buttonbox_get_property (GObject         *object,
   guint flags = 0;
   gint i;
 
-  PsppireButtonbox *bb = PSPPIRE_BUTTONBOX (object);
+  PsppireButtonBox *bb = PSPPIRE_BUTTON_BOX (object);
 
   switch (prop_id)
     {
     case PROP_BUTTONS:
-      for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i)
+      for (i = 0 ; i < n_PsppireButtonBoxButtons ; ++i)
         {
           gboolean visibility;
           g_object_get (bb->button[i], "visible", &visibility, NULL);
@@ -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,23 +117,11 @@ 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;
 
 static void
-psppire_button_box_class_init (PsppireButtonboxClass *class)
+psppire_button_box_class_init (PsppireButtonBoxClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
 
@@ -187,7 +146,7 @@ psppire_button_box_class_init (PsppireButtonboxClass *class)
   default_flags =
     g_param_spec_flags ("default",
                        "Default",
-                       "The mask that decides what what button grabs the default",
+                       "The mask that decides what button grabs the default",
                        PSPPIRE_TYPE_BUTTON_MASK,
                        0,
                        G_PARAM_READWRITE);
@@ -292,7 +251,7 @@ help_clicked (GtkWidget *w, gpointer data)
 static void
 on_validity_change (GtkWidget *toplevel, gboolean valid, gpointer data)
 {
-  PsppireButtonbox *bb = data;
+  PsppireButtonBox *bb = data;
 
   /* Set the sensitivity of all the 'executive order' buttons */
   gtk_widget_set_sensitive (GTK_WIDGET (bb->button[PSPPIRE_BUTTON_OK]), valid);
@@ -304,7 +263,7 @@ on_validity_change (GtkWidget *toplevel, gboolean valid, gpointer data)
 static gboolean
 on_key_press (GtkWidget *w, GdkEventKey *e, gpointer ud)
 {
-  PsppireButtonbox *bb = PSPPIRE_BUTTONBOX (ud);
+  PsppireButtonBox *bb = PSPPIRE_BUTTON_BOX (ud);
   if (e->keyval == GDK_KEY_Escape)
     {
       g_signal_emit_by_name (bb->button[PSPPIRE_BUTTON_CANCEL], "activate");
@@ -328,12 +287,12 @@ on_realize (GtkWidget *buttonbox, gpointer data)
                        G_CALLBACK (on_key_press), buttonbox);
     }
 
-  set_default (PSPPIRE_BUTTONBOX (buttonbox));
+  set_default (PSPPIRE_BUTTON_BOX (buttonbox));
 }
 
 
 static void
-psppire_button_box_init (PsppireButtonbox *bb)
+psppire_button_box_init (PsppireButtonBox *bb)
 {
   bb->def = PSPPIRE_BUTTON_CONTINUE;
 
@@ -409,7 +368,7 @@ psppire_button_box_init (PsppireButtonbox *bb)
 
     flags = g_value_get_flags (&value);
 
-    for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i)
+    for (i = 0 ; i < n_PsppireButtonBoxButtons ; ++i)
       g_object_set (bb->button[i], "visible", 0x01 & (flags >> i)  , NULL);
 
     g_value_unset (&value);
@@ -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));
+}