/tmp/cvsX7MHVx

[~andy/gtk] / gtk / gtkcheckbutton.c

diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index c0d767e222e6bff2f53ecbb20180c537978e8c8a..6899a504408c54e801d58ea77966704f71379440 100644 (file)
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -36,8 +36,6 @@
 #define INDICATOR_SPACING  2
 
 
-static void gtk_check_button_class_init          (GtkCheckButtonClass *klass);
-static void gtk_check_button_init                (GtkCheckButton      *check_button);
 static void gtk_check_button_size_request        (GtkWidget           *widget,
                                                  GtkRequisition      *requisition);
 static void gtk_check_button_size_allocate       (GtkWidget           *widget,
@@ -51,36 +49,7 @@ static void gtk_check_button_draw_indicator      (GtkCheckButton      *check_but
 static void gtk_real_check_button_draw_indicator (GtkCheckButton      *check_button,
                                                  GdkRectangle        *area);
 
-static GtkToggleButtonClass *parent_class = NULL;
-
-
-GType
-gtk_check_button_get_type (void)
-{
-  static GType check_button_type = 0;
-  
-  if (!check_button_type)
-    {
-      static const GTypeInfo check_button_info =
-      {
-       sizeof (GtkCheckButtonClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_check_button_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkCheckButton),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_check_button_init,
-      };
-      
-      check_button_type =
-       g_type_register_static (GTK_TYPE_TOGGLE_BUTTON, "GtkCheckButton",
-                               &check_button_info, 0);
-    }
-  
-  return check_button_type;
-}
+G_DEFINE_TYPE (GtkCheckButton, gtk_check_button, GTK_TYPE_TOGGLE_BUTTON)
 
 static void
 gtk_check_button_class_init (GtkCheckButtonClass *class)
@@ -88,7 +57,6 @@ gtk_check_button_class_init (GtkCheckButtonClass *class)
   GtkWidgetClass *widget_class;
   
   widget_class = (GtkWidgetClass*) class;
-  parent_class = g_type_class_peek_parent (class);
   
   widget_class->size_request = gtk_check_button_size_request;
   widget_class->size_allocate = gtk_check_button_size_allocate;
@@ -149,7 +117,10 @@ gtk_check_button_new_with_label (const gchar *label)
 GtkWidget*
 gtk_check_button_new_with_mnemonic (const gchar *label)
 {
-  return g_object_new (GTK_TYPE_CHECK_BUTTON, "label", label, "use_underline", TRUE, NULL);
+  return g_object_new (GTK_TYPE_CHECK_BUTTON, 
+                       "label", label, 
+                       "use-underline", TRUE, 
+                       NULL);
 }
 
 
@@ -208,10 +179,10 @@ _gtk_check_button_get_props (GtkCheckButton *check_button,
   GtkWidget *widget =  GTK_WIDGET (check_button);
 
   if (indicator_size)
-    gtk_widget_style_get (widget, "indicator_size", indicator_size, NULL);
+    gtk_widget_style_get (widget, "indicator-size", indicator_size, NULL);
 
   if (indicator_spacing)
-    gtk_widget_style_get (widget, "indicator_spacing", indicator_spacing, NULL);
+    gtk_widget_style_get (widget, "indicator-spacing", indicator_spacing, NULL);
 }
 
 static void
@@ -258,7 +229,7 @@ gtk_check_button_size_request (GtkWidget      *widget,
       requisition->height = MAX (requisition->height, temp) + 2 * (focus_width + focus_pad);
     }
   else
-    (* GTK_WIDGET_CLASS (parent_class)->size_request) (widget, requisition);
+    (* GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_request) (widget, requisition);
 }
 
 static void
@@ -323,18 +294,16 @@ gtk_check_button_size_allocate (GtkWidget     *widget,
        }
     }
   else
-    (* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
+    (* GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_allocate) (widget, allocation);
 }
 
 static gint
 gtk_check_button_expose (GtkWidget      *widget,
                         GdkEventExpose *event)
 {
-  GtkCheckButton *check_button;
   GtkToggleButton *toggle_button;
   GtkBin *bin;
   
-  check_button = GTK_CHECK_BUTTON (widget);
   toggle_button = GTK_TOGGLE_BUTTON (widget);
   bin = GTK_BIN (widget);
   
@@ -349,8 +318,8 @@ gtk_check_button_expose (GtkWidget      *widget,
                                            bin->child,
                                            event);
        }
-      else if (GTK_WIDGET_CLASS (parent_class)->expose_event)
-       (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
+      else if (GTK_WIDGET_CLASS (gtk_check_button_parent_class)->expose_event)
+       (* GTK_WIDGET_CLASS (gtk_check_button_parent_class)->expose_event) (widget, event);
     }
   
   return FALSE;
@@ -394,9 +363,11 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
       button = GTK_BUTTON (check_button);
       toggle_button = GTK_TOGGLE_BUTTON (check_button);
   
-      gtk_widget_style_get (widget, "interior_focus", &interior_focus,
+      gtk_widget_style_get (widget, 
+                           "interior-focus", &interior_focus,
                            "focus-line-width", &focus_width, 
-                           "focus-padding", &focus_pad, NULL);
+                           "focus-padding", &focus_pad, 
+                           NULL);
 
       _gtk_check_button_get_props (check_button, &indicator_size, &indicator_spacing);