Don't use GTK_WIDGET_STATE in internal code anymore

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

diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index cf691f0676229575c7d9bb503c86e4b607f10113..db4c665831c2088efdce87f6d628ed8f2df96a08 100644 (file)
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -382,7 +382,7 @@ gtk_list_size_request (GtkWidget      *widget,
       child = children->data;
       children = children->next;
 
-      if (GTK_WIDGET_VISIBLE (child))
+      if (gtk_widget_get_visible (child))
        {
          GtkRequisition child_requisition;
          
@@ -411,7 +411,7 @@ gtk_list_size_allocate (GtkWidget     *widget,
   GList *children;
 
   widget->allocation = *allocation;
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     gdk_window_move_resize (widget->window,
                            allocation->x, allocation->y,
                            allocation->width, allocation->height);
@@ -430,7 +430,7 @@ gtk_list_size_allocate (GtkWidget     *widget,
          child = children->data;
          children = children->next;
 
-         if (GTK_WIDGET_VISIBLE (child))
+         if (gtk_widget_get_visible (child))
            {
              GtkRequisition child_requisition;
              gtk_widget_get_child_requisition (child, &child_requisition);
@@ -451,7 +451,7 @@ gtk_list_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x = widget->allocation.x;
@@ -487,10 +487,10 @@ gtk_list_unmap (GtkWidget *widget)
 {
   GtkList *list = GTK_LIST (widget);
 
-  if (!GTK_WIDGET_MAPPED (widget))
+  if (!gtk_widget_get_mapped (widget))
     return;
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, FALSE);
 
   if (list_has_grab (list))
     {
@@ -785,8 +785,14 @@ static void
 gtk_list_style_set     (GtkWidget      *widget,
                         GtkStyle       *previous_style)
 {
-  if (previous_style && GTK_WIDGET_REALIZED (widget))
-    gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+  GtkStyle *style;
+
+  if (previous_style && gtk_widget_get_realized (widget))
+    {
+      style = gtk_widget_get_style (widget);
+      gdk_window_set_background (gtk_widget_get_window (widget),
+                                 &style->base[gtk_widget_get_state (widget)]);
+    }
 }
 
 /* GtkContainer Methods :
@@ -1204,7 +1210,7 @@ gtk_list_clear_items (GtkList *list,
        }
     }
 
-  if (GTK_WIDGET_VISIBLE (list))
+  if (gtk_widget_get_visible (GTK_WIDGET (list)))
     gtk_widget_queue_resize (GTK_WIDGET (list));
 }
 
@@ -1337,7 +1343,7 @@ gtk_list_remove_items_internal (GtkList    *list,
        }
     }
 
-  if (GTK_WIDGET_VISIBLE (list))
+  if (gtk_widget_get_visible (GTK_WIDGET (list)))
     gtk_widget_queue_resize (GTK_WIDGET (list));
 }
 
@@ -1456,7 +1462,7 @@ gtk_list_select_all (GtkList *list)
       list->undo_unselection = NULL;
 
       if (list->children &&
-         GTK_WIDGET_STATE (list->children->data) != GTK_STATE_SELECTED)
+         gtk_widget_get_state (list->children->data) != GTK_STATE_SELECTED)
        gtk_list_fake_toggle_row (list, GTK_WIDGET (list->children->data));
 
       list->anchor_state =  GTK_STATE_SELECTED;