Deprecate widget flag: GTK_WIDGET_MAPPED

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

diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index 663a2b58aab1189cbb065c8a6c50d07193c15efa..8878ff6aa76ff271779587b07a5442dfe24ecde4 100644 (file)
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -151,7 +151,7 @@ gtk_tree_class_init (GtkTreeClass *class)
                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   tree_signals[SELECT_CHILD] =
-    gtk_signal_new (I_("select_child"),
+    gtk_signal_new (I_("select-child"),
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, select_child),
@@ -159,7 +159,7 @@ gtk_tree_class_init (GtkTreeClass *class)
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   tree_signals[UNSELECT_CHILD] =
-    gtk_signal_new (I_("unselect_child"),
+    gtk_signal_new (I_("unselect-child"),
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, unselect_child),
@@ -408,9 +408,8 @@ gtk_tree_destroy (GtkObject *object)
       g_list_free (tree->selection);
       tree->selection = NULL;
     }
-  
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 static void
@@ -522,15 +521,15 @@ gtk_tree_map (GtkWidget *widget)
       child = children->data;
       children = children->next;
       
-      if (GTK_WIDGET_VISIBLE (child) &&
-         !GTK_WIDGET_MAPPED (child))
+      if (gtk_widget_get_visible (child) &&
+         !gtk_widget_get_mapped (child))
        gtk_widget_map (child);
       
       if (GTK_TREE_ITEM (child)->subtree)
        {
          child = GTK_WIDGET (GTK_TREE_ITEM (child)->subtree);
          
-         if (GTK_WIDGET_VISIBLE (child) && !GTK_WIDGET_MAPPED (child))
+         if (gtk_widget_get_visible (child) && !gtk_widget_get_mapped (child))
            gtk_widget_map (child);
        }
     }
@@ -726,7 +725,7 @@ gtk_tree_remove_items (GtkTree *tree,
          g_message("* remove subtree associate at this item [%#x]\n",
                    (int) GTK_TREE_ITEM(widget)->subtree);
 #endif /* TREE_DEBUG */
-         if (GTK_WIDGET_MAPPED (GTK_TREE_ITEM(widget)->subtree))
+         if (gtk_widget_get_mapped (GTK_TREE_ITEM(widget)->subtree))
            gtk_widget_unmap (GTK_TREE_ITEM(widget)->subtree);
          
          gtk_widget_unparent (GTK_TREE_ITEM(widget)->subtree);
@@ -737,7 +736,7 @@ gtk_tree_remove_items (GtkTree *tree,
 #ifdef TREE_DEBUG
       g_message("* unmap and unparent widget [%#x]\n", (int)widget);
 #endif /* TREE_DEBUG */
-      if (GTK_WIDGET_MAPPED (widget))
+      if (gtk_widget_get_mapped (widget))
        gtk_widget_unmap (widget);
       
       gtk_widget_unparent (widget);
@@ -801,7 +800,7 @@ gtk_tree_remove_items (GtkTree *tree,
       gtk_tree_select_child (root_tree, widget);
     }
   
-  if (GTK_WIDGET_VISIBLE (root_tree))
+  if (gtk_widget_get_visible (GTK_WIDGET (root_tree)))
     {
 #ifdef TREE_DEBUG
       g_message("* query queue resizing for root_tree\n");
@@ -868,7 +867,7 @@ gtk_tree_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);
@@ -880,7 +879,7 @@ gtk_tree_size_allocate (GtkWidget     *widget,
              child_allocation.y += child_allocation.height;
              
              if((subtree = GTK_TREE_ITEM(child)->subtree))
-               if(GTK_WIDGET_VISIBLE (subtree))
+               if(gtk_widget_get_visible (subtree))
                  {
                    child_allocation.height = subtree->requisition.height;
                    gtk_widget_size_allocate (subtree, &child_allocation);
@@ -915,7 +914,7 @@ gtk_tree_size_request (GtkWidget      *widget,
       child = children->data;
       children = children->next;
       
-      if (GTK_WIDGET_VISIBLE (child))
+      if (gtk_widget_get_visible (child))
        {
          gtk_widget_size_request (child, &child_requisition);
          
@@ -923,7 +922,7 @@ gtk_tree_size_request (GtkWidget      *widget,
          requisition->height += child_requisition.height;
          
          if((subtree = GTK_TREE_ITEM(child)->subtree) &&
-            GTK_WIDGET_VISIBLE (subtree))
+            gtk_widget_get_visible (subtree))
            {
              gtk_widget_size_request (subtree, &child_requisition);