Deprecate widget flag: GTK_WIDGET_VISIBLE

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

diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 71c21e01621f3710d0bc3c5f455d3e22876832fb..4dd458bdfc8171745e434f4b395edeb4c3088d21 100644 (file)
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
+#include "config.h"
 #include "gtkcheckbutton.h"
 #include "gtklabel.h"
 #include "gtkprivate.h"
@@ -49,7 +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);
 
-G_DEFINE_TYPE (GtkCheckButton, gtk_check_button, GTK_TYPE_TOGGLE_BUTTON);
+G_DEFINE_TYPE (GtkCheckButton, gtk_check_button, GTK_TYPE_TOGGLE_BUTTON)
 
 static void
 gtk_check_button_class_init (GtkCheckButtonClass *class)
@@ -117,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);
 }
 
 
@@ -130,7 +133,7 @@ gtk_check_button_paint (GtkWidget    *widget,
 {
   GtkCheckButton *check_button = GTK_CHECK_BUTTON (widget);
   
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       gint border_width;
       gint interior_focus;
@@ -146,20 +149,20 @@ gtk_check_button_paint (GtkWidget    *widget,
       gtk_check_button_draw_indicator (check_button, area);
       
       border_width = GTK_CONTAINER (widget)->border_width;
-      if (GTK_WIDGET_HAS_FOCUS (widget))
+      if (gtk_widget_has_focus (widget))
        {
          GtkWidget *child = GTK_BIN (widget)->child;
          
-         if (interior_focus && child && GTK_WIDGET_VISIBLE (child))
+         if (interior_focus && child && gtk_widget_get_visible (child))
            gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
-                            NULL, widget, "checkbutton",
+                            area, widget, "checkbutton",
                             child->allocation.x - focus_width - focus_pad,
                             child->allocation.y - focus_width - focus_pad,
                             child->allocation.width + 2 * (focus_width + focus_pad),
                             child->allocation.height + 2 * (focus_width + focus_pad));
          else
            gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget), 
-                            NULL, widget, "checkbutton",
+                            area, widget, "checkbutton",
                             border_width + widget->allocation.x,
                             border_width + widget->allocation.y,
                             widget->allocation.width - 2 * border_width,
@@ -210,7 +213,7 @@ gtk_check_button_size_request (GtkWidget      *widget,
                                   &indicator_size, &indicator_spacing);
       
       child = GTK_BIN (widget)->child;
-      if (child && GTK_WIDGET_VISIBLE (child))
+      if (child && gtk_widget_get_visible (child))
        {
          GtkRequisition child_requisition;
          
@@ -226,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 (gtk_check_button_parent_class)->size_request) (widget, requisition);
+    GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_request (widget, requisition);
 }
 
 static void
@@ -261,7 +264,7 @@ gtk_check_button_size_allocate (GtkWidget     *widget,
                                allocation->x, allocation->y,
                                allocation->width, allocation->height);
       
-      if (GTK_BIN (button)->child && GTK_WIDGET_VISIBLE (GTK_BIN (button)->child))
+      if (GTK_BIN (button)->child && gtk_widget_get_visible (GTK_BIN (button)->child))
        {
          GtkRequisition child_requisition;
          gint border_width = GTK_CONTAINER (widget)->border_width;
@@ -291,7 +294,7 @@ gtk_check_button_size_allocate (GtkWidget     *widget,
        }
     }
   else
-    (* GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_allocate) (widget, allocation);
+    GTK_WIDGET_CLASS (gtk_check_button_parent_class)->size_allocate (widget, allocation);
 }
 
 static gint
@@ -304,7 +307,7 @@ gtk_check_button_expose (GtkWidget      *widget,
   toggle_button = GTK_TOGGLE_BUTTON (widget);
   bin = GTK_BIN (widget);
   
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       if (toggle_button->draw_indicator)
        {
@@ -316,7 +319,7 @@ gtk_check_button_expose (GtkWidget      *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);
+       GTK_WIDGET_CLASS (gtk_check_button_parent_class)->expose_event (widget, event);
     }
   
   return FALSE;
@@ -332,9 +335,9 @@ gtk_check_button_draw_indicator (GtkCheckButton *check_button,
   g_return_if_fail (GTK_IS_CHECK_BUTTON (check_button));
   
   class = GTK_CHECK_BUTTON_GET_CLASS (check_button);
-  
+
   if (class->draw_indicator)
-    (* class->draw_indicator) (check_button, area);
+    class->draw_indicator (check_button, area);
 }
 
 static void
@@ -353,10 +356,11 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
   gint focus_width;
   gint focus_pad;
   gboolean interior_focus;
-  
-  if (GTK_WIDGET_DRAWABLE (check_button))
+
+  widget = GTK_WIDGET (check_button);
+
+  if (gtk_widget_is_drawable (widget))
     {
-      widget = GTK_WIDGET (check_button);
       button = GTK_BUTTON (check_button);
       toggle_button = GTK_TOGGLE_BUTTON (check_button);
   
@@ -372,7 +376,7 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
       y = widget->allocation.y + (widget->allocation.height - indicator_size) / 2;
 
       child = GTK_BIN (check_button)->child;
-      if (!interior_focus || !(child && GTK_WIDGET_VISIBLE (child)))
+      if (!interior_focus || !(child && gtk_widget_get_visible (child)))
        x += focus_width + focus_pad;      
 
       if (toggle_button->inconsistent)
@@ -386,7 +390,7 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
        state_type = GTK_STATE_ACTIVE;
       else if (button->in_button)
        state_type = GTK_STATE_PRELIGHT;
-      else if (!GTK_WIDGET_IS_SENSITIVE (widget))
+      else if (!gtk_widget_is_sensitive (widget))
        state_type = GTK_STATE_INSENSITIVE;
       else
        state_type = GTK_STATE_NORMAL;