Deprecate widget flag: GTK_WIDGET_MAPPED

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

diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index 55bbce15ef18af8b791aa0cf961a4487aa1bde8a..8878ff6aa76ff271779587b07a5442dfe24ecde4 100644 (file)
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -26,7 +26,7 @@
 
 #undef GTK_DISABLE_DEPRECATED
 
-#include <config.h>
+#include "config.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtksignal.h"
@@ -35,6 +35,8 @@
 #define GTK_ENABLE_BROKEN
 #include "gtktree.h"
 #include "gtktreeitem.h"
+#include "gtkintl.h"
+
 #include "gtkalias.h"
 
 enum {
@@ -98,6 +100,7 @@ gtk_tree_get_type (void)
         (GtkClassInitFunc) NULL,
       };
       
+      I_("GtkTree");
       tree_type = gtk_type_unique (gtk_container_get_type (), &tree_info);
     }
   
@@ -141,14 +144,14 @@ gtk_tree_class_init (GtkTreeClass *class)
   class->unselect_child = gtk_real_tree_unselect_child;
 
   tree_signals[SELECTION_CHANGED] =
-    gtk_signal_new ("selection_changed",
+    gtk_signal_new (I_("selection-changed"),
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, selection_changed),
                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   tree_signals[SELECT_CHILD] =
-    gtk_signal_new ("select_child",
+    gtk_signal_new (I_("select-child"),
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, select_child),
@@ -156,7 +159,7 @@ gtk_tree_class_init (GtkTreeClass *class)
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   tree_signals[UNSELECT_CHILD] =
-    gtk_signal_new ("unselect_child",
+    gtk_signal_new (I_("unselect-child"),
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, unselect_child),
@@ -388,10 +391,10 @@ gtk_tree_destroy (GtkObject *object)
       child = children->data;
       children = children->next;
       
-      gtk_widget_ref (child);
+      g_object_ref (child);
       gtk_widget_unparent (child);
       gtk_widget_destroy (child);
-      gtk_widget_unref (child);
+      g_object_unref (child);
     }
   
   g_list_free (tree->children);
@@ -401,13 +404,12 @@ gtk_tree_destroy (GtkObject *object)
     {
       GList *node;
       for (node = tree->selection; node; node = node->next)
-       gtk_widget_unref ((GtkWidget *)node->data);
+       g_object_unref (node->data);
       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
@@ -455,7 +457,7 @@ gtk_tree_unselect_all (GtkTree *tree)
          GTK_TREE (tmp_item->parent)->root_tree == tree)
        gtk_tree_item_deselect (GTK_TREE_ITEM (tmp_item));
 
-      gtk_widget_unref (tmp_item);
+      g_object_unref (tmp_item);
 
       tmp_list = tmp_list->next;
     }
@@ -471,7 +473,7 @@ gtk_tree_parent_set (GtkWidget *widget,
   GtkWidget *child;
   GList *children;
   
-  if (widget->parent && GTK_IS_TREE (widget->parent))
+  if (GTK_IS_TREE (widget->parent))
     {
       gtk_tree_unselect_all (tree);
       
@@ -519,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);
        }
     }
@@ -636,7 +638,7 @@ gtk_tree_remove_items (GtkTree *tree,
   else
     {
       GtkWidget *tmp = GTK_WIDGET (tree);
-      while (tmp->parent && GTK_IS_TREE (tmp->parent))
+      while (GTK_IS_TREE (tmp->parent))
        tmp = tmp->parent;
       
       root_tree = GTK_TREE (tmp);
@@ -723,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);
@@ -734,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);
@@ -774,7 +776,7 @@ gtk_tree_remove_items (GtkTree *tree,
          root_tree->selection = g_list_remove (root_tree->selection, widget);
          
          /* unref it to authorize is destruction */
-         gtk_widget_unref (widget);
+         g_object_unref (widget);
        }
       
       /* emit only one selection_changed signal */
@@ -798,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");
@@ -865,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);
@@ -877,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);
@@ -912,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);
          
@@ -920,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);
              
@@ -1007,7 +1009,7 @@ gtk_real_tree_select_child (GtkTree   *tree,
              selection = selection->next;
              
              root_selection = g_list_remove_link (root_selection, tmp_list);
-             gtk_widget_unref (tmp_item);
+             g_object_unref (tmp_item);
              
              g_list_free (tmp_list);
            }
@@ -1019,13 +1021,13 @@ gtk_real_tree_select_child (GtkTree   *tree,
        {
          gtk_tree_item_select (GTK_TREE_ITEM (child));
          root_selection = g_list_prepend (root_selection, child);
-         gtk_widget_ref (child);
+         g_object_ref (child);
        }
       else if (child->state == GTK_STATE_SELECTED)
        {
          gtk_tree_item_deselect (GTK_TREE_ITEM (child));
          root_selection = g_list_remove (root_selection, child);
-         gtk_widget_unref (child);
+         g_object_unref (child);
        }
       
       tree->root_tree->selection = root_selection;
@@ -1050,7 +1052,7 @@ gtk_real_tree_select_child (GtkTree   *tree,
              selection = selection->next;
              
              root_selection = g_list_remove_link (root_selection, tmp_list);
-             gtk_widget_unref (tmp_item);
+             g_object_unref (tmp_item);
              
              g_list_free (tmp_list);
            }
@@ -1064,7 +1066,7 @@ gtk_real_tree_select_child (GtkTree   *tree,
        {
          gtk_tree_item_select (GTK_TREE_ITEM (child));
          root_selection = g_list_prepend (root_selection, child);
-         gtk_widget_ref (child);
+         g_object_ref (child);
          tree->root_tree->selection = root_selection;
          gtk_signal_emit (GTK_OBJECT (tree->root_tree), 
                           tree_signals[SELECTION_CHANGED]);
@@ -1092,7 +1094,7 @@ gtk_real_tree_unselect_child (GtkTree   *tree,
          GtkTree* root_tree = GTK_TREE_ROOT_TREE(tree);
          gtk_tree_item_deselect (GTK_TREE_ITEM (child));
          root_tree->selection = g_list_remove (root_tree->selection, child);
-         gtk_widget_unref (child);
+         g_object_unref (child);
          gtk_signal_emit (GTK_OBJECT (tree->root_tree), 
                           tree_signals[SELECTION_CHANGED]);
        }