replace g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.

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

diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 3ead47c46c370c77733a43b11b14a6bdbd6fe74b..1fac2ce5cbbe4dc4177a2a8561fb189f6c82e5c4 100644 (file)
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -432,37 +432,45 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_select_row),
-                   gtk_marshal_VOID__POINTER_INT,
-                   GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
+                   gtk_marshal_VOID__BOXED_INT,
+                   GTK_TYPE_NONE, 2,
+                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE,
+                   GTK_TYPE_INT);
   ctree_signals[TREE_UNSELECT_ROW] =
     gtk_signal_new ("tree_unselect_row",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_unselect_row),
-                   gtk_marshal_VOID__POINTER_INT,
-                   GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
+                   gtk_marshal_VOID__BOXED_INT,
+                   GTK_TYPE_NONE, 2,
+                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE,
+                   GTK_TYPE_INT);
   ctree_signals[TREE_EXPAND] =
     gtk_signal_new ("tree_expand",
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_expand),
-                   gtk_marshal_VOID__POINTER,
-                   GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+                   gtk_marshal_VOID__BOXED,
+                   GTK_TYPE_NONE, 1,
+                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE);
   ctree_signals[TREE_COLLAPSE] =
     gtk_signal_new ("tree_collapse",
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_collapse),
-                   gtk_marshal_VOID__POINTER,
-                   GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+                   gtk_marshal_VOID__BOXED,
+                   GTK_TYPE_NONE, 1,
+                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE);
   ctree_signals[TREE_MOVE] =
     gtk_signal_new ("tree_move",
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_move),
-                   gtk_marshal_VOID__POINTER_POINTER_POINTER,
-                   GTK_TYPE_NONE, 3, GTK_TYPE_POINTER,
-                   GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+                   gtk_marshal_VOID__BOXED_BOXED_BOXED,
+                   GTK_TYPE_NONE, 3,
+                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE,
+                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE,
+                   GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE);
   ctree_signals[CHANGE_FOCUS_ROW_EXPANSION] =
     gtk_signal_new ("change_focus_row_expansion",
                    GTK_RUN_LAST | GTK_RUN_ACTION,
@@ -474,22 +482,48 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
 
   binding_set = gtk_binding_set_by_class (klass);
   gtk_binding_entry_add_signal (binding_set,
-                               '+', GDK_SHIFT_MASK,
+                               GDK_plus, GDK_SHIFT_MASK,
+                               "change_focus_row_expansion", 1,
+                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND);
+  gtk_binding_entry_add_signal (binding_set,
+                               GDK_plus, 0,
+                               "change_focus_row_expansion", 1,
+                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND);
+  gtk_binding_entry_add_signal (binding_set,
+                               GDK_plus, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+                               "change_focus_row_expansion", 1,
+                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE);
+  gtk_binding_entry_add_signal (binding_set,
+                               GDK_plus, GDK_CONTROL_MASK,
+                               "change_focus_row_expansion", 1,
+                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE);
+
+  gtk_binding_entry_add_signal (binding_set,
+                               GDK_KP_Add, GDK_SHIFT_MASK,
                                "change_focus_row_expansion", 1,
                                GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_KP_Add, 0,
                                "change_focus_row_expansion", 1,
                                GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND);
+  gtk_binding_entry_add_signal (binding_set,
+                               GDK_KP_Add, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+                               "change_focus_row_expansion", 1,
+                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_KP_Add, GDK_CONTROL_MASK,
                                "change_focus_row_expansion", 1,
-                               GTK_TYPE_ENUM,
-                               GTK_CTREE_EXPANSION_EXPAND_RECURSIVE);
+                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE);
+  
   gtk_binding_entry_add_signal (binding_set,
-                               '-', 0,
+                               GDK_minus, 0,
                                "change_focus_row_expansion", 1,
                                GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_COLLAPSE);
+  gtk_binding_entry_add_signal (binding_set,
+                                GDK_minus, GDK_CONTROL_MASK,
+                               "change_focus_row_expansion", 1,
+                               GTK_TYPE_ENUM,
+                               GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_KP_Subtract, 0,
                                "change_focus_row_expansion", 1,
@@ -500,18 +534,39 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
                                GTK_TYPE_ENUM,
                                GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE);
   gtk_binding_entry_add_signal (binding_set,
-                               '=', 0,
+                               GDK_equal, 0,
+                               "change_focus_row_expansion", 1,
+                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
+  gtk_binding_entry_add_signal (binding_set,
+                               GDK_KP_Equal, 0,
+                               "change_focus_row_expansion", 1,
+                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
+  gtk_binding_entry_add_signal (binding_set,
+                               GDK_equal, GDK_SHIFT_MASK,
+                               "change_focus_row_expansion", 1,
+                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
+  gtk_binding_entry_add_signal (binding_set,
+                                GDK_KP_Equal, GDK_SHIFT_MASK,
                                "change_focus_row_expansion", 1,
                                GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_KP_Multiply, 0,
                                "change_focus_row_expansion", 1,
                                GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
+  gtk_binding_entry_add_signal (binding_set,
+                               GDK_asterisk, 0,
+                               "change_focus_row_expansion", 1,
+                               GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_KP_Multiply, GDK_CONTROL_MASK,
                                "change_focus_row_expansion", 1,
                                GTK_TYPE_ENUM,
                                GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE);
+  gtk_binding_entry_add_signal (binding_set,
+                               GDK_asterisk, GDK_CONTROL_MASK,
+                               "change_focus_row_expansion", 1,
+                               GTK_TYPE_ENUM,
+                               GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE);  
 }
 
 static void
@@ -685,7 +740,6 @@ gtk_ctree_realize (GtkWidget *widget)
   GtkCTreeNode *child;
   gint i;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CTREE (widget));
 
   GTK_WIDGET_CLASS (parent_class)->realize (widget);
@@ -728,7 +782,6 @@ gtk_ctree_unrealize (GtkWidget *widget)
   GtkCTree *ctree;
   GtkCList *clist;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CTREE (widget));
 
   GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
@@ -765,7 +818,6 @@ gtk_ctree_button_press (GtkWidget      *widget,
   GtkCList *clist;
   gint button_actions;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CTREE (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -803,9 +855,10 @@ gtk_ctree_button_press (GtkWidget      *widget,
          else
            gtk_ctree_expand (ctree, work);
 
-         return FALSE;
+         return TRUE;
        }
     }
+  
   return GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, event);
 }
 
@@ -821,7 +874,6 @@ draw_drag_highlight (GtkCList        *clist,
   gint i;
   gint y = 0;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
 
   ctree = GTK_CTREE (clist);
@@ -1661,7 +1713,7 @@ draw_row (GtkCList     *clist,
 
       if (gdk_rectangle_intersect (area, &cell_rectangle, crect))
        gdk_draw_rectangle (clist->clist_window,
-                           widget->style->base_gc[GTK_STATE_ACTIVE], TRUE,
+                           widget->style->base_gc[GTK_STATE_NORMAL], TRUE,
                            crect->x, crect->y, crect->width, crect->height);
     }
   else
@@ -1670,7 +1722,7 @@ draw_row (GtkCList     *clist,
       crect = &cell_rectangle;
 
       gdk_draw_rectangle (clist->clist_window,
-                         widget->style->base_gc[GTK_STATE_ACTIVE], TRUE,
+                         widget->style->base_gc[GTK_STATE_NORMAL], TRUE,
                          crect->x, crect->y, crect->width, crect->height);
     }
 
@@ -1717,7 +1769,7 @@ draw_row (GtkCList     *clist,
       if (!area || gdk_rectangle_intersect (area, &cell_rectangle, crect))
        {
          gdk_draw_rectangle (clist->clist_window,
-                             widget->style->base_gc[GTK_STATE_ACTIVE], TRUE,
+                             widget->style->base_gc[GTK_STATE_NORMAL], TRUE,
                              crect->x, crect->y, crect->width, crect->height);
 
          /* horizontal black lines */
@@ -2059,7 +2111,7 @@ gtk_ctree_link (GtkCTree     *ctree,
 
   clist = GTK_CLIST (ctree);
 
-  if (update_focus_row && clist->selection_mode == GTK_SELECTION_EXTENDED)
+  if (update_focus_row && clist->selection_mode == GTK_SELECTION_MULTIPLE)
     {
       GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
       
@@ -2198,13 +2250,12 @@ gtk_ctree_unlink (GtkCTree     *ctree,
   GtkCTreeNode *parent;
   GList *list;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
 
   clist = GTK_CLIST (ctree);
   
-  if (update_focus_row && clist->selection_mode == GTK_SELECTION_EXTENDED)
+  if (update_focus_row && clist->selection_mode == GTK_SELECTION_MULTIPLE)
     {
       GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
       
@@ -2317,7 +2368,6 @@ real_row_move (GtkCList *clist,
   GtkCTree *ctree;
   GtkCTreeNode *node;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
 
   if (GTK_CLIST_AUTO_SORT (clist))
@@ -2386,7 +2436,7 @@ real_tree_move (GtkCTree     *ctree,
 
   visible = gtk_ctree_is_viewable (ctree, node);
 
-  if (clist->selection_mode == GTK_SELECTION_EXTENDED)
+  if (clist->selection_mode == GTK_SELECTION_MULTIPLE)
     {
       GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
       
@@ -2418,8 +2468,7 @@ real_tree_move (GtkCTree     *ctree,
   gtk_clist_freeze (clist);
 
   work = NULL;
-  if (gtk_ctree_is_viewable (ctree, node) ||
-      gtk_ctree_is_viewable (ctree, new_sibling))
+  if (gtk_ctree_is_viewable (ctree, node))
     work = GTK_CTREE_NODE (g_list_nth (clist->row_list, clist->focus_row));
       
   gtk_ctree_unlink (ctree, node, FALSE);
@@ -2450,7 +2499,6 @@ change_focus_row_expansion (GtkCTree          *ctree,
   GtkCList *clist;
   GtkCTreeNode *node;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   clist = GTK_CLIST (ctree);
@@ -2496,7 +2544,6 @@ real_tree_expand (GtkCTree     *ctree,
   gboolean visible;
   gint level;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   if (!node || GTK_CTREE_ROW (node)->expanded || GTK_CTREE_ROW (node)->is_leaf)
@@ -2640,7 +2687,6 @@ real_tree_collapse (GtkCTree     *ctree,
   gboolean visible;
   gint level;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   if (!node || !GTK_CTREE_ROW (node)->expanded ||
@@ -2817,7 +2863,6 @@ cell_size_request (GtkCList       *clist,
   PangoLayout *layout;
   PangoRectangle logical_rect;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
   g_return_if_fail (requisition != NULL);
 
@@ -2904,8 +2949,10 @@ set_cell_contents (GtkCList    *clist,
   gboolean visible = FALSE;
   GtkCTree *ctree;
   GtkRequisition requisition;
+  gchar *old_text = NULL;
+  GdkPixmap *old_pixmap = NULL;
+  GdkBitmap *old_mask = NULL;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
   g_return_if_fail (clist_row != NULL);
 
@@ -2930,26 +2977,17 @@ set_cell_contents (GtkCList    *clist,
     {
     case GTK_CELL_EMPTY:
       break;
-      
     case GTK_CELL_TEXT:
-      g_free (GTK_CELL_TEXT (clist_row->cell[column])->text);
+      old_text = GTK_CELL_TEXT (clist_row->cell[column])->text;
       break;
     case GTK_CELL_PIXMAP:
-      gdk_pixmap_unref (GTK_CELL_PIXMAP (clist_row->cell[column])->pixmap);
-      if (GTK_CELL_PIXMAP (clist_row->cell[column])->mask)
-       gdk_bitmap_unref (GTK_CELL_PIXMAP (clist_row->cell[column])->mask);
+      old_pixmap = GTK_CELL_PIXMAP (clist_row->cell[column])->pixmap;
+      old_mask = GTK_CELL_PIXMAP (clist_row->cell[column])->mask;
       break;
     case GTK_CELL_PIXTEXT:
-      if (GTK_CELL_PIXTEXT (clist_row->cell[column])->text)
-       g_free (GTK_CELL_PIXTEXT (clist_row->cell[column])->text);
-      if (GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap)
-       {
-         gdk_pixmap_unref
-           (GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap);
-         if (GTK_CELL_PIXTEXT (clist_row->cell[column])->mask)
-           gdk_bitmap_unref
-             (GTK_CELL_PIXTEXT (clist_row->cell[column])->mask);
-       }
+      old_text = GTK_CELL_PIXTEXT (clist_row->cell[column])->text;
+      old_pixmap = GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap;
+      old_mask = GTK_CELL_PIXTEXT (clist_row->cell[column])->mask;
       break;
     case GTK_CELL_WIDGET:
       /* unimplimented */
@@ -2963,6 +3001,8 @@ set_cell_contents (GtkCList    *clist,
   if (column == ctree->tree_column && type != GTK_CELL_EMPTY)
     type = GTK_CELL_PIXTEXT;
 
+  /* Note that pixmap and mask were already ref'ed by the caller
+   */
   switch (type)
     {
     case GTK_CELL_TEXT:
@@ -3017,6 +3057,13 @@ set_cell_contents (GtkCList    *clist,
   if (visible && clist->column[column].auto_resize &&
       !GTK_CLIST_AUTO_RESIZE_BLOCKED (clist))
     column_auto_resize (clist, clist_row, column, requisition.width);
+
+  if (old_text)
+    g_free (old_text);
+  if (old_pixmap)
+    gdk_pixmap_unref (old_pixmap);
+  if (old_mask)
+    gdk_pixmap_unref (old_mask);
 }
 
 static void 
@@ -3228,7 +3275,7 @@ row_delete (GtkCTree    *ctree,
        {
          if (GTK_WIDGET_REALIZED (ctree))
            gtk_style_detach (ctree_row->row.cell[i].style);
-         gtk_style_unref (ctree_row->row.cell[i].style);
+         g_object_unref (ctree_row->row.cell[i].style);
        }
     }
 
@@ -3236,7 +3283,7 @@ row_delete (GtkCTree    *ctree,
     {
       if (GTK_WIDGET_REALIZED (ctree))
        gtk_style_detach (ctree_row->row.style);
-      gtk_style_unref (ctree_row->row.style);
+      g_object_unref (ctree_row->row.style);
     }
 
   if (ctree_row->pixmap_closed)
@@ -3276,7 +3323,6 @@ real_select_row (GtkCList *clist,
 {
   GList *node;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
   
   if ((node = g_list_nth (clist->row_list, row)) &&
@@ -3293,7 +3339,6 @@ real_unselect_row (GtkCList *clist,
 {
   GList *node;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
 
   if ((node = g_list_nth (clist->row_list, row)))
@@ -3311,7 +3356,6 @@ real_tree_select (GtkCTree     *ctree,
   GtkCTreeNode *sel_row;
   gboolean node_selected;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   if (!node || GTK_CTREE_ROW (node)->row.state == GTK_STATE_SELECTED ||
@@ -3367,7 +3411,6 @@ real_tree_unselect (GtkCTree     *ctree,
 {
   GtkCList *clist;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   if (!node || GTK_CTREE_ROW (node)->row.state != GTK_STATE_SELECTED)
@@ -3405,7 +3448,6 @@ real_select_all (GtkCList *clist)
   GtkCTree *ctree;
   GtkCTreeNode *node;
   
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
 
   ctree = GTK_CTREE (clist);
@@ -3416,7 +3458,7 @@ real_select_all (GtkCList *clist)
     case GTK_SELECTION_BROWSE:
       return;
 
-    case GTK_SELECTION_EXTENDED:
+    case GTK_SELECTION_MULTIPLE:
 
       gtk_clist_freeze (clist);
 
@@ -3437,10 +3479,6 @@ real_select_all (GtkCList *clist)
       gtk_clist_thaw (clist);
       break;
 
-    case GTK_SELECTION_MULTIPLE:
-      gtk_ctree_select_recursive (ctree, NULL);
-      break;
-
     default:
       /* do nothing */
       break;
@@ -3454,7 +3492,6 @@ real_unselect_all (GtkCList *clist)
   GtkCTreeNode *node;
   GList *list;
  
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
   
   ctree = GTK_CTREE (clist);
@@ -3471,7 +3508,7 @@ real_unselect_all (GtkCList *clist)
        }
       break;
 
-    case GTK_SELECTION_EXTENDED:
+    case GTK_SELECTION_MULTIPLE:
       g_list_free (clist->undo_selection);
       g_list_free (clist->undo_unselection);
       clist->undo_selection = NULL;
@@ -3509,7 +3546,6 @@ ctree_is_hot_spot (GtkCTree     *ctree,
   gint xl;
   gint yu;
   
-  g_return_val_if_fail (ctree != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
   g_return_val_if_fail (node != NULL, FALSE);
 
@@ -3521,7 +3557,7 @@ ctree_is_hot_spot (GtkCTree     *ctree,
 
   tree_row = GTK_CTREE_ROW (node);
 
-  cell = GTK_CELL_PIXTEXT(tree_row->row.cell[ctree->tree_column]);
+  cell = GTK_CELL_PIXTEXT (tree_row->row.cell[ctree->tree_column]);
 
   yu = (ROW_TOP_YPIXEL (clist, row) + (clist->row_height - PM_SIZE) / 2 -
        (clist->row_height - 1) % 2);
@@ -3605,7 +3641,6 @@ real_insert_row (GtkCList *clist,
   GtkCTreeNode *sibling;
   GtkCTreeNode *node;
 
-  g_return_val_if_fail (clist != NULL, -1);
   g_return_val_if_fail (GTK_IS_CTREE (clist), -1);
 
   sibling = GTK_CTREE_NODE (g_list_nth (clist->row_list, row));
@@ -3640,7 +3675,6 @@ gtk_ctree_insert_node (GtkCTree     *ctree,
   GList *list;
   gint i;
 
-  g_return_val_if_fail (ctree != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
   if (sibling)
     g_return_val_if_fail (GTK_CTREE_ROW (sibling)->parent == parent, NULL);
@@ -3718,7 +3752,6 @@ gtk_ctree_insert_gnode (GtkCTree          *ctree,
   GNode *work;
   guint depth = 1;
 
-  g_return_val_if_fail (ctree != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
   g_return_val_if_fail (gnode != NULL, NULL);
   g_return_val_if_fail (func != NULL, NULL);
@@ -3741,6 +3774,7 @@ gtk_ctree_insert_gnode (GtkCTree          *ctree,
   if (!func (ctree, depth, gnode, cnode, data))
     {
       tree_delete_row (ctree, cnode, NULL);
+      gtk_clist_thaw (clist);
       return NULL;
     }
 
@@ -3783,7 +3817,6 @@ gtk_ctree_export_to_gnode (GtkCTree          *ctree,
   GNode *gnode;
   gint depth;
 
-  g_return_val_if_fail (ctree != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
   g_return_val_if_fail (node != NULL, NULL);
   g_return_val_if_fail (func != NULL, NULL);
@@ -3826,7 +3859,6 @@ real_remove_row (GtkCList *clist,
 {
   GtkCTreeNode *node;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
 
   node = GTK_CTREE_NODE (g_list_nth (clist->row_list, row));
@@ -3841,7 +3873,6 @@ gtk_ctree_remove_node (GtkCTree     *ctree,
 {
   GtkCList *clist;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   clist = GTK_CLIST (ctree);
@@ -3875,7 +3906,6 @@ real_clear (GtkCList *clist)
   GtkCTreeNode *work;
   GtkCTreeNode *ptr;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
 
   ctree = GTK_CTREE (clist);
@@ -3914,7 +3944,6 @@ gtk_ctree_post_recursive (GtkCTree     *ctree,
   GtkCTreeNode *work;
   GtkCTreeNode *tmp;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (func != NULL);
 
@@ -3944,7 +3973,6 @@ gtk_ctree_post_recursive_to_depth (GtkCTree     *ctree,
   GtkCTreeNode *work;
   GtkCTreeNode *tmp;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (func != NULL);
 
@@ -3982,7 +4010,6 @@ gtk_ctree_pre_recursive (GtkCTree     *ctree,
   GtkCTreeNode *work;
   GtkCTreeNode *tmp;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (func != NULL);
 
@@ -4012,7 +4039,6 @@ gtk_ctree_pre_recursive_to_depth (GtkCTree     *ctree,
   GtkCTreeNode *work;
   GtkCTreeNode *tmp;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (func != NULL);
 
@@ -4048,7 +4074,6 @@ gtk_ctree_is_viewable (GtkCTree     *ctree,
 { 
   GtkCTreeRow *work;
 
-  g_return_val_if_fail (ctree != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
   g_return_val_if_fail (node != NULL, FALSE);
 
@@ -4067,7 +4092,6 @@ GtkCTreeNode *
 gtk_ctree_last (GtkCTree     *ctree,
                GtkCTreeNode *node)
 {
-  g_return_val_if_fail (ctree != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
 
   if (!node) 
@@ -4088,12 +4112,11 @@ gtk_ctree_find_node_ptr (GtkCTree    *ctree,
 {
   GtkCTreeNode *node;
   
-  g_return_val_if_fail (ctree != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
   g_return_val_if_fail (ctree_row != NULL, FALSE);
   
   if (ctree_row->parent)
-    node = GTK_CTREE_ROW(ctree_row->parent)->children;
+    node = GTK_CTREE_ROW (ctree_row->parent)->children;
   else
     node = GTK_CTREE_NODE (GTK_CLIST (ctree)->row_list);
 
@@ -4107,7 +4130,6 @@ GtkCTreeNode *
 gtk_ctree_node_nth (GtkCTree *ctree,
                    guint     row)
 {
-  g_return_val_if_fail (ctree != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
 
   if ((row < 0) || (row >= GTK_CLIST(ctree)->rows))
@@ -4185,7 +4207,6 @@ gtk_ctree_find_all_by_row_data (GtkCTree     *ctree,
 {
   GList *list = NULL;
 
-  g_return_val_if_fail (ctree != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
 
   /* if node == NULL then look in the whole tree */
@@ -4246,7 +4267,6 @@ gtk_ctree_find_all_by_row_data_custom (GtkCTree     *ctree,
 {
   GList *list = NULL;
 
-  g_return_val_if_fail (ctree != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
   g_return_val_if_fail (func != NULL, NULL);
 
@@ -4284,7 +4304,6 @@ gtk_ctree_is_hot_spot (GtkCTree *ctree,
   gint column;
   gint row;
   
-  g_return_val_if_fail (ctree != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
 
   if (gtk_clist_get_selection_info (GTK_CLIST (ctree), x, y, &row, &column))
@@ -4306,7 +4325,6 @@ gtk_ctree_move (GtkCTree     *ctree,
                GtkCTreeNode *new_parent, 
                GtkCTreeNode *new_sibling)
 {
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
   
@@ -4318,7 +4336,6 @@ void
 gtk_ctree_expand (GtkCTree     *ctree,
                  GtkCTreeNode *node)
 {
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
   
@@ -4335,7 +4352,6 @@ gtk_ctree_expand_recursive (GtkCTree     *ctree,
   GtkCList *clist;
   gboolean thaw = FALSE;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   clist = GTK_CLIST (ctree);
@@ -4363,7 +4379,6 @@ gtk_ctree_expand_to_depth (GtkCTree     *ctree,
   GtkCList *clist;
   gboolean thaw = FALSE;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   clist = GTK_CLIST (ctree);
@@ -4388,7 +4403,6 @@ void
 gtk_ctree_collapse (GtkCTree     *ctree,
                    GtkCTreeNode *node)
 {
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
   
@@ -4406,7 +4420,6 @@ gtk_ctree_collapse_recursive (GtkCTree     *ctree,
   gboolean thaw = FALSE;
   gint i;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   if (node && GTK_CTREE_ROW (node)->is_leaf)
@@ -4441,7 +4454,6 @@ gtk_ctree_collapse_to_depth (GtkCTree     *ctree,
   gboolean thaw = FALSE;
   gint i;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   if (node && GTK_CTREE_ROW (node)->is_leaf)
@@ -4473,7 +4485,6 @@ void
 gtk_ctree_toggle_expansion (GtkCTree     *ctree,
                            GtkCTreeNode *node)
 {
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
   
@@ -4490,7 +4501,6 @@ gtk_ctree_toggle_expansion_recursive (GtkCTree     *ctree,
   GtkCList *clist;
   gboolean thaw = FALSE;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   
   if (node && GTK_CTREE_ROW (node)->is_leaf)
@@ -4515,7 +4525,6 @@ void
 gtk_ctree_select (GtkCTree     *ctree, 
                  GtkCTreeNode *node)
 {
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
 
@@ -4528,7 +4537,6 @@ void
 gtk_ctree_unselect (GtkCTree     *ctree, 
                    GtkCTreeNode *node)
 {
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
 
@@ -4558,7 +4566,6 @@ gtk_ctree_real_select_recursive (GtkCTree     *ctree,
   GtkCList *clist;
   gboolean thaw = FALSE;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   clist = GTK_CLIST (ctree);
@@ -4575,7 +4582,7 @@ gtk_ctree_real_select_recursive (GtkCTree     *ctree,
       thaw = TRUE;
     }
 
-  if (clist->selection_mode == GTK_SELECTION_EXTENDED)
+  if (clist->selection_mode == GTK_SELECTION_MULTIPLE)
     {
       GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
       
@@ -4610,7 +4617,6 @@ gtk_ctree_node_set_text (GtkCTree     *ctree,
 {
   GtkCList *clist;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
 
@@ -4620,7 +4626,7 @@ gtk_ctree_node_set_text (GtkCTree     *ctree,
   clist = GTK_CLIST (ctree);
 
   GTK_CLIST_GET_CLASS (clist)->set_cell_contents
-    (clist, &(GTK_CTREE_ROW(node)->row), column, GTK_CELL_TEXT,
+    (clist, &(GTK_CTREE_ROW (node)->row), column, GTK_CELL_TEXT,
      text, 0, NULL, NULL);
 
   tree_draw_node (ctree, node);
@@ -4635,7 +4641,6 @@ gtk_ctree_node_set_pixmap (GtkCTree     *ctree,
 {
   GtkCList *clist;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
   g_return_if_fail (pixmap != NULL);
@@ -4667,7 +4672,6 @@ gtk_ctree_node_set_pixtext (GtkCTree     *ctree,
 {
   GtkCList *clist;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
   if (column != ctree->tree_column)
@@ -4706,7 +4710,6 @@ gtk_ctree_set_node_info (GtkCTree     *ctree,
   gboolean old_leaf;
   gboolean old_expanded;
  
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
 
@@ -4722,7 +4725,7 @@ gtk_ctree_set_node_info (GtkCTree     *ctree,
       while (work)
        {
          ptr = work;
-         work = GTK_CTREE_ROW(work)->sibling;
+         work = GTK_CTREE_ROW (work)->sibling;
          gtk_ctree_remove_node (ctree, ptr);
        }
     }
@@ -4755,7 +4758,6 @@ gtk_ctree_node_set_shift (GtkCTree     *ctree,
   GtkRequisition requisition;
   gboolean visible = FALSE;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
 
@@ -4810,7 +4812,6 @@ gtk_ctree_node_set_selectable (GtkCTree     *ctree,
                               GtkCTreeNode *node,
                               gboolean      selectable)
 {
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
 
@@ -4826,7 +4827,7 @@ gtk_ctree_node_set_selectable (GtkCTree     *ctree,
       clist = GTK_CLIST (ctree);
 
       if (clist->anchor >= 0 &&
-         clist->selection_mode == GTK_SELECTION_EXTENDED)
+         clist->selection_mode == GTK_SELECTION_MULTIPLE)
        {
          clist->drag_button = 0;
          remove_grab (clist);
@@ -4851,7 +4852,6 @@ gtk_ctree_node_get_cell_type (GtkCTree     *ctree,
                              GtkCTreeNode *node,
                              gint          column)
 {
-  g_return_val_if_fail (ctree != NULL, -1);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), -1);
   g_return_val_if_fail (node != NULL, -1);
 
@@ -4861,54 +4861,52 @@ gtk_ctree_node_get_cell_type (GtkCTree     *ctree,
   return GTK_CTREE_ROW (node)->row.cell[column].type;
 }
 
-gint
+gboolean
 gtk_ctree_node_get_text (GtkCTree      *ctree,
                         GtkCTreeNode  *node,
                         gint           column,
                         gchar        **text)
 {
-  g_return_val_if_fail (ctree != NULL, 0);
-  g_return_val_if_fail (GTK_IS_CTREE (ctree), 0);
-  g_return_val_if_fail (node != NULL, 0);
+  g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
+  g_return_val_if_fail (node != NULL, FALSE);
 
   if (column < 0 || column >= GTK_CLIST (ctree)->columns)
-    return 0;
+    return FALSE;
 
   if (GTK_CTREE_ROW (node)->row.cell[column].type != GTK_CELL_TEXT)
-    return 0;
+    return FALSE;
 
   if (text)
     *text = GTK_CELL_TEXT (GTK_CTREE_ROW (node)->row.cell[column])->text;
 
-  return 1;
+  return TRUE;
 }
 
-gint
+gboolean
 gtk_ctree_node_get_pixmap (GtkCTree     *ctree,
                           GtkCTreeNode *node,
                           gint          column,
                           GdkPixmap   **pixmap,
                           GdkBitmap   **mask)
 {
-  g_return_val_if_fail (ctree != NULL, 0);
-  g_return_val_if_fail (GTK_IS_CTREE (ctree), 0);
-  g_return_val_if_fail (node != NULL, 0);
+  g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
+  g_return_val_if_fail (node != NULL, FALSE);
 
   if (column < 0 || column >= GTK_CLIST (ctree)->columns)
-    return 0;
+    return FALSE;
 
   if (GTK_CTREE_ROW (node)->row.cell[column].type != GTK_CELL_PIXMAP)
-    return 0;
+    return FALSE;
 
   if (pixmap)
-    *pixmap = GTK_CELL_PIXMAP (GTK_CTREE_ROW(node)->row.cell[column])->pixmap;
+    *pixmap = GTK_CELL_PIXMAP (GTK_CTREE_ROW (node)->row.cell[column])->pixmap;
   if (mask)
     *mask = GTK_CELL_PIXMAP (GTK_CTREE_ROW (node)->row.cell[column])->mask;
 
-  return 1;
+  return TRUE;
 }
 
-gint
+gboolean
 gtk_ctree_node_get_pixtext (GtkCTree      *ctree,
                            GtkCTreeNode  *node,
                            gint           column,
@@ -4917,15 +4915,14 @@ gtk_ctree_node_get_pixtext (GtkCTree      *ctree,
                            GdkPixmap    **pixmap,
                            GdkBitmap    **mask)
 {
-  g_return_val_if_fail (ctree != NULL, 0);
-  g_return_val_if_fail (GTK_IS_CTREE (ctree), 0);
-  g_return_val_if_fail (node != NULL, 0);
+  g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
+  g_return_val_if_fail (node != NULL, FALSE);
   
   if (column < 0 || column >= GTK_CLIST (ctree)->columns)
-    return 0;
+    return FALSE;
   
   if (GTK_CTREE_ROW (node)->row.cell[column].type != GTK_CELL_PIXTEXT)
-    return 0;
+    return FALSE;
   
   if (text)
     *text = GTK_CELL_PIXTEXT (GTK_CTREE_ROW (node)->row.cell[column])->text;
@@ -4938,10 +4935,10 @@ gtk_ctree_node_get_pixtext (GtkCTree      *ctree,
   if (mask)
     *mask = GTK_CELL_PIXTEXT (GTK_CTREE_ROW (node)->row.cell[column])->mask;
   
-  return 1;
+  return TRUE;
 }
 
-gint
+gboolean
 gtk_ctree_get_node_info (GtkCTree      *ctree,
                         GtkCTreeNode  *node,
                         gchar        **text,
@@ -4953,9 +4950,8 @@ gtk_ctree_get_node_info (GtkCTree      *ctree,
                         gboolean      *is_leaf,
                         gboolean      *expanded)
 {
-  g_return_val_if_fail (ctree != NULL, 0);
-  g_return_val_if_fail (GTK_IS_CTREE (ctree), 0);
-  g_return_val_if_fail (node != NULL, 0);
+  g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
+  g_return_val_if_fail (node != NULL, FALSE);
   
   if (text)
     *text = GTK_CELL_PIXTEXT 
@@ -4976,7 +4972,7 @@ gtk_ctree_get_node_info (GtkCTree      *ctree,
   if (expanded)
     *expanded = GTK_CTREE_ROW (node)->expanded;
   
-  return 1;
+  return TRUE;
 }
 
 void
@@ -4989,7 +4985,6 @@ gtk_ctree_node_set_cell_style (GtkCTree     *ctree,
   GtkRequisition requisition;
   gboolean visible = FALSE;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
 
@@ -5014,14 +5009,14 @@ gtk_ctree_node_set_cell_style (GtkCTree     *ctree,
     {
       if (GTK_WIDGET_REALIZED (ctree))
         gtk_style_detach (GTK_CTREE_ROW (node)->row.cell[column].style);
-      gtk_style_unref (GTK_CTREE_ROW (node)->row.cell[column].style);
+      g_object_unref (GTK_CTREE_ROW (node)->row.cell[column].style);
     }
 
   GTK_CTREE_ROW (node)->row.cell[column].style = style;
 
   if (GTK_CTREE_ROW (node)->row.cell[column].style)
     {
-      gtk_style_ref (GTK_CTREE_ROW (node)->row.cell[column].style);
+      g_object_ref (GTK_CTREE_ROW (node)->row.cell[column].style);
       
       if (GTK_WIDGET_REALIZED (ctree))
         GTK_CTREE_ROW (node)->row.cell[column].style =
@@ -5041,7 +5036,6 @@ gtk_ctree_node_get_cell_style (GtkCTree     *ctree,
                               GtkCTreeNode *node,
                               gint          column)
 {
-  g_return_val_if_fail (ctree != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
   g_return_val_if_fail (node != NULL, NULL);
 
@@ -5062,7 +5056,6 @@ gtk_ctree_node_set_row_style (GtkCTree     *ctree,
   gint *old_width = NULL;
   gint i;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
 
@@ -5088,14 +5081,14 @@ gtk_ctree_node_set_row_style (GtkCTree     *ctree,
     {
       if (GTK_WIDGET_REALIZED (ctree))
         gtk_style_detach (GTK_CTREE_ROW (node)->row.style);
-      gtk_style_unref (GTK_CTREE_ROW (node)->row.style);
+      g_object_unref (GTK_CTREE_ROW (node)->row.style);
     }
 
   GTK_CTREE_ROW (node)->row.style = style;
 
   if (GTK_CTREE_ROW (node)->row.style)
     {
-      gtk_style_ref (GTK_CTREE_ROW (node)->row.style);
+      g_object_ref (GTK_CTREE_ROW (node)->row.style);
       
       if (GTK_WIDGET_REALIZED (ctree))
         GTK_CTREE_ROW (node)->row.style =
@@ -5118,7 +5111,6 @@ GtkStyle *
 gtk_ctree_node_get_row_style (GtkCTree     *ctree,
                              GtkCTreeNode *node)
 {
-  g_return_val_if_fail (ctree != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
   g_return_val_if_fail (node != NULL, NULL);
 
@@ -5130,7 +5122,6 @@ gtk_ctree_node_set_foreground (GtkCTree     *ctree,
                               GtkCTreeNode *node,
                               GdkColor     *color)
 {
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
 
@@ -5153,7 +5144,6 @@ gtk_ctree_node_set_background (GtkCTree     *ctree,
                               GtkCTreeNode *node,
                               GdkColor     *color)
 {
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
 
@@ -5188,7 +5178,6 @@ gtk_ctree_node_set_row_data_full (GtkCTree         *ctree,
   GtkDestroyNotify dnotify;
   gpointer ddata;
   
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
 
@@ -5206,7 +5195,6 @@ gpointer
 gtk_ctree_node_get_row_data (GtkCTree     *ctree,
                             GtkCTreeNode *node)
 {
-  g_return_val_if_fail (ctree != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
 
   return node ? GTK_CTREE_ROW (node)->row.data : NULL;
@@ -5222,7 +5210,6 @@ gtk_ctree_node_moveto (GtkCTree     *ctree,
   gint row = -1;
   GtkCList *clist;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   clist = GTK_CLIST (ctree);
@@ -5259,7 +5246,6 @@ gtk_ctree_set_indent (GtkCTree *ctree,
 {
   GtkCList *clist;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (indent >= 0);
 
@@ -5285,7 +5271,6 @@ gtk_ctree_set_spacing (GtkCTree *ctree,
   GtkCList *clist;
   gint old_spacing;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (spacing >= 0);
 
@@ -5310,7 +5295,6 @@ void
 gtk_ctree_set_show_stub (GtkCTree *ctree, 
                         gboolean  show_stub)
 {
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   show_stub = show_stub != FALSE;
@@ -5336,7 +5320,6 @@ gtk_ctree_set_line_style (GtkCTree          *ctree,
   GtkCList *clist;
   GtkCTreeLineStyle old_style;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   if (line_style == ctree->line_style)
@@ -5396,7 +5379,6 @@ gtk_ctree_set_expander_style (GtkCTree              *ctree,
   GtkCList *clist;
   GtkCTreeExpanderStyle old_style;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   if (expander_style == ctree->expander_style)
@@ -5506,14 +5488,13 @@ gtk_ctree_sort_recursive (GtkCTree     *ctree,
   GtkCList *clist;
   GtkCTreeNode *focus_node = NULL;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   clist = GTK_CLIST (ctree);
 
   gtk_clist_freeze (clist);
 
-  if (clist->selection_mode == GTK_SELECTION_EXTENDED)
+  if (clist->selection_mode == GTK_SELECTION_MULTIPLE)
     {
       GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
       
@@ -5554,14 +5535,13 @@ gtk_ctree_sort_node (GtkCTree     *ctree,
   GtkCList *clist;
   GtkCTreeNode *focus_node = NULL;
 
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   clist = GTK_CLIST (ctree);
 
   gtk_clist_freeze (clist);
 
-  if (clist->selection_mode == GTK_SELECTION_EXTENDED)
+  if (clist->selection_mode == GTK_SELECTION_MULTIPLE)
     {
       GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
       
@@ -5642,10 +5622,9 @@ resync_selection (GtkCList *clist, GdkEvent *event)
   gint row;
   gboolean unselect;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
 
-  if (clist->selection_mode != GTK_SELECTION_EXTENDED)
+  if (clist->selection_mode != GTK_SELECTION_MULTIPLE)
     return;
 
   if (clist->anchor < 0 || clist->drag_pos < 0)
@@ -5755,10 +5734,9 @@ real_undo_selection (GtkCList *clist)
   GtkCTree *ctree;
   GList *work;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
 
-  if (clist->selection_mode != GTK_SELECTION_EXTENDED)
+  if (clist->selection_mode != GTK_SELECTION_MULTIPLE)
     return;
 
   if (!(clist->undo_selection || clist->undo_unselection))
@@ -5779,9 +5757,8 @@ real_undo_selection (GtkCList *clist)
 
   if (GTK_WIDGET_HAS_FOCUS (clist) && clist->focus_row != clist->undo_anchor)
     {
-      gtk_widget_draw_focus (GTK_WIDGET (clist));
       clist->focus_row = clist->undo_anchor;
-      gtk_widget_draw_focus (GTK_WIDGET (clist));
+      gtk_widget_queue_draw (GTK_WIDGET (clist));
     }
   else
     clist->focus_row = clist->undo_anchor;
@@ -5805,7 +5782,6 @@ void
 gtk_ctree_set_drag_compare_func (GtkCTree                *ctree,
                                 GtkCTreeCompareDragFunc  cmp_func)
 {
-  g_return_if_fail (ctree != NULL);
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
   ctree->drag_compare = cmp_func;
@@ -5817,7 +5793,6 @@ check_drag (GtkCTree        *ctree,
            GtkCTreeNode    *drag_target,
            GtkCListDragPos  insert_pos)
 {
-  g_return_val_if_fail (ctree != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
 
   if (drag_source && drag_source != drag_target &&
@@ -5834,7 +5809,7 @@ check_drag (GtkCTree        *ctree,
                    ctree->drag_compare (ctree,
                                         drag_source,
                                         GTK_CTREE_ROW (drag_target)->parent,
-                                        GTK_CTREE_ROW(drag_target)->sibling));
+                                        GTK_CTREE_ROW (drag_target)->sibling));
          break;
        case GTK_CLIST_DRAG_BEFORE:
          if (GTK_CTREE_ROW (drag_source)->sibling != drag_target)
@@ -5935,7 +5910,6 @@ gtk_ctree_drag_begin (GtkWidget        *widget,
   GtkCTree *ctree;
   gboolean use_icons;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CTREE (widget));
   g_return_if_fail (context != NULL);
 
@@ -5985,7 +5959,6 @@ gtk_ctree_drag_motion (GtkWidget      *widget,
   GtkCListDestInfo new_info;
   GtkCListDestInfo *dest_info;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CTREE (widget), FALSE);
 
   clist = GTK_CLIST (widget);
@@ -6061,6 +6034,9 @@ gtk_ctree_drag_motion (GtkWidget      *widget,
                 g_list_nth (clist->row_list, dest_info->cell.row)->data,
                 dest_info->cell.row, dest_info->insert_pos);
 
+             clist->drag_highlight_row = dest_info->cell.row;
+             clist->drag_highlight_pos = dest_info->insert_pos;
+
              gdk_drag_status (context, context->suggested_action, time);
            }
          return TRUE;
@@ -6085,7 +6061,6 @@ gtk_ctree_drag_data_received (GtkWidget        *widget,
   GtkCTree *ctree;
   GtkCList *clist;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CTREE (widget));
   g_return_if_fail (context != NULL);
   g_return_if_fail (selection_data != NULL);
@@ -6149,3 +6124,31 @@ gtk_ctree_drag_data_received (GtkWidget        *widget,
        }
     }
 }
+
+/* dummy boxed type definition, used so that the GtkCTreeNode signal
+ * arguments have a reasonable type.
+ */
+gpointer
+ctree_node_copy (gpointer boxed)
+{
+  return boxed;
+}
+
+void
+ctree_node_free (gpointer boxed)
+{
+  /* nothing */
+}
+
+GType
+gtk_ctree_node_get_type (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_boxed_type_register_static ("GtkCTreeNode",
+                                             (GBoxedCopyFunc)ctree_node_copy,
+                                             (GBoxedFreeFunc)ctree_node_free);
+
+  return our_type;
+}