Removed some GTK_WIDGET_DRAWABLE() tests - we need to update the value

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

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index f375ae268f3454583a426d566bb750dc248b5a2f..e9b405bd1f138b1a63c5359d0ae50c602bd34e63 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -711,24 +711,6 @@ gtk_container_remove (GtkContainer *container,
   gtk_signal_emit (GTK_OBJECT (container), container_signals[REMOVE], widget);
 }
 
-void
-gtk_container_block_resize (GtkContainer *container)
-{
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_CONTAINER (container));
-
-  g_message ("gtk_container_block_resize() is deprecated");
-}
-
-void
-gtk_container_unblock_resize (GtkContainer *container)
-{
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_CONTAINER (container));
-  
-  g_message ("gtk_container_unblock_resize() is deprecated");
-}
-
 void
 gtk_container_clear_resize_widgets (GtkContainer *container)
 {
@@ -782,15 +764,6 @@ gtk_container_set_resize_mode (GtkContainer  *container,
     }
 }
 
-gint    
-gtk_container_need_resize (GtkContainer     *container)
-{
-  g_message ("gtk_container_need_resize() is deprecated");
-
-  gtk_container_check_resize (container);
-  return FALSE;
-}
-
 static GtkContainer*
 gtk_container_get_resize_container (GtkContainer *container)
 {
@@ -936,11 +909,8 @@ gtk_container_real_check_resize (GtkContainer *container)
       widget->requisition.height > widget->allocation.height)
     {
       if (GTK_IS_RESIZE_CONTAINER (container))
-       {
-         gtk_widget_size_allocate (GTK_WIDGET (container),
-                                   &GTK_WIDGET (container)->allocation);
-         gtk_widget_queue_draw (GTK_WIDGET (container));
-       }
+       gtk_widget_size_allocate (GTK_WIDGET (container),
+                                 &GTK_WIDGET (container)->allocation);
       else
        gtk_widget_queue_resize (widget);
     }
@@ -1009,11 +979,8 @@ gtk_container_resize_children (GtkContainer *container)
       if (resize_container->parent)
        gtk_container_queue_resize (container);
       else
-       {
-         gtk_widget_size_allocate (GTK_WIDGET (container),
-                                   &GTK_WIDGET (container)->allocation);
-         gtk_widget_queue_draw (GTK_WIDGET (container));
-       }
+       gtk_widget_size_allocate (GTK_WIDGET (container),
+                                 &GTK_WIDGET (container)->allocation);
       return;
     }
 
@@ -1084,8 +1051,9 @@ gtk_container_resize_children (GtkContainer *container)
       widget = node->data;
       
       GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_NEEDED);
+
       gtk_widget_size_allocate (widget, &widget->allocation);
-      gtk_widget_queue_draw (widget);
+
       gtk_widget_unref (widget);
     }
   g_slist_free (resize_containers);
@@ -1394,7 +1362,7 @@ gtk_container_real_focus (GtkContainer     *container,
   /* Fail if the container is inappropriate for focus movement
    */
   if (!GTK_WIDGET_DRAWABLE (container) ||
-      !GTK_WIDGET_SENSITIVE (container))
+      !GTK_WIDGET_IS_SENSITIVE (container))
     return FALSE;
 
   return_val = FALSE;
@@ -1422,7 +1390,7 @@ gtk_container_real_focus (GtkContainer     *container,
          tmp_list = children;
          while (tmp_list)
            {
-             if (GTK_WIDGET_SENSITIVE (tmp_list->data) &&
+             if (GTK_WIDGET_IS_SENSITIVE (tmp_list->data) &&
                  GTK_WIDGET_DRAWABLE (tmp_list->data) &&
                  (GTK_IS_CONTAINER (tmp_list->data) || GTK_WIDGET_CAN_FOCUS (tmp_list->data)))
                tmp_list = tmp_list->next;