Deprecate widget flag: GTK_WIDGET_VISIBLE

[~andy/gtk] / modules / other / gail / gailcombobox.c

diff --git a/modules/other/gail/gailcombobox.c b/modules/other/gail/gailcombobox.c
index b90e7cc1992ac4744ad127f5d84c39ee74c1d089..d33e919b0c5721016eb49fa8b65a1f14cf595ef4 100644 (file)
--- a/modules/other/gail/gailcombobox.c
+++ b/modules/other/gail/gailcombobox.c
@@ -284,7 +284,7 @@ gail_combo_box_do_action (AtkAction *action,
      */
     return FALSE;
 
-  if (!GTK_WIDGET_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
+  if (!gtk_widget_get_sensitive (widget) || !gtk_widget_get_visible (widget))
     return FALSE;
 
   combo_box = GAIL_COMBO_BOX (action);
@@ -313,7 +313,7 @@ idle_do_action (gpointer data)
   gail_combo_box->action_idle_handler = 0;
   widget = GTK_ACCESSIBLE (gail_combo_box)->widget;
   if (widget == NULL || /* State is defunct */
-      !GTK_WIDGET_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
+      !gtk_widget_get_sensitive (widget) || !gtk_widget_get_visible (widget))
     return FALSE;
 
   combo_box = GTK_COMBO_BOX (widget);
@@ -358,15 +358,14 @@ gail_combo_box_get_keybinding (AtkAction *action,
 {
   GailComboBox *combo_box;
   gchar *return_value = NULL;
-  combo_box = GAIL_COMBO_BOX (action);
   switch (i)
   {
      case 0:
       {
-         GtkWidget *widget;                                                        
+         GtkWidget *widget;
          GtkWidget *label;
          AtkRelationSet *set;
-         AtkRelation *relation;                                                             
+         AtkRelation *relation;
          GPtrArray *target;
          gpointer target_object;
          guint key_val;
@@ -375,7 +374,7 @@ gail_combo_box_get_keybinding (AtkAction *action,
          widget = GTK_ACCESSIBLE (combo_box)->widget;
          if (widget == NULL)
              return NULL;
-         set = atk_object_ref_relation_set (ATK_OBJECT (action));                                                      
+         set = atk_object_ref_relation_set (ATK_OBJECT (action));
          if (!set)
              return NULL;
          label = NULL;
@@ -388,7 +387,7 @@ gail_combo_box_get_keybinding (AtkAction *action,
             {
                label = GTK_ACCESSIBLE (target_object)->widget;
             }
-         }  
+         }
          g_object_unref (set);
          if (GTK_IS_LABEL (label))
          {
@@ -398,7 +397,8 @@ gail_combo_box_get_keybinding (AtkAction *action,
          }
           g_free (combo_box->press_keybinding);
           combo_box->press_keybinding = return_value;
-          break;                                                                                    }                             
+          break;
+       }
     default:
           break;
   }