]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktreeview.c
Whoops. Forgot this a couple months ago. Now GtkTreeStore sort of sorts.
[~andy/gtk] / gtk / gtktreeview.c
index 1262e94808ca55ab95749a71edc6c0fb06df00ce..a5432b930bd8ccec6718b5efc3f48307da8cd1ae 100644 (file)
@@ -20,6 +20,7 @@
 
 #include "gtktreeview.h"
 #include "gtkrbtree.h"
+#include "gtktreednd.h"
 #include "gtktreeprivate.h"
 #include "gtkcellrenderer.h"
 #include "gtksignal.h"
 #include "gtkbutton.h"
 #include "gtkalignment.h"
 #include "gtklabel.h"
+#include "gtkhbox.h"
+#include "gtkarrow.h"
+#include "gtkintl.h"
+#include "gtkbindings.h"
 
 #include <gdk/gdkkeysyms.h>
 
+#if defined (GDK_WINDOWING_X11)
+#include "x11/gdkx.h"
+#elif defined (GDK_WINDOWING_WIN32)
+#include "win32/gdkwin32.h"
+#elif defined(GDK_WINDOWING_FB)
+#include "linux-fb/gdkfb.h"
+#elif defined (GDK_WINDOWING_NANOX)
+#include "nanox/gdkprivate-nanox.h"
+#endif
 
-/* the width of the column resize windows */
-#define TREE_VIEW_DRAG_WIDTH 6
-#define TREE_VIEW_EXPANDER_WIDTH 14
-#define TREE_VIEW_EXPANDER_HEIGHT 14
-#define TREE_VIEW_VERTICAL_SEPERATOR 2
-#define TREE_VIEW_HORIZONTAL_SEPERATOR 0
 
+#define SCROLL_EDGE_SIZE 15
 
-typedef struct _GtkTreeViewChild GtkTreeViewChild;
 
+/* The "background" areas of all rows/cells add up to cover the entire tree.
+ * The background includes all inter-row and inter-cell spacing.
+ * The "cell" areas are the cell_area passed in to gtk_cell_renderer_render(),
+ * i.e. just the cells, no spacing.
+ */
+#define BACKGROUND_FIRST_PIXEL(tree_view,tree,node) (_gtk_rbtree_node_find_offset ((tree), (node)) + TREE_VIEW_HEADER_HEIGHT ((tree_view)))
+#define CELL_FIRST_PIXEL(tree_view,tree,node,separator) (BACKGROUND_FIRST_PIXEL (tree_view,tree,node) + separator/2)
+
+#define BACKGROUND_HEIGHT(node) (GTK_RBNODE_GET_HEIGHT (node))
+#define CELL_HEIGHT(node, separator) (BACKGROUND_HEIGHT (node) - separator);
+
+#define TREE_WINDOW_Y_TO_RBTREE_Y(tree_view,y) ((y) - TREE_VIEW_HEADER_HEIGHT (tree_view))
+#define RBTREE_Y_TO_TREE_WINDOW_Y(tree_view,y) ((y) + TREE_VIEW_HEADER_HEIGHT (tree_view))
+
+
+typedef struct _GtkTreeViewChild GtkTreeViewChild;
 struct _GtkTreeViewChild
 {
   GtkWidget *widget;
@@ -49,11 +73,75 @@ struct _GtkTreeViewChild
 };
 
 
-static void     gtk_tree_view_init                 (GtkTreeView      *tree_view);
+typedef struct _TreeViewDragInfo TreeViewDragInfo;
+struct _TreeViewDragInfo
+{
+  GdkModifierType start_button_mask;
+  GtkTargetList *source_target_list;
+  GdkDragAction source_actions;
+  GClosure *row_draggable_closure;
+
+  GtkTargetList *dest_target_list;
+  GClosure *location_droppable_closure;
+
+  guint source_set : 1;
+  guint dest_set : 1;
+};
+
+
+/* Signals */
+enum
+{
+  ROW_ACTIVATED,
+  TEST_EXPAND_ROW,
+  TEST_COLLAPSE_ROW,
+  ROW_EXPANDED,
+  ROW_COLLAPSED,
+  COLUMNS_CHANGED,
+  BEGIN_EXTENDED_SELECTION,
+  END_EXTENDED_SELECTION,
+  BEGIN_FREE_MOTION,
+  END_FREE_MOTION,
+  MOVE_CURSOR,
+  SELECT_CURSOR_ROW,
+  TOGGLE_CURSOR_ROW,
+  EXPAND_COLLAPSE_CURSOR_ROW,
+  SELECT_CURSOR_PARENT,
+  LAST_SIGNAL
+};
+
+/* Properties */
+enum {
+  PROP_0,
+  PROP_MODEL,
+  PROP_HADJUSTMENT,
+  PROP_VADJUSTMENT,
+  PROP_HEADERS_VISIBLE,
+  PROP_HEADERS_CLICKABLE,
+  PROP_EXPANDER_COLUMN,
+  PROP_REORDERABLE,
+  PROP_RULES_HINT
+};
+
 static void     gtk_tree_view_class_init           (GtkTreeViewClass *klass);
+static void     gtk_tree_view_init                 (GtkTreeView      *tree_view);
 
-/* widget signals */
-static void     gtk_tree_view_set_model_realized   (GtkTreeView      *tree_view);
+/* object signals */
+static void     gtk_tree_view_finalize             (GObject          *object);
+static void     gtk_tree_view_set_property         (GObject         *object,
+                                                   guint            prop_id,
+                                                   const GValue    *value,
+                                                   GParamSpec      *pspec);
+static void     gtk_tree_view_get_property         (GObject         *object,
+                                                   guint            prop_id,
+                                                   GValue          *value,
+                                                   GParamSpec      *pspec);
+
+/* gtkobject signals */
+static void     gtk_tree_view_destroy              (GtkObject        *object);
+
+/* gtkwidget signals */
+static void     gtk_tree_view_setup_model          (GtkTreeView      *tree_view);
 static void     gtk_tree_view_realize              (GtkWidget        *widget);
 static void     gtk_tree_view_unrealize            (GtkWidget        *widget);
 static void     gtk_tree_view_map                  (GtkWidget        *widget);
@@ -63,6 +151,8 @@ static void     gtk_tree_view_size_allocate        (GtkWidget        *widget,
                                                    GtkAllocation    *allocation);
 static gboolean gtk_tree_view_expose               (GtkWidget        *widget,
                                                    GdkEventExpose   *event);
+static gboolean gtk_tree_view_key_press            (GtkWidget        *widget,
+                                                   GdkEventKey      *event);
 static gboolean gtk_tree_view_motion               (GtkWidget        *widget,
                                                    GdkEventMotion   *event);
 static gboolean gtk_tree_view_enter_notify         (GtkWidget        *widget,
@@ -73,12 +163,14 @@ static gboolean gtk_tree_view_button_press         (GtkWidget        *widget,
                                                    GdkEventButton   *event);
 static gboolean gtk_tree_view_button_release       (GtkWidget        *widget,
                                                    GdkEventButton   *event);
+static void     gtk_tree_view_set_focus_child      (GtkContainer     *container,
+                                                   GtkWidget        *child);
 static void     gtk_tree_view_draw_focus           (GtkWidget        *widget);
 static gint     gtk_tree_view_focus_in             (GtkWidget        *widget,
                                                    GdkEventFocus    *event);
 static gint     gtk_tree_view_focus_out            (GtkWidget        *widget,
                                                    GdkEventFocus    *event);
-static gint     gtk_tree_view_focus                (GtkContainer     *container,
+static gint     gtk_tree_view_focus                (GtkWidget        *widget,
                                                    GtkDirectionType  direction);
 
 /* container signals */
@@ -89,35 +181,113 @@ static void     gtk_tree_view_forall               (GtkContainer     *container,
                                                    GtkCallback       callback,
                                                    gpointer          callback_data);
 
+/* Source side drag signals */
+static void gtk_tree_view_drag_begin       (GtkWidget        *widget,
+                                            GdkDragContext   *context);
+static void gtk_tree_view_drag_end         (GtkWidget        *widget,
+                                            GdkDragContext   *context);
+static void gtk_tree_view_drag_data_get    (GtkWidget        *widget,
+                                            GdkDragContext   *context,
+                                            GtkSelectionData *selection_data,
+                                            guint             info,
+                                            guint             time);
+static void gtk_tree_view_drag_data_delete (GtkWidget        *widget,
+                                            GdkDragContext   *context);
+
+/* Target side drag signals */
+static void     gtk_tree_view_drag_leave         (GtkWidget        *widget,
+                                                  GdkDragContext   *context,
+                                                  guint             time);
+static gboolean gtk_tree_view_drag_motion        (GtkWidget        *widget,
+                                                  GdkDragContext   *context,
+                                                  gint              x,
+                                                  gint              y,
+                                                  guint             time);
+static gboolean gtk_tree_view_drag_drop          (GtkWidget        *widget,
+                                                  GdkDragContext   *context,
+                                                  gint              x,
+                                                  gint              y,
+                                                  guint             time);
+static void     gtk_tree_view_drag_data_received (GtkWidget        *widget,
+                                                  GdkDragContext   *context,
+                                                  gint              x,
+                                                  gint              y,
+                                                  GtkSelectionData *selection_data,
+                                                  guint             info,
+                                                  guint             time);
+
 /* tree_model signals */
-static void     gtk_tree_view_set_adjustments      (GtkTreeView      *tree_view,
-                                                   GtkAdjustment    *hadj,
-                                                   GtkAdjustment    *vadj);
-static void     gtk_tree_view_changed              (GtkTreeModel     *model,
-                                                   GtkTreePath      *path,
-                                                   GtkTreeIter      *iter,
-                                                   gpointer          data);
-static void     gtk_tree_view_inserted             (GtkTreeModel     *model,
-                                                   GtkTreePath      *path,
-                                                   GtkTreeIter      *iter,
-                                                   gpointer          data);
-static void     gtk_tree_view_child_toggled        (GtkTreeModel     *model,
-                                                   GtkTreePath      *path,
-                                                   GtkTreeIter      *iter,
-                                                   gpointer          data);
-static void     gtk_tree_view_deleted              (GtkTreeModel     *model,
-                                                   GtkTreePath      *path,
-                                                   gpointer          data);
+static void gtk_tree_view_set_adjustments                 (GtkTreeView     *tree_view,
+                                                          GtkAdjustment   *hadj,
+                                                          GtkAdjustment   *vadj);
+static void gtk_tree_view_real_begin_extended_selection   (GtkTreeView     *tree_view);
+static void gtk_tree_view_real_end_extended_selection     (GtkTreeView     *tree_view);
+static void gtk_tree_view_real_begin_free_motion          (GtkTreeView     *tree_view);
+static void gtk_tree_view_real_end_free_motion            (GtkTreeView     *tree_view);
+static void gtk_tree_view_real_move_cursor                (GtkTreeView     *tree_view,
+                                                          GtkMovementStep  step,
+                                                          gint             count);
+static void gtk_tree_view_real_select_cursor_row          (GtkTreeView     *tree_view);
+static void gtk_tree_view_real_toggle_cursor_row          (GtkTreeView     *tree_view);
+static void gtk_tree_view_real_expand_collapse_cursor_row (GtkTreeView     *tree_view,
+                                                          gboolean         logical,
+                                                          gboolean         expand,
+                                                          gboolean         open_all);
+static void gtk_tree_view_real_select_cursor_parent       (GtkTreeView     *tree_view);
+static void gtk_tree_view_range_changed                   (GtkTreeModel    *model,
+                                                          GtkTreePath     *path,
+                                                          GtkTreeIter     *iter,
+                                                          GtkTreePath     *end_path,
+                                                          GtkTreeIter     *end_iter,
+                                                          gpointer         data);
+static void gtk_tree_view_inserted                        (GtkTreeModel    *model,
+                                                          GtkTreePath     *path,
+                                                          GtkTreeIter     *iter,
+                                                          gpointer         data);
+static void gtk_tree_view_has_child_toggled               (GtkTreeModel    *model,
+                                                          GtkTreePath     *path,
+                                                          GtkTreeIter     *iter,
+                                                          gpointer         data);
+static void gtk_tree_view_deleted                         (GtkTreeModel    *model,
+                                                          GtkTreePath     *path,
+                                                          gpointer         data);
+static void gtk_tree_view_reordered                       (GtkTreeModel    *model,
+                                                          GtkTreePath     *parent,
+                                                          GtkTreeIter     *iter,
+                                                          gint            *new_order,
+                                                          gpointer         data);
+
+
 
 /* Internal functions */
+
+static void     gtk_tree_view_add_move_binding     (GtkBindingSet    *binding_set,
+                                                   guint             keyval,
+                                                   guint             modmask,
+                                                   GtkMovementStep   step,
+                                                   gint              count);
+static void     gtk_tree_view_unref_tree           (GtkTreeView      *tree_view,
+                                                   GtkRBTree        *tree);
+static void     gtk_tree_view_queue_draw_node      (GtkTreeView      *tree_view,
+                                                   GtkRBTree        *tree,
+                                                   GtkRBNode        *node,
+                                                   GdkRectangle     *clip_rect);
+static void     gtk_tree_view_queue_draw_path      (GtkTreeView      *tree_view,
+                                                    GtkTreePath      *path,
+                                                    GdkRectangle     *clip_rect);
 static void     gtk_tree_view_draw_arrow           (GtkTreeView      *tree_view,
+                                                    GtkRBTree        *tree,
                                                    GtkRBNode        *node,
-                                                   gint              offset,
                                                    gint              x,
                                                    gint              y);
+static void     gtk_tree_view_get_arrow_xrange     (GtkTreeView      *tree_view,
+                                                    gint              *x1,
+                                                    gint              *x2);
 static gint     gtk_tree_view_new_column_width     (GtkTreeView      *tree_view,
                                                    gint              i,
                                                    gint             *x);
+static void     gtk_tree_view_ensure_scroll_timeout(GtkTreeView      *tree_view,
+                                                   GFunc             func);
 static void     gtk_tree_view_adjustment_changed   (GtkAdjustment    *adjustment,
                                                    GtkTreeView      *tree_view);
 static gint     gtk_tree_view_insert_iter_height   (GtkTreeView      *tree_view,
@@ -143,21 +313,46 @@ static void     gtk_tree_view_discover_dirty       (GtkTreeView      *tree_view,
                                                    GtkTreeIter      *iter,
                                                    gint              depth);
 static void     gtk_tree_view_check_dirty          (GtkTreeView      *tree_view);
-static void     gtk_tree_view_create_button        (GtkTreeView      *tree_view,
-                                                   gint              i);
-static void     gtk_tree_view_create_buttons       (GtkTreeView      *tree_view);
-static void     gtk_tree_view_button_clicked       (GtkWidget        *widget,
-                                                   gpointer          data);
 static void     gtk_tree_view_clamp_node_visible   (GtkTreeView      *tree_view,
                                                    GtkRBTree        *tree,
                                                    GtkRBNode        *node);
-
+static gboolean gtk_tree_view_maybe_begin_dragging_row (GtkTreeView      *tree_view,
+                                                        GdkEventMotion   *event);
+static void     _gtk_tree_view_update_col_width    (GtkTreeView      *tree_view);
+
+
+static void gtk_tree_view_focus_to_cursor          (GtkTreeView *tree_view);
+static void gtk_tree_view_move_cursor_up_down      (GtkTreeView *tree_view,
+                                                   gint         count);
+static void gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view,
+                                                   gint         count);
+static void gtk_tree_view_move_cursor_left_right   (GtkTreeView *tree_view,
+                                                   gint         count);
+static void gtk_tree_view_move_cursor_start_end    (GtkTreeView *tree_view,
+                                                   gint         count);
+static gboolean gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
+                                                GtkTreePath *path,
+                                                GtkRBTree   *tree,
+                                                GtkRBNode   *node);
+static gboolean gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
+                                              GtkTreePath *path,
+                                              GtkRBTree   *tree,
+                                              GtkRBNode   *node,
+                                              gboolean     open_all);
+static void gtk_tree_view_real_set_cursor (GtkTreeView     *tree_view,
+                                          GtkTreePath     *path,
+                                          gboolean         clear_and_select,
+                                          GdkModifierType  state);
 
 
 static GtkContainerClass *parent_class = NULL;
+static guint tree_view_signals[LAST_SIGNAL] = { 0 };
+
+\f
 
+/* GType Methods
+ */
 
-/* Class Functions */
 GtkType
 gtk_tree_view_get_type (void)
 {
@@ -187,44 +382,438 @@ gtk_tree_view_get_type (void)
 static void
 gtk_tree_view_class_init (GtkTreeViewClass *class)
 {
+  GObjectClass *o_class;
   GtkObjectClass *object_class;
   GtkWidgetClass *widget_class;
   GtkContainerClass *container_class;
+  GtkBindingSet *binding_set;
 
-  object_class = (GtkObjectClass*) class;
-  widget_class = (GtkWidgetClass*) class;
-  container_class = (GtkContainerClass*) class;
   parent_class = g_type_class_peek_parent (class);
+  binding_set = gtk_binding_set_by_class (class);
+
+  o_class = (GObjectClass *) class;
+  object_class = (GtkObjectClass *) class;
+  widget_class = (GtkWidgetClass *) class;
+  container_class = (GtkContainerClass *) class;
+
+  /* GObject signals */
+  o_class->set_property = gtk_tree_view_set_property;
+  o_class->get_property = gtk_tree_view_get_property;
+  o_class->finalize = gtk_tree_view_finalize;
+
+  /* GtkObject signals */
+  object_class->destroy = gtk_tree_view_destroy;
 
+  /* GtkWidget signals */
+  widget_class->map = gtk_tree_view_map;
   widget_class->realize = gtk_tree_view_realize;
   widget_class->unrealize = gtk_tree_view_unrealize;
-  widget_class->map = gtk_tree_view_map;
   widget_class->size_request = gtk_tree_view_size_request;
   widget_class->size_allocate = gtk_tree_view_size_allocate;
-  widget_class->expose_event = gtk_tree_view_expose;
+  widget_class->button_press_event = gtk_tree_view_button_press;
+  widget_class->button_release_event = gtk_tree_view_button_release;
   widget_class->motion_notify_event = gtk_tree_view_motion;
+  widget_class->expose_event = gtk_tree_view_expose;
+  widget_class->key_press_event = gtk_tree_view_key_press;
   widget_class->enter_notify_event = gtk_tree_view_enter_notify;
   widget_class->leave_notify_event = gtk_tree_view_leave_notify;
-  widget_class->button_press_event = gtk_tree_view_button_press;
-  widget_class->button_release_event = gtk_tree_view_button_release;
-  widget_class->draw_focus = gtk_tree_view_draw_focus;
   widget_class->focus_in_event = gtk_tree_view_focus_in;
   widget_class->focus_out_event = gtk_tree_view_focus_out;
-
-  container_class->forall = gtk_tree_view_forall;
+  widget_class->drag_begin = gtk_tree_view_drag_begin;
+  widget_class->drag_end = gtk_tree_view_drag_end;
+  widget_class->drag_data_get = gtk_tree_view_drag_data_get;
+  widget_class->drag_data_delete = gtk_tree_view_drag_data_delete;
+  widget_class->drag_leave = gtk_tree_view_drag_leave;
+  widget_class->drag_motion = gtk_tree_view_drag_motion;
+  widget_class->drag_drop = gtk_tree_view_drag_drop;
+  widget_class->drag_data_received = gtk_tree_view_drag_data_received;
+  widget_class->focus = gtk_tree_view_focus;
+
+  /* GtkContainer signals */
   container_class->remove = gtk_tree_view_remove;
-  container_class->focus = gtk_tree_view_focus;
+  container_class->forall = gtk_tree_view_forall;
+  container_class->set_focus_child = gtk_tree_view_set_focus_child;
 
   class->set_scroll_adjustments = gtk_tree_view_set_adjustments;
-
+  class->begin_extended_selection = gtk_tree_view_real_begin_extended_selection;
+  class->end_extended_selection = gtk_tree_view_real_end_extended_selection;
+  class->begin_free_motion = gtk_tree_view_real_begin_free_motion;
+  class->end_free_motion = gtk_tree_view_real_end_free_motion;
+  class->move_cursor = gtk_tree_view_real_move_cursor;
+  class->select_cursor_row = gtk_tree_view_real_select_cursor_row;
+  class->toggle_cursor_row = gtk_tree_view_real_toggle_cursor_row;
+  class->expand_collapse_cursor_row = gtk_tree_view_real_expand_collapse_cursor_row;
+  class->select_cursor_parent = gtk_tree_view_real_select_cursor_parent;
+
+  /* Properties */
+
+  g_object_class_install_property (o_class,
+                                   PROP_MODEL,
+                                   g_param_spec_object ("model",
+                                                       _("TreeView Model"),
+                                                       _("The model for the tree view"),
+                                                       GTK_TYPE_TREE_MODEL,
+                                                       G_PARAM_READWRITE));
+
+  g_object_class_install_property (o_class,
+                                   PROP_HADJUSTMENT,
+                                   g_param_spec_object ("hadjustment",
+                                                       _("Horizontal Adjustment"),
+                                                        _("Horizontal Adjustment for the widget"),
+                                                        GTK_TYPE_ADJUSTMENT,
+                                                        G_PARAM_READWRITE));
+
+  g_object_class_install_property (o_class,
+                                   PROP_VADJUSTMENT,
+                                   g_param_spec_object ("vadjustment",
+                                                       _("Vertical Adjustment"),
+                                                        _("Vertical Adjustment for the widget"),
+                                                        GTK_TYPE_ADJUSTMENT,
+                                                        G_PARAM_READWRITE));
+
+  g_object_class_install_property (o_class,
+                                   PROP_HEADERS_VISIBLE,
+                                   g_param_spec_boolean ("headers_visible",
+                                                        _("Visible"),
+                                                        _("Show the column header buttons"),
+                                                        FALSE,
+                                                        G_PARAM_READWRITE));
+
+  g_object_class_install_property (o_class,
+                                   PROP_HEADERS_CLICKABLE,
+                                   g_param_spec_boolean ("headers_clickable",
+                                                        _("Headers Clickable"),
+                                                        _("Column headers respond to click events"),
+                                                        FALSE,
+                                                        G_PARAM_WRITABLE));
+
+  g_object_class_install_property (o_class,
+                                   PROP_EXPANDER_COLUMN,
+                                   g_param_spec_uint ("expander_column",
+                                                     _("Expand Column"),
+                                                     _("Set the column number for the expander column"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     G_PARAM_READWRITE));
+
+  g_object_class_install_property (o_class,
+                                   PROP_REORDERABLE,
+                                   g_param_spec_boolean ("reorderable",
+                                                        _("Reorderable"),
+                                                        _("View is reorderable"),
+                                                        FALSE,
+                                                        G_PARAM_READWRITE));
+
+  g_object_class_install_property (o_class,
+                                   PROP_RULES_HINT,
+                                   g_param_spec_boolean ("rules_hint",
+                                                        _("Rules Hint"),
+                                                        _("Set a hint to the theme engine to draw rows in alternating colors"),
+                                                        FALSE,
+                                                        G_PARAM_READWRITE));
+
+  /* Style properties */
+  /* the width of the column resize windows */
+#define _TREE_VIEW_EXPANDER_WIDTH 14
+#define _TREE_VIEW_EXPANDER_HEIGHT 14
+#define _TREE_VIEW_VERTICAL_SEPARATOR 2
+#define _TREE_VIEW_HORIZONTAL_SEPARATOR 0
+
+  gtk_widget_class_install_style_property (widget_class,
+                                          g_param_spec_int ("expander_width",
+                                                            _("Expander Width"),
+                                                            _("Width of the expander arrow"),
+                                                            0,
+                                                            G_MAXINT,
+                                                            _TREE_VIEW_EXPANDER_WIDTH,
+                                                            G_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                          g_param_spec_int ("expander_height",
+                                                            _("Expander Height"),
+                                                            _("Height of the expander arrow"),
+                                                            4,
+                                                            G_MAXINT,
+                                                            _TREE_VIEW_EXPANDER_HEIGHT,
+                                                            G_PARAM_READABLE));
+
+    gtk_widget_class_install_style_property (widget_class,
+                                          g_param_spec_int ("vertical_separator",
+                                                            _("Vertical Separator Width"),
+                                                            _("Vertical space between cells"),
+                                                            0,
+                                                            G_MAXINT,
+                                                            _TREE_VIEW_VERTICAL_SEPARATOR,
+                                                            G_PARAM_READABLE));
+
+    gtk_widget_class_install_style_property (widget_class,
+                                          g_param_spec_int ("horizontal_separator",
+                                                            _("Horizontal Separator Width"),
+                                                            _("Horizontal space between cells"),
+                                                            0,
+                                                            G_MAXINT,
+                                                            _TREE_VIEW_HORIZONTAL_SEPARATOR,
+                                                            G_PARAM_READABLE));
+
+  /* Signals */
   widget_class->set_scroll_adjustments_signal =
     gtk_signal_new ("set_scroll_adjustments",
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeViewClass, set_scroll_adjustments),
-                   gtk_marshal_VOID__POINTER_POINTER,
+                   gtk_marshal_VOID__OBJECT_OBJECT,
                    GTK_TYPE_NONE, 2,
-                   GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+                   GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+
+  tree_view_signals[ROW_ACTIVATED] =
+    gtk_signal_new ("row_activated",
+                   GTK_RUN_LAST | GTK_RUN_ACTION,
+                   GTK_CLASS_TYPE (object_class),
+                   GTK_SIGNAL_OFFSET (GtkTreeViewClass, row_activated),
+                   gtk_marshal_VOID__BOXED_OBJECT,
+                   GTK_TYPE_NONE, 2,
+                   GTK_TYPE_TREE_PATH,
+                   GTK_TYPE_TREE_VIEW_COLUMN);
+
+  tree_view_signals[TEST_EXPAND_ROW] =
+    g_signal_newc ("test_expand_row",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, test_expand_row),
+                  _gtk_boolean_handled_accumulator, NULL,
+                   gtk_marshal_BOOLEAN__BOXED_BOXED,
+                  G_TYPE_BOOLEAN, 2,
+                  GTK_TYPE_TREE_ITER,
+                  GTK_TYPE_TREE_PATH);
+
+  tree_view_signals[TEST_COLLAPSE_ROW] =
+    g_signal_newc ("test_collapse_row",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, test_collapse_row),
+                  _gtk_boolean_handled_accumulator, NULL,
+                   gtk_marshal_BOOLEAN__BOXED_BOXED,
+                  G_TYPE_BOOLEAN, 2,
+                  GTK_TYPE_TREE_ITER,
+                  GTK_TYPE_TREE_PATH);
+
+  tree_view_signals[ROW_EXPANDED] =
+    g_signal_newc ("row_expanded",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, row_expanded),
+                  NULL, NULL,
+                   gtk_marshal_VOID__BOXED_BOXED,
+                  GTK_TYPE_NONE, 2,
+                  GTK_TYPE_TREE_ITER,
+                  GTK_TYPE_TREE_PATH);
+
+  tree_view_signals[ROW_COLLAPSED] =
+    g_signal_newc ("row_collapsed",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, row_collapsed),
+                  NULL, NULL,
+                   gtk_marshal_VOID__BOXED_BOXED,
+                  GTK_TYPE_NONE, 2,
+                  GTK_TYPE_TREE_ITER,
+                  GTK_TYPE_TREE_PATH);
+
+  tree_view_signals[COLUMNS_CHANGED] =
+    g_signal_newc ("columns_changed",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, columns_changed),
+                  NULL, NULL,
+                  gtk_marshal_NONE__NONE,
+                  G_TYPE_NONE, 0);
+
+  tree_view_signals[BEGIN_EXTENDED_SELECTION] =
+    g_signal_newc ("begin_extended_selection",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, begin_extended_selection),
+                  NULL, NULL,
+                  gtk_marshal_NONE__NONE,
+                  G_TYPE_NONE, 0);
+
+  tree_view_signals[END_EXTENDED_SELECTION] =
+    g_signal_newc ("end_extended_selection",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, end_extended_selection),
+                  NULL, NULL,
+                  gtk_marshal_NONE__NONE,
+                  G_TYPE_NONE, 0);
+
+  tree_view_signals[BEGIN_FREE_MOTION] =
+    g_signal_newc ("begin_free_motion",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, begin_free_motion),
+                  NULL, NULL,
+                  gtk_marshal_NONE__NONE,
+                  G_TYPE_NONE, 0);
+
+  tree_view_signals[END_FREE_MOTION] =
+    g_signal_newc ("end_free_motion",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, end_free_motion),
+                  NULL, NULL,
+                  gtk_marshal_NONE__NONE,
+                  G_TYPE_NONE, 0);
+
+  tree_view_signals[MOVE_CURSOR] =
+    g_signal_newc ("move_cursor",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, move_cursor),
+                  NULL, NULL,
+                  gtk_marshal_VOID__ENUM_INT,
+                  GTK_TYPE_NONE, 2, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT);
+
+  tree_view_signals[SELECT_CURSOR_ROW] =
+    g_signal_newc ("select_cursor_row",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_row),
+                  NULL, NULL,
+                  gtk_marshal_NONE__NONE,
+                  GTK_TYPE_NONE, 0);
+
+  tree_view_signals[TOGGLE_CURSOR_ROW] =
+    g_signal_newc ("toggle_cursor_row",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, toggle_cursor_row),
+                  NULL, NULL,
+                  gtk_marshal_NONE__NONE,
+                  GTK_TYPE_NONE, 0);
+
+  tree_view_signals[EXPAND_COLLAPSE_CURSOR_ROW] =
+    g_signal_newc ("expand_collapse_cursor_row",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, expand_collapse_cursor_row),
+                  NULL, NULL,
+                  gtk_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN,
+                  GTK_TYPE_NONE, 3, GTK_TYPE_BOOL, GTK_TYPE_BOOL, GTK_TYPE_BOOL);
+
+  tree_view_signals[SELECT_CURSOR_PARENT] =
+    g_signal_newc ("select_cursor_parent",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_parent),
+                  NULL, NULL,
+                  gtk_marshal_NONE__NONE,
+                  GTK_TYPE_NONE, 0);
+
+  /* Key bindings */
+  gtk_binding_entry_add_signal (binding_set, GDK_Shift_L, 0, "begin_extended_selection", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Shift_L, GDK_SHIFT_MASK | GDK_RELEASE_MASK, "end_extended_selection", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Control_L, 0, "begin_free_motion", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Control_L, GDK_CONTROL_MASK | GDK_RELEASE_MASK, "end_free_motion", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Shift_R, 0, "begin_extended_selection", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Shift_R, GDK_SHIFT_MASK | GDK_RELEASE_MASK, "end_extended_selection", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Control_R, 0, "begin_free_motion", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Control_R, GDK_CONTROL_MASK | GDK_RELEASE_MASK, "end_free_motion", 0);
+
+  gtk_tree_view_add_move_binding (binding_set, GDK_Up, 0,
+                                 GTK_MOVEMENT_DISPLAY_LINES, -1);
+
+  gtk_tree_view_add_move_binding (binding_set, GDK_Down, 0,
+                                 GTK_MOVEMENT_DISPLAY_LINES, 1);
+
+  gtk_tree_view_add_move_binding (binding_set, GDK_p, GDK_CONTROL_MASK,
+                                 GTK_MOVEMENT_DISPLAY_LINES, -1);
+
+  gtk_tree_view_add_move_binding (binding_set, GDK_n, GDK_CONTROL_MASK,
+                                 GTK_MOVEMENT_DISPLAY_LINES, 1);
+
+  gtk_tree_view_add_move_binding (binding_set, GDK_Home, 0,
+                                 GTK_MOVEMENT_BUFFER_ENDS, -1);
+
+  gtk_tree_view_add_move_binding (binding_set, GDK_End, 0,
+                                 GTK_MOVEMENT_BUFFER_ENDS, 1);
+
+  gtk_tree_view_add_move_binding (binding_set, GDK_Page_Up, 0,
+                                 GTK_MOVEMENT_PAGES, -1);
+
+  gtk_tree_view_add_move_binding (binding_set, GDK_Page_Down, 0,
+                                 GTK_MOVEMENT_PAGES, 1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Right, 0, "move_cursor", 2,
+                               GTK_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
+                               GTK_TYPE_INT, 1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Left, 0, "move_cursor", 2,
+                               GTK_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
+                               GTK_TYPE_INT, -1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_f, GDK_CONTROL_MASK, "move_cursor", 2,
+                               GTK_TYPE_ENUM, GTK_MOVEMENT_LOGICAL_POSITIONS,
+                               GTK_TYPE_INT, 1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_b, GDK_CONTROL_MASK, "move_cursor", 2,
+                               GTK_TYPE_ENUM, GTK_MOVEMENT_LOGICAL_POSITIONS,
+                               GTK_TYPE_INT, -1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, "toggle_cursor_row", 0);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_space, 0, "select_cursor_row", 0);
+
+  /* expand and collapse rows */
+  gtk_binding_entry_add_signal (binding_set, GDK_plus, 0, "expand_collapse_cursor_row", 3,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, TRUE,
+                               GTK_TYPE_BOOL, FALSE);
+  /* Not doable on US keyboards */
+  gtk_binding_entry_add_signal (binding_set, GDK_plus, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, TRUE,
+                               GTK_TYPE_BOOL, TRUE);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, 0, "expand_collapse_cursor_row", 3,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, TRUE,
+                               GTK_TYPE_BOOL, FALSE);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, TRUE,
+                               GTK_TYPE_BOOL, TRUE);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, TRUE,
+                               GTK_TYPE_BOOL, TRUE);
+  gtk_binding_entry_add_signal (binding_set, GDK_Right, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3,
+                               GTK_TYPE_BOOL, TRUE,
+                               GTK_TYPE_BOOL, TRUE,
+                               GTK_TYPE_BOOL, TRUE);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_minus, 0, "expand_collapse_cursor_row", 3,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, FALSE);
+  gtk_binding_entry_add_signal (binding_set, GDK_minus, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, TRUE);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Subtract, 0, "expand_collapse_cursor_row", 3,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, FALSE);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Subtract, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, TRUE);
+  gtk_binding_entry_add_signal (binding_set, GDK_Left, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, FALSE,
+                               GTK_TYPE_BOOL, TRUE);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0, "select_cursor_parent", 0);
+
 }
 
 static void
@@ -232,77 +821,266 @@ gtk_tree_view_init (GtkTreeView *tree_view)
 {
   tree_view->priv = g_new0 (GtkTreeViewPrivate, 1);
 
-  GTK_WIDGET_UNSET_FLAGS (tree_view, GTK_NO_WINDOW);
   GTK_WIDGET_SET_FLAGS (tree_view, GTK_CAN_FOCUS);
 
   tree_view->priv->flags = GTK_TREE_VIEW_IS_LIST | GTK_TREE_VIEW_SHOW_EXPANDERS | GTK_TREE_VIEW_DRAW_KEYFOCUS | GTK_TREE_VIEW_HEADERS_VISIBLE;
-  tree_view->priv->tab_offset = TREE_VIEW_EXPANDER_WIDTH;
-  tree_view->priv->columns = 0;
-  tree_view->priv->column = NULL;
-  tree_view->priv->button_pressed_node = NULL;
-  tree_view->priv->button_pressed_tree = NULL;
-  tree_view->priv->prelight_node = NULL;
-  tree_view->priv->prelight_offset = 0;
+  gtk_widget_style_get (GTK_WIDGET (tree_view), "expander_width", &tree_view->priv->tab_offset, NULL);
+  tree_view->priv->n_columns = 0;
   tree_view->priv->header_height = 1;
   tree_view->priv->x_drag = 0;
   tree_view->priv->drag_pos = -1;
-  tree_view->priv->selection = NULL;
-  tree_view->priv->anchor = NULL;
-  tree_view->priv->cursor = NULL;
+  tree_view->priv->header_has_focus = FALSE;
+  tree_view->priv->pressed_button = -1;
+  tree_view->priv->press_start_x = -1;
+  tree_view->priv->press_start_y = -1;
+  tree_view->priv->reorderable = FALSE;
   gtk_tree_view_set_adjustments (tree_view, NULL, NULL);
-  _gtk_tree_view_set_size (tree_view, 0, 0);
+  tree_view->priv->selection = _gtk_tree_selection_new_with_tree_view (tree_view);
+  _gtk_tree_view_update_size (tree_view);
+
+}
+
+\f
+
+/* GObject Methods
+ */
+
+static void
+gtk_tree_view_set_property (GObject         *object,
+                           guint            prop_id,
+                           const GValue    *value,
+                           GParamSpec      *pspec)
+{
+  GtkTreeView *tree_view;
+
+  tree_view = GTK_TREE_VIEW (object);
+
+  switch (prop_id)
+    {
+    case PROP_MODEL:
+      gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (g_value_get_object (value)));
+      break;
+    case PROP_HADJUSTMENT:
+      gtk_tree_view_set_hadjustment (tree_view, GTK_ADJUSTMENT (g_value_get_object (value)));
+      break;
+    case PROP_VADJUSTMENT:
+      gtk_tree_view_set_vadjustment (tree_view, GTK_ADJUSTMENT (g_value_get_object (value)));
+      break;
+    case PROP_HEADERS_VISIBLE:
+      gtk_tree_view_set_headers_visible (tree_view, g_value_get_boolean (value));
+      break;
+    case PROP_HEADERS_CLICKABLE:
+      gtk_tree_view_set_headers_clickable (tree_view, g_value_get_boolean (value));
+      break;
+    case PROP_EXPANDER_COLUMN:
+      gtk_tree_view_set_expander_column (tree_view, g_value_get_uint (value));
+      break;
+    case PROP_REORDERABLE:
+      gtk_tree_view_set_reorderable (tree_view, g_value_get_boolean (value));
+      break;
+    case PROP_RULES_HINT:
+      gtk_tree_view_set_rules_hint (tree_view, g_value_get_boolean (value));
+      break;
+    default:
+      break;
+    }
+}
+
+static void
+gtk_tree_view_get_property (GObject         *object,
+                           guint            prop_id,
+                           GValue          *value,
+                           GParamSpec      *pspec)
+{
+  GtkTreeView *tree_view;
+
+  tree_view = GTK_TREE_VIEW (object);
+
+  switch (prop_id)
+    {
+    case PROP_MODEL:
+      g_value_set_object (value, G_OBJECT (tree_view->priv->model));
+      break;
+    case PROP_HADJUSTMENT:
+      g_value_set_object (value, G_OBJECT (tree_view->priv->hadjustment));
+      break;
+    case PROP_VADJUSTMENT:
+      g_value_set_object (value, G_OBJECT (tree_view->priv->vadjustment));
+      break;
+    case PROP_HEADERS_VISIBLE:
+      g_value_set_boolean (value, gtk_tree_view_get_headers_visible (tree_view));
+      break;
+    case PROP_EXPANDER_COLUMN:
+      g_value_set_uint (value, tree_view->priv->expander_column);
+      break;
+    case PROP_REORDERABLE:
+      g_value_set_boolean (value, tree_view->priv->reorderable);
+      break;
+    case PROP_RULES_HINT:
+      g_value_set_boolean (value, tree_view->priv->has_rules);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_tree_view_finalize (GObject *object)
+{
+  GtkTreeView *tree_view = (GtkTreeView *) object;
+
+  g_free (tree_view->priv);
+
+  if (G_OBJECT_CLASS (parent_class)->finalize)
+    (* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
-/* Widget methods
+\f
+
+/* GtkObject Methods
  */
 
 static void
-gtk_tree_view_realize_buttons (GtkTreeView *tree_view)
+gtk_tree_view_destroy (GtkObject *object)
 {
+  GtkTreeView *tree_view = (GtkTreeView *) object;
   GList *list;
-  GtkTreeViewColumn *column;
-  GdkWindowAttr attr;
-  guint attributes_mask;
 
-  if (!GTK_WIDGET_REALIZED (tree_view) || tree_view->priv->header_window == NULL)
-    return;
 
-  attr.window_type = GDK_WINDOW_CHILD;
-  attr.wclass = GDK_INPUT_ONLY;
-  attr.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
-  attr.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view));
-  attr.event_mask = gtk_widget_get_events (GTK_WIDGET (tree_view));
-  attr.event_mask = (GDK_BUTTON_PRESS_MASK |
-                    GDK_BUTTON_RELEASE_MASK |
-                    GDK_POINTER_MOTION_MASK |
-                    GDK_POINTER_MOTION_HINT_MASK |
-                    GDK_KEY_PRESS_MASK);
-  attributes_mask = GDK_WA_CURSOR | GDK_WA_X | GDK_WA_Y;
-  attr.cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-  tree_view->priv->cursor_drag = attr.cursor;
-
-  attr.y = 0;
-  attr.width = TREE_VIEW_DRAG_WIDTH;
-  attr.height = tree_view->priv->header_height;
-
-  for (list = tree_view->priv->column; list; list = list->next)
+  if (tree_view->priv->tree != NULL)
     {
-      column = list->data;
-      if (column->button)
+      gtk_tree_view_unref_tree (tree_view, tree_view->priv->tree);
+      _gtk_rbtree_free (tree_view->priv->tree);
+      tree_view->priv->tree = NULL;
+    }
+
+  if (tree_view->priv->model != NULL)
+    {
+      g_object_unref (G_OBJECT (tree_view->priv->model));
+      tree_view->priv->model = NULL;
+    }
+
+  if (tree_view->priv->columns != NULL)
+    {
+      for (list = tree_view->priv->columns; list; list = list->next)
+       g_object_unref (G_OBJECT (list->data));
+      g_list_free (tree_view->priv->columns);
+      tree_view->priv->columns = NULL;
+    }
+
+  if (tree_view->priv->selection != NULL)
+    {
+      _gtk_tree_selection_set_tree_view (tree_view->priv->selection, NULL);
+      g_object_unref (tree_view->priv->selection);
+      tree_view->priv->selection = NULL;
+    }
+
+  if (tree_view->priv->anchor != NULL)
+    {
+      gtk_tree_row_reference_free (tree_view->priv->anchor);
+      tree_view->priv->anchor = NULL;
+    }
+
+  if (tree_view->priv->scroll_to_path != NULL)
+    {
+      gtk_tree_path_free (tree_view->priv->scroll_to_path);
+      tree_view->priv->scroll_to_path = NULL;
+    }
+
+  if (tree_view->priv->drag_dest_row != NULL)
+    {
+      gtk_tree_row_reference_free (tree_view->priv->drag_dest_row);
+      tree_view->priv->drag_dest_row = NULL;
+    }
+
+  if (tree_view->priv->cursor)
+    {
+      gtk_tree_row_reference_free (tree_view->priv->cursor);
+      tree_view->priv->cursor = NULL;
+    }
+
+  if (tree_view->priv->column_drop_func_data &&
+      tree_view->priv->column_drop_func_data_destroy)
+    {
+      (* tree_view->priv->column_drop_func_data_destroy) (tree_view->priv->column_drop_func_data);
+      tree_view->priv->column_drop_func_data = NULL;
+    }
+
+  if (GTK_OBJECT_CLASS (parent_class)->destroy)
+    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+}
+
+\f
+
+/* GtkWidget Methods
+ */
+
+/* GtkWidget::map helper */
+static void
+gtk_tree_view_map_buttons (GtkTreeView *tree_view)
+{
+  GList *list;
+
+  g_return_if_fail (GTK_WIDGET_MAPPED (tree_view));
+
+  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
+    {
+      GtkTreeViewColumn *column;
+
+      for (list = tree_view->priv->columns; list; list = list->next)
+       {
+         column = list->data;
+          if (GTK_WIDGET_VISIBLE (column->button) &&
+              !GTK_WIDGET_MAPPED (column->button))
+            gtk_widget_map (column->button);
+       }
+      for (list = tree_view->priv->columns; list; list = list->next)
        {
+         column = list->data;
          if (column->visible == FALSE)
            continue;
-         gtk_widget_set_parent_window (column->button,
-                                       tree_view->priv->header_window);
-         gtk_widget_show (column->button);
+         if (column->column_type == GTK_TREE_VIEW_COLUMN_RESIZEABLE)
+           {
+             gdk_window_raise (column->window);
+             gdk_window_show (column->window);
+           }
+         else
+           gdk_window_hide (column->window);
+       }
+      gdk_window_show (tree_view->priv->header_window);
+    }
+}
+
+static void
+gtk_tree_view_map (GtkWidget *widget)
+{
+  GList *tmp_list;
+  GtkTreeView *tree_view;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW (widget));
+
+  tree_view = GTK_TREE_VIEW (widget);
 
-         attr.x = (column->button->allocation.x + column->button->allocation.width) - 3;
+  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+
+  tmp_list = tree_view->priv->children;
+  while (tmp_list)
+    {
+      GtkTreeViewChild *child = tmp_list->data;
+      tmp_list = tmp_list->next;
 
-         column->window = gdk_window_new (tree_view->priv->header_window,
-                                          &attr, attributes_mask);
-         gdk_window_set_user_data (column->window, tree_view);
+      if (GTK_WIDGET_VISIBLE (child->widget))
+       {
+         if (!GTK_WIDGET_MAPPED (child->widget))
+           gtk_widget_map (child->widget);
        }
     }
+  gdk_window_show (tree_view->priv->bin_window);
+
+  gtk_tree_view_map_buttons (tree_view);
+
+  gdk_window_show (widget->window);
 }
 
 static void
@@ -319,10 +1097,6 @@ gtk_tree_view_realize (GtkWidget *widget)
 
   tree_view = GTK_TREE_VIEW (widget);
 
-  if (!GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_MODEL_SETUP) &&
-      tree_view->priv->model)
-    gtk_tree_view_set_model_realized (tree_view);
-
   gtk_tree_view_check_dirty (GTK_TREE_VIEW (widget));
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
@@ -402,20 +1176,54 @@ gtk_tree_view_realize (GtkWidget *widget)
 
       gtk_widget_set_parent_window (child->widget, tree_view->priv->bin_window);
     }
-  gtk_tree_view_realize_buttons (GTK_TREE_VIEW (widget));
-  _gtk_tree_view_set_size (GTK_TREE_VIEW (widget), -1, -1);
+
+  for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
+    _gtk_tree_view_column_realize_button (GTK_TREE_VIEW_COLUMN (tmp_list->data));
+
+  _gtk_tree_view_update_size (GTK_TREE_VIEW (widget));
+
+  if (tree_view->priv->scroll_to_path != NULL ||
+      tree_view->priv->scroll_to_column != NULL)
+    {
+      gtk_tree_view_scroll_to_cell (tree_view,
+                                   tree_view->priv->scroll_to_path,
+                                   tree_view->priv->scroll_to_column,
+                                   tree_view->priv->scroll_to_row_align,
+                                   tree_view->priv->scroll_to_col_align);
+      if (tree_view->priv->scroll_to_path)
+       {
+         gtk_tree_path_free (tree_view->priv->scroll_to_path);
+         tree_view->priv->scroll_to_path = NULL;
+       }
+      tree_view->priv->scroll_to_column = NULL;
+    }
 }
 
 static void
 gtk_tree_view_unrealize (GtkWidget *widget)
 {
   GtkTreeView *tree_view;
+  GList *list;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_TREE_VIEW (widget));
 
   tree_view = GTK_TREE_VIEW (widget);
 
+  if (tree_view->priv->scroll_timeout != 0)
+    {
+      gtk_timeout_remove (tree_view->priv->scroll_timeout);
+      tree_view->priv->scroll_timeout = 0;
+    }
+
+  if (tree_view->priv->open_dest_timeout != 0)
+    {
+      gtk_timeout_remove (tree_view->priv->open_dest_timeout);
+      tree_view->priv->open_dest_timeout = 0;
+    }
+
+  for (list = tree_view->priv->columns; list; list = list->next)
+    _gtk_tree_view_column_unrealize_button (GTK_TREE_VIEW_COLUMN (list->data));
+
   gdk_window_set_user_data (tree_view->priv->bin_window, NULL);
   gdk_window_destroy (tree_view->priv->bin_window);
   tree_view->priv->bin_window = NULL;
@@ -424,98 +1232,101 @@ gtk_tree_view_unrealize (GtkWidget *widget)
   gdk_window_destroy (tree_view->priv->header_window);
   tree_view->priv->header_window = NULL;
 
-  gdk_gc_destroy (tree_view->priv->xor_gc);
+  if (tree_view->priv->drag_window)
+    {
+      gdk_window_set_user_data (tree_view->priv->drag_window, NULL);
+      gdk_window_destroy (tree_view->priv->drag_window);
+      tree_view->priv->drag_window = NULL;
+    }
+
+  if (tree_view->priv->drag_highlight_window)
+    {
+      gdk_window_set_user_data (tree_view->priv->drag_highlight_window, NULL);
+      gdk_window_destroy (tree_view->priv->drag_highlight_window);
+      tree_view->priv->drag_highlight_window = NULL;
+    }
+
+  if (tree_view->priv->cursor_drag)
+    {
+      gdk_cursor_destroy (tree_view->priv->cursor_drag);
+      tree_view->priv->cursor_drag = NULL;
+    }
+
+  if (tree_view->priv->xor_gc)
+    {
+      gdk_gc_destroy (tree_view->priv->xor_gc);
+      tree_view->priv->xor_gc = NULL;
+    }
+
+  /* GtkWidget::unrealize destroys children and widget->window */
   if (GTK_WIDGET_CLASS (parent_class)->unrealize)
     (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
 }
 
+/* GtkWidget::size_request helper */
 static void
-gtk_tree_view_map (GtkWidget *widget)
+gtk_tree_view_size_request_buttons (GtkTreeView *tree_view)
 {
-  GList *tmp_list;
-  GtkTreeView *tree_view;
   GList *list;
-  GtkTreeViewColumn *column;
 
-  g_return_if_fail (widget != NULL);
+  tree_view->priv->header_height = 1;
+
+  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_MODEL_SETUP))
+    {
+      for (list = tree_view->priv->columns; list; list = list->next)
+        {
+          GtkRequisition requisition;
+          GtkTreeViewColumn *column = list->data;
+
+         if (column->button == NULL)
+           continue;
+
+          column = list->data;
+
+          gtk_widget_size_request (column->button, &requisition);
+
+          _gtk_tree_view_column_set_width (column, MAX (column->width, requisition.width));
+          tree_view->priv->header_height = MAX (tree_view->priv->header_height, requisition.height);
+        }
+    }
+}
+
+static void
+gtk_tree_view_size_request (GtkWidget      *widget,
+                           GtkRequisition *requisition)
+{
+  GtkTreeView *tree_view;
+  GList *tmp_list;
+
   g_return_if_fail (GTK_IS_TREE_VIEW (widget));
 
   tree_view = GTK_TREE_VIEW (widget);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+  requisition->width = tree_view->priv->width;
+  requisition->height = tree_view->priv->height + tree_view->priv->header_height;
 
   tmp_list = tree_view->priv->children;
+
   while (tmp_list)
     {
       GtkTreeViewChild *child = tmp_list->data;
+      GtkRequisition child_requisition;
+
       tmp_list = tmp_list->next;
 
       if (GTK_WIDGET_VISIBLE (child->widget))
-       {
-         if (!GTK_WIDGET_MAPPED (child->widget))
-           gtk_widget_map (child->widget);
-       }
+        gtk_widget_size_request (child->widget, &child_requisition);
     }
-  gdk_window_show (tree_view->priv->bin_window);
-  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
-    {
-      for (list = tree_view->priv->column; list; list = list->next)
-       {
-         column = list->data;
-         gtk_widget_map (column->button);
-       }
-      for (list = tree_view->priv->column; list; list = list->next)
-       {
-         column = list->data;
-         if (column->visible == FALSE)
-           continue;
-         if (column->column_type == GTK_TREE_VIEW_COLUMN_RESIZEABLE)
-           {
-             gdk_window_raise (column->window);
-             gdk_window_show (column->window);
-           }
-         else
-           gdk_window_hide (column->window);
-       }
-      gdk_window_show (tree_view->priv->header_window);
-    }
-  gdk_window_show (widget->window);
-}
-
-static void
-gtk_tree_view_size_request (GtkWidget      *widget,
-                           GtkRequisition *requisition)
-{
-  GtkTreeView *tree_view;
-  GList *tmp_list;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_TREE_VIEW (widget));
-
-  tree_view = GTK_TREE_VIEW (widget);
 
-  requisition->width = 200;
-  requisition->height = 200;
-
-  tmp_list = tree_view->priv->children;
-
-  while (tmp_list)
-    {
-      GtkTreeViewChild *child = tmp_list->data;
-      GtkRequisition child_requisition;
-
-      tmp_list = tmp_list->next;
-
-      gtk_widget_size_request (child->widget, &child_requisition);
-    }
+  gtk_tree_view_size_request_buttons (tree_view);
 }
 
+/* GtkWidget::size_allocate helper */
 static void
 gtk_tree_view_size_allocate_buttons (GtkWidget *widget)
 {
   GtkTreeView *tree_view;
   GList *list;
-  GList *last_column;
   GtkTreeViewColumn *column;
   GtkAllocation allocation;
   gint width = 0;
@@ -525,15 +1336,7 @@ gtk_tree_view_size_allocate_buttons (GtkWidget *widget)
   allocation.y = 0;
   allocation.height = tree_view->priv->header_height;
 
-  for (last_column = g_list_last (tree_view->priv->column);
-       last_column && !(GTK_TREE_VIEW_COLUMN (last_column->data)->visible);
-       last_column = last_column->prev)
-    ;
-
-  if (last_column == NULL)
-    return;
-
-  for (list = tree_view->priv->column; list != last_column; list = list->next)
+  for (list = tree_view->priv->columns; list != NULL; list = list->next)
     {
       column = list->data;
 
@@ -541,21 +1344,16 @@ gtk_tree_view_size_allocate_buttons (GtkWidget *widget)
        continue;
 
       allocation.x = width;
-      allocation.width = column->size;
-      width += column->size;
+      allocation.width = column->displayed_width;
+      width += column->width;
       gtk_widget_size_allocate (column->button, &allocation);
 
       if (column->window)
-       gdk_window_move (column->window, width - TREE_VIEW_DRAG_WIDTH/2, 0);
+       gdk_window_move_resize (column->window,
+                                allocation.x + allocation.width - TREE_VIEW_DRAG_WIDTH/2,
+                               allocation.y,
+                                TREE_VIEW_DRAG_WIDTH, allocation.height);
     }
-  column = list->data;
-  allocation.x = width;
-  allocation.width = MAX (widget->allocation.width, tree_view->priv->width) - width;
-  gtk_widget_size_allocate (column->button, &allocation);
-  if (column->window)
-    gdk_window_move (column->window,
-                    allocation.x +allocation.width - TREE_VIEW_DRAG_WIDTH/2,
-                    0);
 }
 
 static void
@@ -565,13 +1363,14 @@ gtk_tree_view_size_allocate (GtkWidget     *widget,
   GList *tmp_list;
   GtkTreeView *tree_view;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_TREE_VIEW (widget));
 
   widget->allocation = *allocation;
 
   tree_view = GTK_TREE_VIEW (widget);
 
+  gtk_tree_view_check_dirty (tree_view);
+
   tmp_list = tree_view->priv->children;
 
   while (tmp_list)
@@ -596,3144 +1395,6702 @@ gtk_tree_view_size_allocate (GtkWidget     *widget,
       gdk_window_move_resize (widget->window,
                              allocation->x, allocation->y,
                              allocation->width, allocation->height);
-      gdk_window_move_resize (tree_view->priv->header_window,
-                             0, 0,
-                             MAX (tree_view->priv->width, allocation->width),
-                             tree_view->priv->header_height);
+      gdk_window_resize (tree_view->priv->header_window,
+                        MAX (tree_view->priv->width, allocation->width),
+                        tree_view->priv->header_height);
+      if (tree_view->priv->width < allocation->width)
+         gdk_window_resize (tree_view->priv->bin_window,
+                            allocation->width,
+                            tree_view->priv->height + TREE_VIEW_HEADER_HEIGHT (tree_view));
+
+      _gtk_tree_view_update_col_width (tree_view);
     }
 
+  gtk_tree_view_size_allocate_buttons (widget);
+
   tree_view->priv->hadjustment->page_size = allocation->width;
-  tree_view->priv->hadjustment->page_increment = allocation->width / 2;
+  tree_view->priv->hadjustment->page_increment = allocation->width;
+  tree_view->priv->hadjustment->step_increment = allocation->width / 10;
   tree_view->priv->hadjustment->lower = 0;
   tree_view->priv->hadjustment->upper = tree_view->priv->width;
+
   if (tree_view->priv->hadjustment->value + allocation->width > tree_view->priv->width)
     tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0);
   gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->hadjustment), "changed");
 
   tree_view->priv->vadjustment->page_size = allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view);
+  tree_view->priv->vadjustment->step_increment = (tree_view->priv->vadjustment->page_size) / 10;
   tree_view->priv->vadjustment->page_increment = (allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view)) / 2;
   tree_view->priv->vadjustment->lower = 0;
   tree_view->priv->vadjustment->upper = tree_view->priv->height;
+
   if (tree_view->priv->vadjustment->value + allocation->height > tree_view->priv->height)
     gtk_adjustment_set_value (tree_view->priv->vadjustment,
-                             (gfloat) MAX (tree_view->priv->height - allocation->height, 0));
+                             MAX (tree_view->priv->height - allocation->height, 0));
+
   gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->vadjustment), "changed");
 
-  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_MODEL_SETUP))
-    gtk_tree_view_size_allocate_buttons (widget);
 }
 
-/* Warning: Very scary function.
- * Modify at your own risk
- */
 static gboolean
-gtk_tree_view_bin_expose (GtkWidget      *widget,
-                         GdkEventExpose *event)
+gtk_tree_view_button_press (GtkWidget      *widget,
+                           GdkEventButton *event)
 {
   GtkTreeView *tree_view;
-  GtkTreePath *path;
-  GtkRBTree *tree;
   GList *list;
-  GtkRBNode *node, *last_node = NULL;
-  GtkRBNode *cursor = NULL;
-  GtkRBTree *cursor_tree = NULL, *last_tree = NULL;
-  GtkTreeIter iter;
-  GtkCellRenderer *cell;
-  gint new_y;
-  gint y_offset, x_offset, cell_offset;
-  gint i, max_height;
-  gint depth;
+  GtkTreeViewColumn *column = NULL;
+  gint i;
   GdkRectangle background_area;
   GdkRectangle cell_area;
-  guint flags;
-  gboolean last_selected;
+  gint vertical_separator;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
+  g_return_val_if_fail (event != NULL, FALSE);
 
   tree_view = GTK_TREE_VIEW (widget);
+  gtk_widget_style_get (widget, "vertical_separator", &vertical_separator, NULL);
 
-  if (tree_view->priv->tree == NULL)
-    return TRUE;
-
-  gtk_tree_view_check_dirty (GTK_TREE_VIEW (widget));
-  /* we want to account for a potential HEADER offset.
-   * That is, if the header exists, we want to offset our event by its
-   * height to find the right node.
-   */
-  new_y = (event->area.y<TREE_VIEW_HEADER_HEIGHT (tree_view))?TREE_VIEW_HEADER_HEIGHT (tree_view):event->area.y;
-  y_offset = -_gtk_rbtree_find_offset (tree_view->priv->tree,
-                                      new_y - TREE_VIEW_HEADER_HEIGHT (tree_view),
-                                      &tree,
-                                      &node) + new_y - event->area.y;
-  if (node == NULL)
-    return TRUE;
-
-  /* See if the last node was selected */
-  _gtk_rbtree_prev_full (tree, node, &last_tree, &last_node);
-  last_selected = (last_node && GTK_RBNODE_FLAG_SET (last_node, GTK_RBNODE_IS_SELECTED));
-
-  /* find the path for the node */
-  path = _gtk_tree_view_find_path ((GtkTreeView *)widget,
-                                  tree,
-                                  node);
-  gtk_tree_model_get_iter (tree_view->priv->model,
-                          &iter,
-                          path);
-  depth = gtk_tree_path_get_depth (path);
-  gtk_tree_path_free (path);
-
-  if (tree_view->priv->cursor)
-    _gtk_tree_view_find_node (tree_view, tree_view->priv->cursor, &cursor_tree, &cursor);
+  if (event->window == tree_view->priv->bin_window)
+    {
+      GtkRBNode *node;
+      GtkRBTree *tree;
+      GtkTreePath *path;
+      gchar *path_string;
+      gint depth;
+      gint new_y;
+      gint y_offset;
+      GtkTreeViewColumn *column = NULL;
 
-  /* Actually process the expose event.  To do this, we want to
-   * start at the first node of the event, and walk the tree in
-   * order, drawing each successive node.
-   */
+      if (!GTK_WIDGET_HAS_FOCUS (widget))
+       gtk_widget_grab_focus (widget);
+      GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
 
-  do
-    {
-      /* Need to think about this more.
-        if (tree_view->priv->show_expanders)
-        max_height = MAX (TREE_VIEW_EXPANDER_MIN_HEIGHT, GTK_RBNODE_GET_HEIGHT (node));
-        else
-      */
-      max_height = GTK_RBNODE_GET_HEIGHT (node);
+      /* are we in an arrow? */
+      if (tree_view->priv->prelight_node &&
+          GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
+       {
+         if (event->button == 1)
+           {
+             gtk_grab_add (widget);
+             tree_view->priv->button_pressed_node = tree_view->priv->prelight_node;
+             tree_view->priv->button_pressed_tree = tree_view->priv->prelight_tree;
+             gtk_tree_view_draw_arrow (GTK_TREE_VIEW (widget),
+                                        tree_view->priv->prelight_tree,
+                                       tree_view->priv->prelight_node,
+                                       event->x,
+                                       event->y);
+           }
+         return TRUE;
+       }
 
-      x_offset = -event->area.x;
-      cell_offset = 0;
+      /* find the node that was clicked */
+      new_y = ((gint)event->y<TREE_VIEW_HEADER_HEIGHT (tree_view))?TREE_VIEW_HEADER_HEIGHT (tree_view):(gint)event->y;
+      y_offset = -_gtk_rbtree_find_offset (tree_view->priv->tree,
+                                           TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, new_y),
+                                          &tree,
+                                          &node) + new_y - (gint)event->y;
 
-      background_area.y = y_offset + event->area.y + TREE_VIEW_VERTICAL_SEPERATOR;
-      background_area.height = max_height - TREE_VIEW_VERTICAL_SEPERATOR;
-      flags = 0;
+      if (node == NULL)
+       /* We clicked in dead space */
+       return TRUE;
 
-      if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PRELIT))
-       flags |= GTK_CELL_RENDERER_PRELIT;
+      /* Get the path and the node */
+      path = _gtk_tree_view_find_path (tree_view, tree, node);
+      depth = gtk_tree_path_get_depth (path);
+      background_area.y = y_offset + event->y + vertical_separator;
+      background_area.height = GTK_RBNODE_GET_HEIGHT (node) - vertical_separator;
+      background_area.x = 0;
 
-      if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
-       {
-         flags |= GTK_CELL_RENDERER_SELECTED;
-
-         /* Draw the selection */
-         gdk_draw_rectangle (event->window,
-                             GTK_WIDGET (tree_view)->style->bg_gc [GTK_STATE_SELECTED],
-                             TRUE,
-                             event->area.x,
-                             background_area.y - (last_selected?TREE_VIEW_VERTICAL_SEPERATOR:0),
-                             event->area.width,
-                             background_area.height + (last_selected?TREE_VIEW_VERTICAL_SEPERATOR:0));
-         last_selected = TRUE;
-       }
-      else
+      /* Let the column have a chance at selecting it. */
+      for (i = 0, list = tree_view->priv->columns; i < tree_view->priv->n_columns; i++, list = list->next)
        {
-         last_selected = FALSE;
-       }
+         GtkTreeIter iter;
 
-      for (i = 0, list = tree_view->priv->column; i < tree_view->priv->columns; i++, list = list->next)
-       {
-         GtkTreeViewColumn *column = list->data;
+         column = list->data;
 
          if (!column->visible)
            continue;
 
-         cell = column->cell;
-         gtk_tree_view_column_set_cell_data (column,
-                                             tree_view->priv->model,
-                                             &iter);
-
-         background_area.x = cell_offset;
-         background_area.width = TREE_VIEW_COLUMN_SIZE (column);
-         if (i == 0 && TREE_VIEW_DRAW_EXPANDERS(tree_view))
+         background_area.width = column->displayed_width;
+         if (i == tree_view->priv->expander_column &&
+              TREE_VIEW_DRAW_EXPANDERS(tree_view))
            {
              cell_area = background_area;
              cell_area.x += depth*tree_view->priv->tab_offset;
              cell_area.width -= depth*tree_view->priv->tab_offset;
-             gtk_cell_renderer_render (cell,
-                                       event->window,
-                                       widget,
-                                       &background_area,
-                                       &cell_area,
-                                       &event->area,
-                                       flags);
-             if ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT)
-               {
-                 gint x, y;
-                 gdk_window_get_pointer (tree_view->priv->bin_window, &x, &y, 0);
-                 gtk_tree_view_draw_arrow (GTK_TREE_VIEW (widget),
-                                           node,
-                                           event->area.y + y_offset,
-                                           x, y);
-               }
            }
          else
            {
              cell_area = background_area;
-             gtk_cell_renderer_render (cell,
-                                       event->window,
-                                       widget,
-                                       &background_area,
-                                       &cell_area,
-                                       &event->area,
-                                       flags);
            }
-         cell_offset += TREE_VIEW_COLUMN_SIZE (column);
-       }
-
-      if (node == cursor &&
-         GTK_WIDGET_HAS_FOCUS (widget))
-       gtk_tree_view_draw_focus (widget);
-
-      y_offset += max_height;
-      if (node->children)
-       {
-         GtkTreeIter parent = iter;
-         gboolean has_child;
-
-         tree = node->children;
-         node = tree->root;
-         while (node->left != tree->nil)
-           node = node->left;
-         has_child = gtk_tree_model_iter_children (tree_view->priv->model,
-                                                   &iter,
-                                                   &parent);
-         cell = gtk_tree_view_get_column (tree_view, 0)->cell;
-         depth++;
 
-         /* Sanity Check! */
-         TREE_VIEW_INTERNAL_ASSERT (has_child, FALSE);
-       }
-      else
-       {
-         gboolean done = FALSE;
-         do
+         if ((background_area.x > (gint) event->x) ||
+             (background_area.y > (gint) event->y) ||
+             (background_area.x + background_area.width <= (gint) event->x) ||
+             (background_area.y + background_area.height <= (gint) event->y))
            {
-             node = _gtk_rbtree_next (tree, node);
-             if (node != NULL)
-               {
-                 gboolean has_next = gtk_tree_model_iter_next (tree_view->priv->model, &iter);
-                 cell = gtk_tree_view_get_column (tree_view, 0)->cell;
-                 done = TRUE;
+             background_area.x += background_area.width;
+             continue;
+           }
 
-                 /* Sanity Check! */
-                 TREE_VIEW_INTERNAL_ASSERT (has_next, FALSE);
-               }
-             else
-               {
-                 GtkTreeIter parent_iter = iter;
-                 gboolean has_parent;
+         gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
+         gtk_tree_view_column_cell_set_cell_data (column,
+                                                  tree_view->priv->model,
+                                                  &iter);
 
-                 node = tree->parent_node;
-                 tree = tree->parent_tree;
-                 if (tree == NULL)
-                   /* we've run out of tree.  It's okay to return though, as
-                    * we'd only break out of the while loop below. */
-                   return TRUE;
-                 has_parent = gtk_tree_model_iter_parent (tree_view->priv->model,
-                                                          &iter,
-                                                          &parent_iter);
-                 depth--;
+         path_string = gtk_tree_path_to_string (path);
 
-                 /* Sanity check */
-                 TREE_VIEW_INTERNAL_ASSERT (has_parent, FALSE);
-               }
+         if (gtk_tree_view_column_cell_event (column,
+                                              (GdkEvent *)event,
+                                              path_string,
+                                              &background_area,
+                                              &cell_area, 0))
+           {
+             g_free (path_string);
+             gtk_tree_path_free (path);
+             return TRUE;
+           }
+         else
+           {
+             g_free (path_string);
+             break;
            }
-         while (!done);
        }
-    }
-  while (y_offset < event->area.height);
-
-  return TRUE;
-}
 
-static gboolean
-gtk_tree_view_expose (GtkWidget      *widget,
-                     GdkEventExpose *event)
-{
-  GtkTreeView *tree_view;
+      if (column == NULL)
+       return FALSE;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
+      /* The columns didn't want the event.  We handle it */
 
-  tree_view = GTK_TREE_VIEW (widget);
+      /* Save press to possibly begin a drag
+       */
+      if (tree_view->priv->pressed_button < 0)
+        {
+          tree_view->priv->pressed_button = event->button;
+          tree_view->priv->press_start_x = event->x;
+          tree_view->priv->press_start_y = event->y;
+        }
 
-  if (event->window == tree_view->priv->bin_window)
-    return gtk_tree_view_bin_expose (widget, event);
+      gtk_tree_view_real_set_cursor (tree_view, path, TRUE, event->state);
 
-  return TRUE;
-}
-
-static gboolean
-gtk_tree_view_motion (GtkWidget *widget,
-                     GdkEventMotion  *event)
-{
-  GtkTreeView *tree_view;
-  GtkRBTree *tree;
-  GtkRBNode *node;
-  gint new_y;
-  gint y_offset;
-
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
-
-  tree_view = GTK_TREE_VIEW (widget);
-
-  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE))
-    {
-      gint x;
-      gint new_width;
-
-      if (event->is_hint || event->window != widget->window)
-       gtk_widget_get_pointer (widget, &x, NULL);
-      else
-       x = event->x;
-
-      new_width = gtk_tree_view_new_column_width (GTK_TREE_VIEW (widget), tree_view->priv->drag_pos, &x);
-      if (x != tree_view->priv->x_drag)
-       {
-         gtk_tree_view_column_set_size (gtk_tree_view_get_column (GTK_TREE_VIEW (widget), tree_view->priv->drag_pos), new_width);
-       }
-
-      /* FIXME: We need to scroll */
-      _gtk_tree_view_set_size (GTK_TREE_VIEW (widget), -1, tree_view->priv->height);
-      return FALSE;
-    }
-
-  /* Sanity check it */
-  if (event->window != tree_view->priv->bin_window)
-    return FALSE;
-  if (tree_view->priv->tree == NULL)
-    return FALSE;
-
-  if (tree_view->priv->prelight_node != NULL)
-    {
-      if ((((gint) event->y - TREE_VIEW_HEADER_HEIGHT (tree_view) < tree_view->priv->prelight_offset) ||
-          ((gint) event->y - TREE_VIEW_HEADER_HEIGHT (tree_view) >=
-           (tree_view->priv->prelight_offset + GTK_RBNODE_GET_HEIGHT (tree_view->priv->prelight_node))) ||
-          ((gint) event->x > tree_view->priv->tab_offset)))
-       /* We need to unprelight the old one. */
+      if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
        {
-         if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
+         if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT))
            {
-             GTK_RBNODE_UNSET_FLAG (tree_view->priv->prelight_node, GTK_RBNODE_IS_PRELIT);
-             gtk_tree_view_draw_arrow (GTK_TREE_VIEW (widget),
-                                       tree_view->priv->prelight_node,
-                                       tree_view->priv->prelight_offset,
-                                       event->x,
-                                       event->y);
-             GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
+             if (node->children == NULL)
+               gtk_tree_view_real_expand_row (tree_view, path,
+                                              tree, node, FALSE);
+             else
+               gtk_tree_view_real_collapse_row (GTK_TREE_VIEW (widget), path,
+                                                tree, node);
            }
+         gtk_tree_view_row_activated (tree_view, path, column);
 
-         GTK_RBNODE_UNSET_FLAG (tree_view->priv->prelight_node, GTK_RBNODE_IS_PRELIT);
-         tree_view->priv->prelight_node = NULL;
-         tree_view->priv->prelight_tree = NULL;
-         tree_view->priv->prelight_offset = 0;
        }
+      gtk_tree_path_free (path);
+      return TRUE;
     }
 
-  new_y = ((gint)event->y<TREE_VIEW_HEADER_HEIGHT (tree_view))?TREE_VIEW_HEADER_HEIGHT (tree_view):(gint)event->y;
-  y_offset = -_gtk_rbtree_find_offset (tree_view->priv->tree, new_y - TREE_VIEW_HEADER_HEIGHT (tree_view),
-                                      &tree,
-                                      &node) + new_y - (gint)event->y;
-
-  if (node == NULL)
-    return TRUE;
+  /* We didn't click in the window.  Let's check to see if we clicked on a column resize window.
+   */
+  for (i = 0, list = tree_view->priv->columns; list; list = list->next, i++)
+    {
+      column = list->data;
+      if (event->window == column->window &&
+         column->column_type == GTK_TREE_VIEW_COLUMN_RESIZEABLE &&
+         column->window)
+       {
+         gpointer drag_data;
 
-  /* If we are currently pressing down a button, we don't want to prelight anything else. */
-  if ((tree_view->priv->button_pressed_node != NULL) &&
-      (tree_view->priv->button_pressed_node != node))
-    return TRUE;
+         if (gdk_pointer_grab (column->window, FALSE,
+                               GDK_POINTER_MOTION_HINT_MASK |
+                               GDK_BUTTON1_MOTION_MASK |
+                               GDK_BUTTON_RELEASE_MASK,
+                               NULL, NULL, event->time))
+           return FALSE;
 
-  /* Do we want to prelight a tab? */
-  GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
-  if (event->x <= tree_view->priv->tab_offset &&
-      event->x >= 0 &&
-      ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT))
-    {
-      tree_view->priv->prelight_offset = event->y+y_offset;
-      GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
-    }
+         gtk_grab_add (widget);
+         GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
 
-  tree_view->priv->prelight_node = node;
-  tree_view->priv->prelight_tree = tree;
-  tree_view->priv->prelight_offset = event->y+y_offset;
+         /* block attached dnd signal handler */
+         drag_data = gtk_object_get_data (GTK_OBJECT (widget), "gtk-site-data");
+         if (drag_data)
+           gtk_signal_handler_block_by_data (GTK_OBJECT (widget), drag_data);
 
-  GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PRELIT);
-  gtk_widget_queue_draw (widget);
+         if (!GTK_WIDGET_HAS_FOCUS (widget))
+           gtk_widget_grab_focus (widget);
 
+         tree_view->priv->drag_pos = i;
+         tree_view->priv->x_drag = (column->button->allocation.x + column->button->allocation.width);
+       }
+    }
   return TRUE;
 }
 
-/* Is this function necessary? Can I get an enter_notify event w/o either
- * an expose event or a mouse motion event?
- */
+/* GtkWidget::button_release_event helper */
 static gboolean
-gtk_tree_view_enter_notify (GtkWidget        *widget,
-                           GdkEventCrossing *event)
+gtk_tree_view_button_release_drag_column (GtkWidget      *widget,
+                                         GdkEventButton *event)
 {
   GtkTreeView *tree_view;
-  GtkRBTree *tree;
-  GtkRBNode *node;
-  gint new_y;
-  gint y_offset;
-
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
+  GtkAllocation allocation;
 
   tree_view = GTK_TREE_VIEW (widget);
 
-  /* Sanity check it */
-  if (event->window != tree_view->priv->bin_window)
-    return FALSE;
-  if (tree_view->priv->tree == NULL)
-    return FALSE;
-
-  if ((tree_view->priv->button_pressed_node != NULL) &&
-      (tree_view->priv->button_pressed_node != node))
-    return TRUE;
+  allocation = tree_view->priv->drag_column->button->allocation;
+  allocation.x = tree_view->priv->drag_column_x;
+  gdk_pointer_ungrab (GDK_CURRENT_TIME);
+  gdk_keyboard_ungrab (GDK_CURRENT_TIME);
+  gdk_window_reparent (tree_view->priv->drag_column->button->window,
+                      tree_view->priv->header_window,
+                      tree_view->priv->drag_column_x,
+                      tree_view->priv->drag_column->button->allocation.y);
+  gtk_widget_set_parent_window (tree_view->priv->drag_column->button, tree_view->priv->header_window);
 
-  /* find the node internally */
-  new_y = ((gint)event->y<TREE_VIEW_HEADER_HEIGHT (tree_view))?TREE_VIEW_HEADER_HEIGHT (tree_view):(gint)event->y;
-  y_offset = -_gtk_rbtree_find_offset (tree_view->priv->tree,
-                                      new_y - TREE_VIEW_HEADER_HEIGHT (tree_view),
-                                      &tree,
-                                      &node) + new_y - (gint)event->y;
+  gtk_widget_size_allocate (tree_view->priv->drag_column->button, &allocation);
+  gtk_widget_grab_focus (tree_view->priv->drag_column->button);
 
-  if (node == NULL)
-    return FALSE;
+  if (tree_view->priv->cur_reorder &&
+      tree_view->priv->cur_reorder->left_column != tree_view->priv->drag_column)
+    gtk_tree_view_move_column_after (tree_view, tree_view->priv->drag_column,
+                                    tree_view->priv->cur_reorder->left_column);
+  tree_view->priv->drag_column = NULL;
+  gdk_window_hide (tree_view->priv->drag_window);
 
-  /* Do we want to prelight a tab? */
-  GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
-  if (event->x <= tree_view->priv->tab_offset &&
-      event->x >= 0 &&
-      ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT))
-    {
-      tree_view->priv->prelight_offset = event->y+y_offset;
-      GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
-    }
+  g_list_foreach (tree_view->priv->column_drag_info, (GFunc) g_free, NULL);
+  g_list_free (tree_view->priv->column_drag_info);
+  tree_view->priv->column_drag_info = NULL;
 
-  tree_view->priv->prelight_node = node;
-  tree_view->priv->prelight_tree = tree;
-  tree_view->priv->prelight_offset = event->y+y_offset;
+  gdk_window_hide (tree_view->priv->drag_highlight_window);
 
-  GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PRELIT);
-  gtk_widget_queue_draw (widget);
+  /* Reset our flags */
+  tree_view->priv->drag_column_window_state = DRAG_COLUMN_WINDOW_STATE_UNSET;
+  GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG);
 
   return TRUE;
 }
 
+/* GtkWidget::button_release_event helper */
 static gboolean
-gtk_tree_view_leave_notify (GtkWidget        *widget,
-                           GdkEventCrossing *event)
+gtk_tree_view_button_release_column_resize (GtkWidget      *widget,
+                                           GdkEventButton *event)
 {
   GtkTreeView *tree_view;
-
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
+  gpointer drag_data;
+  gint width;
+  gint x;
+  gint i;
 
   tree_view = GTK_TREE_VIEW (widget);
 
-  if (tree_view->priv->prelight_node != NULL)
-    {
-      GTK_RBNODE_UNSET_FLAG (tree_view->priv->prelight_node, GTK_RBNODE_IS_PRELIT);
-      tree_view->priv->prelight_node = NULL;
-      tree_view->priv->prelight_tree = NULL;
-      tree_view->priv->prelight_offset = 0;
-      GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
-      gtk_widget_queue_draw (widget);
-    }
+  i = tree_view->priv->drag_pos;
+  tree_view->priv->drag_pos = -1;
+
+      /* unblock attached dnd signal handler */
+  drag_data = gtk_object_get_data (GTK_OBJECT (widget), "gtk-site-data");
+  if (drag_data)
+    gtk_signal_handler_unblock_by_data (GTK_OBJECT (widget), drag_data);
+
+  GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
+  gtk_widget_get_pointer (widget, &x, NULL);
+  gtk_grab_remove (widget);
+  gdk_pointer_ungrab (event->time);
+
+  width = gtk_tree_view_new_column_width (GTK_TREE_VIEW (widget), i, &x);
+  _gtk_tree_view_column_set_width (gtk_tree_view_get_column (GTK_TREE_VIEW (widget), i), width);
+
   return TRUE;
 }
 
 static gboolean
-gtk_tree_view_button_press (GtkWidget      *widget,
-                           GdkEventButton *event)
+gtk_tree_view_button_release (GtkWidget      *widget,
+                             GdkEventButton *event)
 {
   GtkTreeView *tree_view;
-  GList *list;
-  GtkTreeViewColumn *column;
-  gint i;
-  GdkRectangle background_area;
-  GdkRectangle cell_area;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
   tree_view = GTK_TREE_VIEW (widget);
 
-  if (event->window == tree_view->priv->bin_window)
-    {
-      GtkRBNode *node;
-      GtkRBTree *tree;
-      GtkTreePath *path;
-      gchar *path_string;
-      gint depth;
-      gint new_y;
-      gint y_offset;
+  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG))
+    return gtk_tree_view_button_release_drag_column (widget, event);
 
-      if (!GTK_WIDGET_HAS_FOCUS (widget))
-       gtk_widget_grab_focus (widget);
-      GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
-      /* are we in an arrow? */
-      if (tree_view->priv->prelight_node != FALSE && GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
+  if (tree_view->priv->pressed_button == event->button)
+    tree_view->priv->pressed_button = -1;
+
+  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE))
+    return gtk_tree_view_button_release_column_resize (widget, event);
+
+  if (tree_view->priv->button_pressed_node == NULL)
+    return FALSE;
+
+  if (event->button == 1)
+    {
+      gtk_grab_remove (widget);
+      if (tree_view->priv->button_pressed_node == tree_view->priv->prelight_node &&
+          GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
        {
-         if (event->button == 1)
-           {
-             gtk_grab_add (widget);
-             tree_view->priv->button_pressed_node = tree_view->priv->prelight_node;
-             tree_view->priv->button_pressed_tree = tree_view->priv->prelight_tree;
-             gtk_tree_view_draw_arrow (GTK_TREE_VIEW (widget),
-                                       tree_view->priv->prelight_node,
-                                       tree_view->priv->prelight_offset,
-                                       event->x,
-                                       event->y);
-           }
-         return TRUE;
+         GtkTreePath *path = NULL;
+
+         path = _gtk_tree_view_find_path (tree_view,
+                                          tree_view->priv->button_pressed_tree,
+                                          tree_view->priv->button_pressed_node);
+         /* Actually activate the node */
+         if (tree_view->priv->button_pressed_node->children == NULL)
+           gtk_tree_view_real_expand_row (tree_view, path,
+                                          tree_view->priv->button_pressed_tree,
+                                          tree_view->priv->button_pressed_node,
+                                          FALSE);
+         else
+           gtk_tree_view_real_collapse_row (GTK_TREE_VIEW (widget), path,
+                                            tree_view->priv->button_pressed_tree,
+                                            tree_view->priv->button_pressed_node);
+         gtk_tree_path_free (path);
        }
 
-      /* find the node that was clicked */
-      new_y = ((gint)event->y<TREE_VIEW_HEADER_HEIGHT (tree_view))?TREE_VIEW_HEADER_HEIGHT (tree_view):(gint)event->y;
-      y_offset = -_gtk_rbtree_find_offset (tree_view->priv->tree,
-                                          new_y - TREE_VIEW_HEADER_HEIGHT (tree_view),
-                                          &tree,
-                                          &node) + new_y - (gint)event->y;
+      tree_view->priv->button_pressed_tree = NULL;
+      tree_view->priv->button_pressed_node = NULL;
+    }
 
-      if (node == NULL)
-       /* We clicked in dead space */
-       return TRUE;
+  return TRUE;
+}
 
-      /* Get the path and the node */
-      path = _gtk_tree_view_find_path (tree_view, tree, node);
-      depth = gtk_tree_path_get_depth (path);
-      background_area.y = y_offset + event->y + TREE_VIEW_VERTICAL_SEPERATOR;
-      background_area.height = GTK_RBNODE_GET_HEIGHT (node) - TREE_VIEW_VERTICAL_SEPERATOR;
-      background_area.x = 0;
-      /* Let the cell have a chance at selecting it. */
 
-      for (i = 0, list = tree_view->priv->column; i < tree_view->priv->columns; i++, list = list->next)
-       {
-         GtkTreeViewColumn *column = list->data;
-         GtkCellRenderer *cell;
-         GtkTreeIter iter;
+/* GtkWidget::motion_event function set.
+ */
 
-         if (!column->visible)
-           continue;
+static gboolean
+coords_are_over_arrow (GtkTreeView *tree_view,
+                       GtkRBTree   *tree,
+                       GtkRBNode   *node,
+                       /* these are in tree window coords */
+                       gint         x,
+                       gint         y)
+{
+  GdkRectangle arrow;
+  gint x2;
 
-         background_area.width = TREE_VIEW_COLUMN_SIZE (column);
-         if (i == 0 && TREE_VIEW_DRAW_EXPANDERS(tree_view))
-           {
-             cell_area = background_area;
-             cell_area.x += depth*tree_view->priv->tab_offset;
-             cell_area.width -= depth*tree_view->priv->tab_offset;
-           }
-         else
-           {
-             cell_area = background_area;
-           }
+  if (!GTK_WIDGET_REALIZED (tree_view))
+    return FALSE;
 
-         cell = column->cell;
+  if ((node->flags & GTK_RBNODE_IS_PARENT) == 0)
+    return FALSE;
 
-         if ((background_area.x > (gint) event->x) ||
-             (background_area.y > (gint) event->y) ||
-             (background_area.x + background_area.width <= (gint) event->x) ||
-             (background_area.y + background_area.height <= (gint) event->y))
-           {
-             background_area.x += background_area.width;
-             continue;
-           }
+  arrow.y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
 
-         gtk_tree_model_get_iter (tree_view->priv->model,
-                                  &iter,
-                                  path);
-         gtk_tree_view_column_set_cell_data (column,
-                                             tree_view->priv->model,
-                                             &iter);
+  arrow.height = BACKGROUND_HEIGHT (node);
 
-         path_string = gtk_tree_path_to_string (path);
-         if (gtk_cell_renderer_event (cell,
-                                      (GdkEvent *)event,
-                                      widget,
-                                      path_string,
-                                      &background_area,
-                                      &cell_area,
-                                      0))
+  gtk_tree_view_get_arrow_xrange (tree_view, &arrow.x, &x2);
 
-           {
-             g_free (path_string);
-             gtk_tree_path_free (path);
-             return TRUE;
-           }
-         else
-           {
-             g_free (path_string);
-             break;
-           }
-       }
-      /* Handle the selection */
-      if (tree_view->priv->selection == NULL)
-       gtk_tree_selection_new_with_tree_view (tree_view);
+  arrow.width = x2 - arrow.x;
 
-      _gtk_tree_selection_internal_select_node (tree_view->priv->selection,
-                                               node,
-                                               tree,
-                                               path,
-                                               event->state);
-      gtk_tree_path_free (path);
-      return TRUE;
-    }
+  return (x >= arrow.x &&
+          x < (arrow.x + arrow.height) &&
+          y >= arrow.y &&
+          y < (arrow.y + arrow.height));
+}
+
+static void
+do_unprelight (GtkTreeView *tree_view,
+               /* these are in tree window coords */
+               gint x,
+               gint y)
+{
+  if (tree_view->priv->prelight_node == NULL)
+    return;
 
-  for (i = 0, list = tree_view->priv->column; list; list = list->next, i++)
+  GTK_RBNODE_UNSET_FLAG (tree_view->priv->prelight_node, GTK_RBNODE_IS_PRELIT);
+
+  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT) &&
+      !coords_are_over_arrow (tree_view,
+                              tree_view->priv->prelight_tree,
+                              tree_view->priv->prelight_node,
+                              x,
+                              y))
+    /* We need to unprelight the old arrow. */
     {
-      column = list->data;
-      if (event->window == column->window &&
-         column->column_type == GTK_TREE_VIEW_COLUMN_RESIZEABLE &&
-         column->window)
-       {
-         gpointer drag_data;
+      GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
 
-         if (gdk_pointer_grab (column->window, FALSE,
-                               GDK_POINTER_MOTION_HINT_MASK |
-                               GDK_BUTTON1_MOTION_MASK |
-                               GDK_BUTTON_RELEASE_MASK,
-                               NULL, NULL, event->time))
-           return FALSE;
+      gtk_tree_view_draw_arrow (tree_view,
+                                tree_view->priv->prelight_tree,
+                                tree_view->priv->prelight_node,
+                                x,
+                                y);
 
-         gtk_grab_add (widget);
-         GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
+    }
 
-         /* block attached dnd signal handler */
-         drag_data = gtk_object_get_data (GTK_OBJECT (widget), "gtk-site-data");
-         if (drag_data)
-           gtk_signal_handler_block_by_data (GTK_OBJECT (widget), drag_data);
-
-         if (!GTK_WIDGET_HAS_FOCUS (widget))
-           gtk_widget_grab_focus (widget);
-
-         tree_view->priv->drag_pos = i;
-         tree_view->priv->x_drag = (column->button->allocation.x + column->button->allocation.width);
-       }
-    }
-  return TRUE;
+  tree_view->priv->prelight_node = NULL;
+  tree_view->priv->prelight_tree = NULL;
 }
 
-static gboolean
-gtk_tree_view_button_release (GtkWidget      *widget,
-                             GdkEventButton *event)
+static void
+do_prelight (GtkTreeView *tree_view,
+             GtkRBTree   *tree,
+             GtkRBNode   *node,
+             /* these are in tree window coords */
+             gint         x,
+             gint         y)
 {
-  GtkTreeView *tree_view;
+  if (coords_are_over_arrow (tree_view, tree, node, x, y))
+    GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
 
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
+  tree_view->priv->prelight_node = node;
+  tree_view->priv->prelight_tree = tree;
 
-  tree_view = GTK_TREE_VIEW (widget);
+  GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PRELIT);
+}
 
-  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE))
-    {
-      gpointer drag_data;
-      gint width;
-      gint x;
-      gint i;
+static void
+ensure_unprelighted (GtkTreeView *tree_view)
+{
+  do_unprelight (tree_view, -1000, -1000); /* coords not possibly over an arrow */
+}
 
-      i = tree_view->priv->drag_pos;
-      tree_view->priv->drag_pos = -1;
 
-      /* unblock attached dnd signal handler */
-      drag_data = gtk_object_get_data (GTK_OBJECT (widget), "gtk-site-data");
-      if (drag_data)
-       gtk_signal_handler_unblock_by_data (GTK_OBJECT (widget), drag_data);
 
-      GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
-      gtk_widget_get_pointer (widget, &x, NULL);
-      gtk_grab_remove (widget);
-      gdk_pointer_ungrab (event->time);
+/* Our motion arrow is either a box (in the case of the original spot)
+ * or an arrow.  It is expander_width wide.
+ */
+/*
+ * 11111111111111
+ * 01111111111110
+ * 00111111111100
+ * 00011111111000
+ * 00001111110000
+ * 00000111100000
+ * 00000111100000
+ * 00000111100000
+ * ~ ~ ~ ~ ~ ~ ~
+ * 00000111100000
+ * 00000111100000
+ * 00000111100000
+ * 00001111110000
+ * 00011111111000
+ * 00111111111100
+ * 01111111111110
+ * 11111111111111
+ */
 
-      width = gtk_tree_view_new_column_width (GTK_TREE_VIEW (widget), i, &x);
-      gtk_tree_view_column_set_size (gtk_tree_view_get_column (GTK_TREE_VIEW (widget), i), width);
-      return FALSE;
+static void
+gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
+{
+  GtkTreeViewColumnReorder *reorder = tree_view->priv->cur_reorder;
+  GtkWidget *widget = GTK_WIDGET (tree_view);
+  GdkBitmap *mask = NULL;
+  gint x;
+  gint y;
+  gint width;
+  gint height;
+  gint arrow_type = DRAG_COLUMN_WINDOW_STATE_UNSET;
+  GdkWindowAttr attributes;
+  guint attributes_mask;
+
+  if (!reorder ||
+      reorder->left_column == tree_view->priv->drag_column ||
+      reorder->right_column == tree_view->priv->drag_column)
+    arrow_type = DRAG_COLUMN_WINDOW_STATE_ORIGINAL;
+  else if (reorder->left_column || reorder->right_column)
+    {
+      GdkRectangle visible_rect;
+      gtk_tree_view_get_visible_rect (tree_view, &visible_rect);
+      if (reorder->left_column)
+       x = reorder->left_column->button->allocation.x + reorder->left_column->button->allocation.width;
+      else
+       x = reorder->right_column->button->allocation.x;
+      if (x < visible_rect.x)
+       arrow_type = DRAG_COLUMN_WINDOW_STATE_ARROW_LEFT;
+      else if (x > visible_rect.x + visible_rect.width)
+       arrow_type = DRAG_COLUMN_WINDOW_STATE_ARROW_RIGHT;
+      else
+        arrow_type = DRAG_COLUMN_WINDOW_STATE_ARROW;
     }
 
-  if (tree_view->priv->button_pressed_node == NULL)
-    return FALSE;
+  /* We want to draw the rectangle over the initial location. */
+  if (arrow_type == DRAG_COLUMN_WINDOW_STATE_ORIGINAL)
+    {
+      GdkGC *gc;
+      GdkColor col;
 
-  if (event->button == 1)
+      if (tree_view->priv->drag_column_window_state != DRAG_COLUMN_WINDOW_STATE_ORIGINAL)
+       {
+
+         if (tree_view->priv->drag_highlight_window)
+           gdk_window_destroy (tree_view->priv->drag_highlight_window);
+
+         attributes.window_type = GDK_WINDOW_CHILD;
+         attributes.wclass = GDK_INPUT_OUTPUT;
+         attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
+         attributes.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view));
+         attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
+         attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+         tree_view->priv->drag_highlight_window = gdk_window_new (tree_view->priv->header_window, &attributes, attributes_mask);
+         gdk_window_set_user_data (tree_view->priv->drag_highlight_window, GTK_WIDGET (tree_view));
+
+         width = tree_view->priv->drag_column->button->allocation.width;
+         height = tree_view->priv->drag_column->button->allocation.height;
+         gdk_window_move_resize (tree_view->priv->drag_highlight_window,
+                                 tree_view->priv->drag_column_x, 0, width, height);
+
+         mask = gdk_pixmap_new (tree_view->priv->drag_highlight_window, width, height, 1);
+         gc = gdk_gc_new (mask);
+         col.pixel = 1;
+         gdk_gc_set_foreground (gc, &col);
+         gdk_draw_rectangle (mask, gc, TRUE, 0, 0, width, height);
+         col.pixel = 0;
+         gdk_gc_set_foreground(gc, &col);
+         gdk_draw_rectangle (mask, gc, TRUE, 2, 2, width - 4, height - 4);
+         gdk_gc_destroy (gc);
+
+         gdk_window_shape_combine_mask (tree_view->priv->drag_highlight_window,
+                                        mask, 0, 0);
+         if (mask) gdk_pixmap_unref (mask);
+         tree_view->priv->drag_column_window_state = DRAG_COLUMN_WINDOW_STATE_ORIGINAL;
+       }
+    }
+  else if (arrow_type == DRAG_COLUMN_WINDOW_STATE_ARROW)
     {
-      gtk_grab_remove (widget);
-      if (tree_view->priv->button_pressed_node == tree_view->priv->prelight_node && GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
+      gint i, j = 1;
+      GdkGC *gc;
+      GdkColor col;
+      gint expander_width;
+
+      gtk_widget_style_get (widget,
+                           "expander_height", &width,
+                           "expander_width", &expander_width,
+                           NULL);
+
+      /* Get x, y, width, height of arrow */
+      if (reorder->left_column)
        {
-         GtkTreePath *path;
-         GtkTreeIter iter;
+         gdk_window_get_origin (reorder->left_column->button->window, &x, &y);
+         x += reorder->left_column->button->allocation.width - width/2;
+         height = reorder->left_column->button->allocation.height;
+       }
+      else
+       {
+         gdk_window_get_origin (reorder->right_column->button->window, &x, &y);
+         x -= width/2;
+         height = reorder->right_column->button->allocation.height;
+       }
+      y -= expander_width/2; /* The arrow takes up only half the space */
+      height += expander_width;
 
-         /* Actually activate the node */
-         if (tree_view->priv->button_pressed_node->children == NULL)
+      /* Create the new window */
+      if (tree_view->priv->drag_column_window_state != DRAG_COLUMN_WINDOW_STATE_ARROW)
+       {
+         if (tree_view->priv->drag_highlight_window)
+           gdk_window_destroy (tree_view->priv->drag_highlight_window);
+
+         attributes.window_type = GDK_WINDOW_TEMP;
+         attributes.wclass = GDK_INPUT_OUTPUT;
+         attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
+         attributes.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view));
+         attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
+         attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+         attributes.width = width;
+         attributes.height = height;
+         tree_view->priv->drag_highlight_window = gdk_window_new (NULL, &attributes, attributes_mask);
+         gdk_window_set_user_data (tree_view->priv->drag_highlight_window, GTK_WIDGET (tree_view));
+
+         mask = gdk_pixmap_new (tree_view->priv->drag_highlight_window, width, height, 1);
+         gc = gdk_gc_new (mask);
+         col.pixel = 1;
+         gdk_gc_set_foreground (gc, &col);
+         gdk_draw_rectangle (mask, gc, TRUE, 0, 0, width, height);
+
+         /* Draw the 2 arrows as per above */
+         col.pixel = 0;
+         gdk_gc_set_foreground (gc, &col);
+         for (i = 0; i < width; i ++)
            {
-             GtkTreeIter child;
-             path = _gtk_tree_view_find_path (GTK_TREE_VIEW (widget),
-                                              tree_view->priv->button_pressed_tree,
-                                              tree_view->priv->button_pressed_node);
-             tree_view->priv->button_pressed_node->children = _gtk_rbtree_new ();
-             tree_view->priv->button_pressed_node->children->parent_tree = tree_view->priv->button_pressed_tree;
-             tree_view->priv->button_pressed_node->children->parent_node = tree_view->priv->button_pressed_node;
-             gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
-             gtk_tree_model_iter_children (tree_view->priv->model, &child, &iter);
-
-             gtk_tree_view_build_tree (tree_view,
-                                       tree_view->priv->button_pressed_node->children,
-                                       &child,
-                                       gtk_tree_path_get_depth (path) + 1,
-                                       FALSE,
-                                       GTK_WIDGET_REALIZED (widget));
+             if (i == (width/2 - 1))
+               continue;
+             gdk_draw_line (mask, gc, i, j, i, height - j);
+             if (i < (width/2 - 1))
+               j++;
+             else
+               j--;
            }
-         else
+         gdk_gc_destroy (gc);
+         gdk_window_shape_combine_mask (tree_view->priv->drag_highlight_window,
+                                        mask, 0, 0);
+         if (mask) gdk_pixmap_unref (mask);
+       }
+
+      tree_view->priv->drag_column_window_state = DRAG_COLUMN_WINDOW_STATE_ARROW;
+      gdk_window_move (tree_view->priv->drag_highlight_window, x, y);
+    }
+  else if (arrow_type == DRAG_COLUMN_WINDOW_STATE_ARROW_LEFT ||
+          arrow_type == DRAG_COLUMN_WINDOW_STATE_ARROW_RIGHT)
+    {
+      gint i, j = 1;
+      GdkGC *gc;
+      GdkColor col;
+      gint expander_height;
+
+      gtk_widget_style_get (widget,
+                           "expander_height", &expander_height,
+                           "expander_width", &width,
+                           NULL);
+
+      /* Get x, y, width, height of arrow */
+      width = width/2; /* remember, the arrow only takes half the available width */
+      gdk_window_get_origin (widget->window, &x, &y);
+      if (arrow_type == DRAG_COLUMN_WINDOW_STATE_ARROW_RIGHT)
+       x += widget->allocation.width - width;
+
+      if (reorder->left_column)
+       height = reorder->left_column->button->allocation.height;
+      else
+       height = reorder->right_column->button->allocation.height;
+
+      y -= expander_height;
+      height += 2*expander_height;
+
+      /* Create the new window */
+      if (tree_view->priv->drag_column_window_state != DRAG_COLUMN_WINDOW_STATE_ARROW_LEFT &&
+         tree_view->priv->drag_column_window_state != DRAG_COLUMN_WINDOW_STATE_ARROW_RIGHT)
+       {
+         if (tree_view->priv->drag_highlight_window)
+           gdk_window_destroy (tree_view->priv->drag_highlight_window);
+
+         attributes.window_type = GDK_WINDOW_TEMP;
+         attributes.wclass = GDK_INPUT_OUTPUT;
+         attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
+         attributes.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view));
+         attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
+         attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+         attributes.width = width;
+         attributes.height = height;
+         tree_view->priv->drag_highlight_window = gdk_window_new (NULL, &attributes, attributes_mask);
+         gdk_window_set_user_data (tree_view->priv->drag_highlight_window, GTK_WIDGET (tree_view));
+
+         mask = gdk_pixmap_new (tree_view->priv->drag_highlight_window, width, height, 1);
+         gc = gdk_gc_new (mask);
+         col.pixel = 1;
+         gdk_gc_set_foreground (gc, &col);
+         gdk_draw_rectangle (mask, gc, TRUE, 0, 0, width, height);
+
+         /* Draw the 2 arrows as per above */
+         col.pixel = 0;
+         gdk_gc_set_foreground (gc, &col);
+         j = expander_height;
+         for (i = 0; i < width; i ++)
            {
-             path = _gtk_tree_view_find_path (GTK_TREE_VIEW (widget),
-                                              tree_view->priv->button_pressed_node->children,
-                                              tree_view->priv->button_pressed_node->children->root);
-             gtk_tree_model_get_iter (tree_view->priv->model,
-                                      &iter,
-                                      path);
-
-             gtk_tree_view_discover_dirty (GTK_TREE_VIEW (widget),
-                                           tree_view->priv->button_pressed_node->children,
-                                           &iter,
-                                           gtk_tree_path_get_depth (path));
-             _gtk_rbtree_remove (tree_view->priv->button_pressed_node->children);
+             gint k;
+             if (arrow_type == DRAG_COLUMN_WINDOW_STATE_ARROW_LEFT)
+               k = width - i - 1;
+             else
+               k = i;
+             gdk_draw_line (mask, gc, k, j, k, height - j);
+             gdk_draw_line (mask, gc, k, 0, k, expander_height - j);
+             gdk_draw_line (mask, gc, k, height, k, height - expander_height + j);
+             j--;
            }
-         gtk_tree_path_free (path);
-
-         _gtk_tree_view_set_size (GTK_TREE_VIEW (widget), -1, -1);
-         gtk_widget_queue_resize (widget);
+         gdk_gc_destroy (gc);
+         gdk_window_shape_combine_mask (tree_view->priv->drag_highlight_window,
+                                        mask, 0, 0);
+         if (mask) gdk_pixmap_unref (mask);
        }
 
-      tree_view->priv->button_pressed_node = NULL;
+      tree_view->priv->drag_column_window_state = arrow_type;
+      gdk_window_move (tree_view->priv->drag_highlight_window, x, y);
+   }
+  else
+    {
+      g_warning (G_STRLOC"Invalid GtkTreeViewColumnReorder struct");
+      gdk_window_hide (tree_view->priv->drag_highlight_window);
+      return;
     }
 
-  return TRUE;
+  gdk_window_show (tree_view->priv->drag_highlight_window);
+  gdk_window_raise (tree_view->priv->drag_highlight_window);
+}
+
+static gboolean
+gtk_tree_view_motion_resize_column (GtkWidget      *widget,
+                                   GdkEventMotion *event)
+{
+  gint x;
+  gint new_width;
+
+  if (event->is_hint || event->window != widget->window)
+    gtk_widget_get_pointer (widget, &x, NULL);
+  else
+    x = event->x;
+
+  new_width = gtk_tree_view_new_column_width (GTK_TREE_VIEW (widget),
+                                             GTK_TREE_VIEW (widget)->priv->drag_pos, &x);
+  if (x != GTK_TREE_VIEW (widget)->priv->x_drag)
+    _gtk_tree_view_column_set_width (gtk_tree_view_get_column (GTK_TREE_VIEW (widget), GTK_TREE_VIEW (widget)->priv->drag_pos), new_width);
+
+  /* FIXME: Do we need to scroll */
+  _gtk_tree_view_update_size (GTK_TREE_VIEW (widget));
+  return FALSE;
 }
 
 
 static void
-gtk_tree_view_draw_focus (GtkWidget *widget)
+gtk_tree_view_update_current_reorder (GtkTreeView *tree_view)
 {
-  GtkTreeView *tree_view;
-  GtkRBTree *cursor_tree = NULL;
-  GtkRBNode *cursor = NULL;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_TREE_VIEW (widget));
+  GtkTreeViewColumnReorder *reorder = NULL;
+  GList *list;
+  gint mouse_x;
 
-  tree_view = GTK_TREE_VIEW (widget);
+  gdk_window_get_pointer (tree_view->priv->bin_window, &mouse_x, NULL, NULL);
 
-  if (! GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS))
-    return;
-  if (tree_view->priv->cursor == NULL)
-    return;
+  for (list = tree_view->priv->column_drag_info; list; list = list->next)
+    {
+      reorder = (GtkTreeViewColumnReorder *) list->data;
+      if (mouse_x >= reorder->left_align && mouse_x < reorder->right_align)
+       break;
+      reorder = NULL;
+    }
 
-  _gtk_tree_view_find_node (tree_view, tree_view->priv->cursor, &cursor_tree, &cursor);
-  if (cursor == NULL)
-    return;
+  /*  if (reorder && reorder == tree_view->priv->cur_reorder)
+      return;*/
 
-  gdk_draw_rectangle (tree_view->priv->bin_window,
-                     widget->style->fg_gc[GTK_STATE_NORMAL],
-                     FALSE,
-                     0,
-                     _gtk_rbtree_node_find_offset (cursor_tree, cursor) + TREE_VIEW_HEADER_HEIGHT (tree_view),
-                     (gint) MAX (tree_view->priv->width, tree_view->priv->hadjustment->upper),
-                     GTK_RBNODE_GET_HEIGHT (cursor));
+  tree_view->priv->cur_reorder = reorder;
+  gtk_tree_view_motion_draw_column_motion_arrow (tree_view);
 }
 
-
-static gint
-gtk_tree_view_focus_in (GtkWidget     *widget,
-                       GdkEventFocus *event)
+static gboolean
+gtk_tree_view_horizontal_autoscroll (GtkTreeView *tree_view)
 {
-  GtkTreeView *tree_view;
+  GdkRectangle visible_rect;
+  gint x;
+  gint offset;
+  gfloat value;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
+  gdk_window_get_pointer (tree_view->priv->bin_window, &x, NULL, NULL);
 
-  tree_view = GTK_TREE_VIEW (widget);
+  gtk_tree_view_get_visible_rect (tree_view, &visible_rect);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
+  /* See if we are near the edge. */
+  offset = x - (visible_rect.x + SCROLL_EDGE_SIZE);
+  if (offset > 0)
+    {
+      offset = x - (visible_rect.x + visible_rect.width - SCROLL_EDGE_SIZE);
+      if (offset < 0)
+       return TRUE;
+    }
+  offset = offset/3;
 
-  gtk_widget_draw_focus (widget);
+  value = CLAMP (tree_view->priv->hadjustment->value + offset,
+                0.0, tree_view->priv->hadjustment->upper - tree_view->priv->hadjustment->page_size);
+  gtk_adjustment_set_value (tree_view->priv->hadjustment, value);
 
-  return FALSE;
-}
+  return TRUE;
 
+}
 
-static gint
-gtk_tree_view_focus_out (GtkWidget     *widget,
-                        GdkEventFocus *event)
+static gboolean
+gtk_tree_view_motion_drag_column (GtkWidget      *widget,
+                                 GdkEventMotion *event)
 {
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
+  GtkTreeView *tree_view = (GtkTreeView *) widget;
+  GtkTreeViewColumn *column = tree_view->priv->drag_column;
+  gint x, y;
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
+  /* Sanity Check */
+  if ((column == NULL) ||
+      (event->window != tree_view->priv->drag_window))
+    return FALSE;
 
-  gtk_widget_queue_draw (widget);
+  /* Handle moving the header */
+  gdk_window_get_position (tree_view->priv->drag_window, &x, &y);
+  x = CLAMP (x + (gint)event->x - column->drag_x, 0,
+            MAX (tree_view->priv->width, GTK_WIDGET (tree_view)->allocation.width) - column->button->allocation.width);
+  gdk_window_move (tree_view->priv->drag_window, x, y);
 
-  return FALSE;
+  /* autoscroll, if needed */
+  gtk_tree_view_horizontal_autoscroll (tree_view);
+  /* Update the current reorder position and arrow; */
+  gtk_tree_view_update_current_reorder (tree_view);
+
+  return TRUE;
 }
 
-/* FIXME: It would be neat to someday make the headers a seperate widget that
- * can be shared between various apps
- */
-/* Returns TRUE if the focus is within the headers, after the focus operation is
- * done
- */
 static gboolean
-gtk_tree_view_header_focus (GtkTreeView        *tree_view,
-                           GtkDirectionType  dir)
+gtk_tree_view_motion_bin_window (GtkWidget      *widget,
+                                GdkEventMotion *event)
 {
-  GtkWidget *focus_child;
-  GtkContainer *container;
+  GtkTreeView *tree_view;
+  GtkRBTree *tree;
+  GtkRBNode *node;
+  gint new_y;
+  GtkRBTree *old_prelight_tree;
+  GtkRBNode *old_prelight_node;
 
-  GList *last_column, *first_column;
-  GList *tmp_list;
+  tree_view = (GtkTreeView *) widget;
 
-  if (! GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
+  if (tree_view->priv->tree == NULL)
     return FALSE;
 
-  focus_child = GTK_CONTAINER (tree_view)->focus_child;
-  container = GTK_CONTAINER (tree_view);
+  gtk_tree_view_maybe_begin_dragging_row (tree_view, event);
 
-  for (last_column = g_list_last (tree_view->priv->column);
-       last_column &&
-        !(GTK_TREE_VIEW_COLUMN (last_column->data)->visible) &&
-        GTK_WIDGET_CAN_FOCUS (GTK_TREE_VIEW_COLUMN (last_column->data)->button);
-       last_column = last_column->prev)
-    ;
+  old_prelight_tree = tree_view->priv->prelight_tree;
+  old_prelight_node = tree_view->priv->prelight_node;
 
-  for (first_column = tree_view->priv->column;
-       first_column &&
-        !(GTK_TREE_VIEW_COLUMN (first_column->data)->visible) &&
-        GTK_WIDGET_CAN_FOCUS (GTK_TREE_VIEW_COLUMN (first_column->data)->button);
-       first_column = first_column->next)
-    ;
+  do_unprelight (tree_view, event->x, event->y);
 
-  /* no headers are visible, or are focussable.  We can't focus in or out.
-   * I wonder if focussable is a real word...
-   */
-  if (last_column == NULL)
-    {
-      gtk_container_set_focus_child (container, NULL);
-      return FALSE;
-    }
+  new_y = ((gint)event->y<TREE_VIEW_HEADER_HEIGHT (tree_view))?TREE_VIEW_HEADER_HEIGHT (tree_view):(gint)event->y;
 
-  /* First thing we want to handle is entering and leaving the headers.
-   */
-  switch (dir)
-    {
-    case GTK_DIR_TAB_BACKWARD:
-      if (!focus_child)
-       {
-         focus_child = GTK_TREE_VIEW_COLUMN (last_column->data)->button;
-         gtk_container_set_focus_child (container, focus_child);
-         gtk_widget_grab_focus (focus_child);
-         goto cleanup;
-       }
-      if (focus_child == GTK_TREE_VIEW_COLUMN (first_column->data)->button)
-       {
-         focus_child = NULL;
-         goto cleanup;
-       }
-      break;
+  _gtk_rbtree_find_offset (tree_view->priv->tree,
+                           TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, new_y),
+                           &tree,
+                           &node);
 
-    case GTK_DIR_TAB_FORWARD:
-      if (!focus_child)
-       {
-         focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
-         gtk_container_set_focus_child (container, focus_child);
-         gtk_widget_grab_focus (focus_child);
-         goto cleanup;
-       }
-      if (focus_child == GTK_TREE_VIEW_COLUMN (last_column->data)->button)
-       {
-         focus_child = NULL;
-         goto cleanup;
-       }
-      break;
+  if (tree == NULL)
+    return TRUE;
 
-    case GTK_DIR_LEFT:
-      if (!focus_child)
-       {
-         focus_child = GTK_TREE_VIEW_COLUMN (last_column->data)->button;
-         gtk_container_set_focus_child (container, focus_child);
-         gtk_widget_grab_focus (focus_child);
-         goto cleanup;
-       }
-      if (focus_child == GTK_TREE_VIEW_COLUMN (first_column->data)->button)
-       {
-         focus_child = NULL;
-         goto cleanup;
-       }
-      break;
+  /* If we are currently pressing down a button, we don't want to prelight anything else. */
+  if ((tree_view->priv->button_pressed_node != NULL) &&
+      (tree_view->priv->button_pressed_node != node))
+    return TRUE;
 
-    case GTK_DIR_RIGHT:
-      if (!focus_child)
-       {
-         focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
-         gtk_container_set_focus_child (container, focus_child);
-         gtk_widget_grab_focus (focus_child);
-         goto cleanup;
-       }
-      if (focus_child == GTK_TREE_VIEW_COLUMN (last_column->data)->button)
-       {
-         focus_child = NULL;
-         goto cleanup;
-       }
-      break;
 
-    case GTK_DIR_UP:
-      if (!focus_child)
-       {
-         focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
-         gtk_container_set_focus_child (container, focus_child);
-         gtk_widget_grab_focus (focus_child);
-       }
-      else
-       {
-         focus_child = NULL;
-       }
-      goto cleanup;
+  do_prelight (tree_view, tree, node, event->x, new_y);
 
-    case GTK_DIR_DOWN:
-      if (!focus_child)
-       {
-         focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
-         gtk_container_set_focus_child (container, focus_child);
-         gtk_widget_grab_focus (focus_child);
-       }
-      else
-       {
-         focus_child = NULL;
-       }
-      goto cleanup;
+  if (old_prelight_node != tree_view->priv->prelight_node)
+    {
+      if (old_prelight_node)
+        gtk_tree_view_queue_draw_node (tree_view,
+                                       old_prelight_tree,
+                                       old_prelight_node,
+                                       NULL);
+
+      if (tree_view->priv->prelight_node)
+        gtk_tree_view_queue_draw_node (tree_view,
+                                       tree_view->priv->prelight_tree,
+                                       tree_view->priv->prelight_node,
+                                       NULL);
     }
 
-  /* We need to move the focus to the next button. */
-  if (focus_child)
-    {
-      for (tmp_list = tree_view->priv->column; tmp_list; tmp_list = tmp_list->next)
-       if (GTK_TREE_VIEW_COLUMN (tmp_list->data)->button == focus_child)
-         {
-           if (gtk_container_focus (GTK_CONTAINER (GTK_TREE_VIEW_COLUMN (tmp_list->data)->button), dir))
-             {
-               /* The focus moves inside the button. */
-               /* This is probably a great example of bad UI */
-               goto cleanup;
-             }
-           break;
-         }
+  return TRUE;
+}
 
-      /* We need to move the focus among the row of buttons. */
-      while (tmp_list)
-       {
-         GtkTreeViewColumn *column;
+static gboolean
+gtk_tree_view_motion (GtkWidget      *widget,
+                     GdkEventMotion *event)
+{
+  GtkTreeView *tree_view;
 
-         if (dir == GTK_DIR_RIGHT || dir == GTK_DIR_TAB_FORWARD)
-           tmp_list = tmp_list->next;
-         else
-           tmp_list = tmp_list->prev;
+  tree_view = (GtkTreeView *) widget;
 
-         if (tmp_list == NULL)
-           {
-             g_warning ("Internal button not found");
-             goto cleanup;
-           }
-         column = tmp_list->data;
-         if (column->button &&
-             column->visible &&
-             GTK_WIDGET_CAN_FOCUS (column->button))
-           {
-             focus_child = column->button;
-             gtk_container_set_focus_child (container, column->button);
-             gtk_widget_grab_focus (column->button);
-             break;
-           }
-       }
-    }
+  /* Resizing a column */
+  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE))
+    return gtk_tree_view_motion_resize_column (widget, event);
 
- cleanup:
-  /* if focus child is non-null, we assume it's been set to the current focus child
-   */
-  if (focus_child)
-    {
-      /* If the following isn't true, then the view is smaller then the scrollpane.
-       */
-      if ((focus_child->allocation.x + focus_child->allocation.width) <=
-         (tree_view->priv->hadjustment->upper))
-       {
-         /* Scroll to the button, if needed */
-         if ((tree_view->priv->hadjustment->value + tree_view->priv->hadjustment->page_size) <
-             (focus_child->allocation.x + focus_child->allocation.width))
-           gtk_adjustment_set_value (tree_view->priv->hadjustment,
-                                     focus_child->allocation.x + focus_child->allocation.width -
-                                     tree_view->priv->hadjustment->page_size);
-         else if (tree_view->priv->hadjustment->value > focus_child->allocation.x)
-           gtk_adjustment_set_value (tree_view->priv->hadjustment,
-                                     focus_child->allocation.x);
-       }
-    }
-  else
-    {
-      gtk_container_set_focus_child (container, NULL);
-    }
+  /* Drag column */
+  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG))
+    return gtk_tree_view_motion_drag_column (widget, event);
 
-  return (focus_child != NULL);
+  /* Sanity check it */
+  if (event->window == tree_view->priv->bin_window)
+    return gtk_tree_view_motion_bin_window (widget, event);
+
+  return FALSE;
 }
 
-/* WARNING: Scary function */
-static gint
-gtk_tree_view_focus (GtkContainer     *container,
-                    GtkDirectionType  direction)
+/* Draws the focus rectangle around the cursor row */
+static void
+gtk_tree_view_draw_focus (GtkWidget *widget)
 {
   GtkTreeView *tree_view;
-  GtkWidget *focus_child;
-  GdkEvent *event;
-  GtkRBTree *cursor_tree;
-  GtkRBNode *cursor_node;
+  GtkTreePath *cursor_path;
+  GtkRBTree *tree = NULL;
+  GtkRBNode *node = NULL;
+  gint x, y;
+  gint width, height;
+  gint vertical_separator;
 
-  g_return_val_if_fail (container != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (container), FALSE);
-  g_return_val_if_fail (GTK_WIDGET_VISIBLE (container), FALSE);
+  g_return_if_fail (GTK_IS_TREE_VIEW (widget));
 
-  tree_view = GTK_TREE_VIEW (container);
+  tree_view = GTK_TREE_VIEW (widget);
 
-  if (!GTK_WIDGET_IS_SENSITIVE (container))
-    return FALSE;
-  if (tree_view->priv->tree == NULL)
-    return FALSE;
+  gtk_widget_style_get (widget, "vertical_separator", &vertical_separator, NULL);
 
-  focus_child = container->focus_child;
+  if (! GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS))
+    return;
 
-  /* Case 1.  Headers have focus. */
-  if (focus_child)
-    {
-      switch (direction)
-       {
-       case GTK_DIR_LEFT:
-       case GTK_DIR_TAB_BACKWARD:
-         return (gtk_tree_view_header_focus (tree_view, direction));
-       case GTK_DIR_UP:
-         gtk_container_set_focus_child (container, NULL);
-         return FALSE;
-       case GTK_DIR_TAB_FORWARD:
-       case GTK_DIR_RIGHT:
-       case GTK_DIR_DOWN:
-         if (direction == GTK_DIR_DOWN)
-           {
-             gtk_container_set_focus_child (container, NULL);
-           }
-         else
-           {
-             if (gtk_tree_view_header_focus (tree_view, direction))
-               return TRUE;
-           }
-         GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
-         gtk_widget_grab_focus (GTK_WIDGET (container));
+  if (tree_view->priv->cursor == NULL)
+    return;
 
-         if (tree_view->priv->selection == NULL)
-           gtk_tree_selection_new_with_tree_view (tree_view);
+  cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+  if (cursor_path == NULL)
+    return;
 
-         /* if there is no keyboard focus yet, we select the first node
-          */
-         if (tree_view->priv->cursor == NULL)
-           tree_view->priv->cursor = gtk_tree_path_new_root ();
-         if (tree_view->priv->cursor)
-           gtk_tree_selection_select_path (tree_view->priv->selection,
-                                           tree_view->priv->cursor);
-         gtk_widget_queue_draw (GTK_WIDGET (tree_view));
-         return TRUE;
-       }
+  _gtk_tree_view_find_node (tree_view, cursor_path, &tree, &node);
+
+  if (tree == NULL)
+    {
+      gtk_tree_path_free (cursor_path);
+      return;
     }
 
-  /* Case 2. We don't have focus at all. */
-  if (!GTK_WIDGET_HAS_FOCUS (container))
+  gdk_drawable_get_size (tree_view->priv->bin_window,
+                         &width, NULL);
+
+
+  x = 0;
+  y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
+  gdk_drawable_get_size (tree_view->priv->bin_window,
+                        &width, NULL);
+  width = width - 1;
+  height = BACKGROUND_HEIGHT (node) - 1;
+  if (tree_view->priv->focus_column != NULL)
     {
-      if ((direction == GTK_DIR_TAB_FORWARD) ||
-         (direction == GTK_DIR_RIGHT) ||
-         (direction == GTK_DIR_DOWN))
+      gboolean visible;
+      gboolean can_focus;
+
+      g_object_get (G_OBJECT (tree_view->priv->focus_column->cell),
+                   "can_activate", &can_focus,
+                   "visible", &visible,
+                   NULL);
+      if (can_focus && visible)
        {
-         if (gtk_tree_view_header_focus (tree_view, direction))
-           return TRUE;
+         GtkTreeIter iter;
+         GdkRectangle cell_area;
+         gint x_offset;
+         gint y_offset;
+
+         cell_area.x = tree_view->priv->focus_column->button->allocation.x;
+         cell_area.y = y;
+         cell_area.width = tree_view->priv->focus_column->displayed_width;
+         cell_area.height = CELL_HEIGHT (node, vertical_separator);
+
+         gtk_tree_model_get_iter (tree_view->priv->model, &iter, cursor_path);
+         gtk_tree_view_column_cell_set_cell_data (tree_view->priv->focus_column, tree_view->priv->model, &iter);
+
+         gtk_cell_renderer_get_size (tree_view->priv->focus_column->cell, GTK_WIDGET (tree_view), &cell_area, &x_offset, &y_offset, &width, &height);
+         width += 2;
+         height += 2;
+         x = cell_area.x + x_offset - 1;
+         y = cell_area.y + y_offset - 1 + vertical_separator/2;
        }
+    }
 
-      /* The headers didn't want the focus, so we take it. */
-      GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
-      gtk_widget_grab_focus (GTK_WIDGET (container));
-
-      if (tree_view->priv->selection == NULL)
-       gtk_tree_selection_new_with_tree_view (tree_view);
+  gtk_paint_focus (widget->style,
+                  tree_view->priv->bin_window,
+                  NULL,
+                  widget,
+                  "add-mode",
+                  x, y, width, height);
 
-      if (tree_view->priv->cursor == NULL)
-       tree_view->priv->cursor = gtk_tree_path_new_root ();
+  gtk_tree_path_free (cursor_path);
+}
 
-      if (tree_view->priv->cursor)
-       gtk_tree_selection_select_path (tree_view->priv->selection,
-                                       tree_view->priv->cursor);
-      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
-      return TRUE;
-    }
+/* Warning: Very scary function.
+ * Modify at your own risk
+ */
+static gboolean
+gtk_tree_view_bin_expose (GtkWidget      *widget,
+                         GdkEventExpose *event)
+{
+  GtkTreeView *tree_view;
+  GtkTreePath *path;
+  GtkRBTree *tree;
+  GList *list;
+  GtkRBNode *node;
+  GtkRBNode *cursor = NULL;
+  GtkRBTree *cursor_tree = NULL;
+  GtkRBNode *drag_highlight = NULL;
+  GtkRBTree *drag_highlight_tree = NULL;
+  GtkTreeIter iter;
+  gint new_y;
+  gint y_offset, x_offset, cell_offset;
+  gint i, max_height;
+  gint depth;
+  GdkRectangle background_area;
+  GdkRectangle cell_area;
+  guint flags;
+  gint highlight_x;
+  gint bin_window_width;
+  GtkTreePath *cursor_path;
+  GtkTreePath *drag_dest_path;
+  GList *last_column;
+  gint vertical_separator;
 
-  /* Case 3. We have focus already, but no cursor.  We pick the first one
-   * and run with it. */
-  if (tree_view->priv->cursor == NULL)
-    {
-      /* We lost our cursor somehow.  Arbitrarily select the first node, and
-       * return
-       */
-      tree_view->priv->cursor = gtk_tree_path_new_root ();
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
 
-      if (tree_view->priv->cursor)
-       gtk_tree_selection_select_path (tree_view->priv->selection,
-                                       tree_view->priv->cursor);
-      gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment),
-                               0.0);
-      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
-      return TRUE;
-    }
+  tree_view = GTK_TREE_VIEW (widget);
+  gtk_widget_style_get (widget, "vertical_separator", &vertical_separator, NULL);
 
+  if (tree_view->priv->tree == NULL)
+    return TRUE;
 
-  /* Case 3. We have focus already.  Move the cursor. */
-  if (direction == GTK_DIR_LEFT)
-    {
-      gfloat val;
-      val = tree_view->priv->hadjustment->value - tree_view->priv->hadjustment->page_size/2;
-      val = MAX (val, 0.0);
-      gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->hadjustment), val);
-      gtk_widget_grab_focus (GTK_WIDGET (tree_view));
-      return TRUE;
-    }
-  if (direction == GTK_DIR_RIGHT)
-    {
-      gfloat val;
-      val = tree_view->priv->hadjustment->value + tree_view->priv->hadjustment->page_size/2;
-      val = MIN (tree_view->priv->hadjustment->upper - tree_view->priv->hadjustment->page_size, val);
-      gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->hadjustment), val);
-      gtk_widget_grab_focus (GTK_WIDGET (tree_view));
-      return TRUE;
-    }
-  cursor_tree = NULL;
-  cursor_node = NULL;
+  gtk_tree_view_check_dirty (GTK_TREE_VIEW (widget));
+  /* we want to account for a potential HEADER offset.
+   * That is, if the header exists, we want to offset our event by its
+   * height to find the right node.
+   */
+  new_y = (event->area.y<TREE_VIEW_HEADER_HEIGHT (tree_view))?TREE_VIEW_HEADER_HEIGHT (tree_view):event->area.y;
 
-  _gtk_tree_view_find_node (tree_view, tree_view->priv->cursor,
-                           &cursor_tree,
-                           &cursor_node);
-  switch (direction)
-    {
-    case GTK_DIR_TAB_BACKWARD:
-    case GTK_DIR_UP:
-      _gtk_rbtree_prev_full (cursor_tree,
-                            cursor_node,
-                            &cursor_tree,
-                            &cursor_node);
-      break;
-    case GTK_DIR_TAB_FORWARD:
-    case GTK_DIR_DOWN:
-      _gtk_rbtree_next_full (cursor_tree,
-                            cursor_node,
-                            &cursor_tree,
-                            &cursor_node);
-      break;
-    default:
-      break;
-    }
+  /* y_offset is the */
 
-  if (cursor_node)
-    {
-      GdkModifierType state = 0;
+  y_offset = -_gtk_rbtree_find_offset (tree_view->priv->tree,
+                                       TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, new_y),
+                                      &tree,
+                                      &node) + new_y - event->area.y;
+  if (node == NULL)
+    return TRUE;
 
-      event = gdk_event_peek ();
-      if (event && event->type == GDK_KEY_PRESS)
-       /* FIXME: This doesn't seem to work. )-:
-        * I fear the event may already have been gotten */
-       state = ((GdkEventKey *)event)->state;
+  /* find the path for the node */
+  path = _gtk_tree_view_find_path ((GtkTreeView *)widget,
+                                  tree,
+                                  node);
+  gtk_tree_model_get_iter (tree_view->priv->model,
+                          &iter,
+                          path);
+  depth = gtk_tree_path_get_depth (path);
+  gtk_tree_path_free (path);
 
-      if (event)
-       gdk_event_free (event);
-      gtk_tree_path_free (tree_view->priv->cursor);
+  cursor_path = NULL;
+  drag_dest_path = NULL;
 
-      tree_view->priv->cursor = _gtk_tree_view_find_path (tree_view,
-                                                         cursor_tree,
-                                                         cursor_node);
-      if (tree_view->priv->cursor)
-       _gtk_tree_selection_internal_select_node (tree_view->priv->selection,
-                                                 cursor_node,
-                                                 cursor_tree,
-                                                 tree_view->priv->cursor,
-                                                 state);
-      gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node);
-      gtk_widget_grab_focus (GTK_WIDGET (tree_view));
-      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
-      return TRUE;
-    }
+  if (tree_view->priv->cursor)
+    cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
 
-  /* At this point, we've progressed beyond the edge of the rows. */
+  if (cursor_path)
+    _gtk_tree_view_find_node (tree_view, cursor_path,
+                              &cursor_tree, &cursor);
 
-  if ((direction == GTK_DIR_LEFT) ||
-      (direction == GTK_DIR_TAB_BACKWARD) ||
-      (direction == GTK_DIR_UP))
-    /* We can't go back anymore.  Try the headers */
-    return (gtk_tree_view_header_focus (tree_view, direction));
+  if (tree_view->priv->drag_dest_row)
+    drag_dest_path = gtk_tree_row_reference_get_path (tree_view->priv->drag_dest_row);
 
-  /* we've reached the end of the tree.  Go on. */
-  return FALSE;
-}
+  if (drag_dest_path)
+    _gtk_tree_view_find_node (tree_view, drag_dest_path,
+                              &drag_highlight_tree, &drag_highlight);
 
-/* Container method
- */
-static void
-gtk_tree_view_remove (GtkContainer *container,
-                     GtkWidget    *widget)
-{
-  GtkTreeView *tree_view;
-  GtkTreeViewChild *child = NULL;
-  GList *tmp_list;
+  gdk_drawable_get_size (tree_view->priv->bin_window,
+                         &bin_window_width, NULL);
 
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_TREE_VIEW (container));
+  for (last_column = g_list_last (tree_view->priv->columns);
+       last_column &&
+        !(GTK_TREE_VIEW_COLUMN (last_column->data)->visible) &&
+        GTK_WIDGET_CAN_FOCUS (GTK_TREE_VIEW_COLUMN (last_column->data)->button);
+       last_column = last_column->prev)
+    ;
 
-  tree_view = GTK_TREE_VIEW (container);
+  /* Actually process the expose event.  To do this, we want to
+   * start at the first node of the event, and walk the tree in
+   * order, drawing each successive node.
+   */
 
-  tmp_list = tree_view->priv->children;
-  while (tmp_list)
+  do
     {
-      child = tmp_list->data;
-      if (child->widget == widget)
-       break;
-      tmp_list = tmp_list->next;
-    }
+      gboolean parity;
 
-  if (tmp_list)
-    {
-      gtk_widget_unparent (widget);
+      max_height = BACKGROUND_HEIGHT (node);
 
-      tree_view->priv->children = g_list_remove_link (tree_view->priv->children, tmp_list);
-      g_list_free_1 (tmp_list);
-      g_free (child);
-    }
-}
+      x_offset = -event->area.x;
+      cell_offset = 0;
+      highlight_x = 0; /* should match x coord of first cell */
 
-static void
-gtk_tree_view_forall (GtkContainer *container,
-                     gboolean      include_internals,
-                     GtkCallback   callback,
-                     gpointer      callback_data)
-{
-  GtkTreeView *tree_view;
-  GtkTreeViewChild *child = NULL;
-  GtkTreeViewColumn *column;
-  GList *tmp_list;
+      background_area.y = y_offset + event->area.y;
+      background_area.height = max_height;
+      flags = 0;
 
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_TREE_VIEW (container));
-  g_return_if_fail (callback != NULL);
+      if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PRELIT))
+       flags |= GTK_CELL_RENDERER_PRELIT;
 
-  tree_view = GTK_TREE_VIEW (container);
+      if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
+        flags |= GTK_CELL_RENDERER_SELECTED;
 
-  tmp_list = tree_view->priv->children;
-  while (tmp_list)
-    {
-      child = tmp_list->data;
-      tmp_list = tmp_list->next;
+      parity = _gtk_rbtree_node_find_parity (tree, node);
 
-      (* callback) (child->widget, callback_data);
-    }
-  if (include_internals == FALSE)
-    return;
+      for (i = 0, list = tree_view->priv->columns; i < tree_view->priv->n_columns; i++, list = list->next)
+       {
+         GtkTreeViewColumn *column = list->data;
+         const gchar *detail = NULL;
 
-  for (tmp_list = tree_view->priv->column; tmp_list; tmp_list = tmp_list->next)
-    {
-      column = tmp_list->data;
-      if (column->button)
-       (* callback) (column->button, callback_data);
-    }
-}
+         if (!column->visible)
+            continue;
 
-/* TreeModel Methods
- */
+         if (cell_offset > event->area.x + event->area.width ||
+             cell_offset + column->displayed_width < event->area.x)
+           {
+             cell_offset += column->displayed_width;
+             continue;
+           }
 
-static void
-gtk_tree_view_changed (GtkTreeModel *model,
-                      GtkTreePath  *path,
-                      GtkTreeIter  *iter,
-                      gpointer      data)
-{
-  GtkTreeView *tree_view = (GtkTreeView *)data;
-  GtkRBTree *tree;
-  GtkRBNode *node;
-  gint height;
-  gboolean dirty_marked;
+          if (column->show_sort_indicator)
+            flags |= GTK_CELL_RENDERER_SORTED;
+          else
+            flags &= ~GTK_CELL_RENDERER_SORTED;
 
-  g_return_if_fail (path != NULL || iter != NULL);
+         gtk_tree_view_column_cell_set_cell_data (column,
+                                                  tree_view->priv->model,
+                                                  &iter);
 
-  if (path == NULL)
-    path = gtk_tree_model_get_path (model, iter);
-  else if (iter == NULL)
-    gtk_tree_model_get_iter (model, iter, path);
-
-  if (_gtk_tree_view_find_node (tree_view,
-                               path,
-                               &tree,
-                               &node))
-    /* We aren't actually showing the node */
-    return;
+         background_area.x = cell_offset;
+         background_area.width = column->displayed_width;
+
+          cell_area = background_area;
+          cell_area.y += vertical_separator / 2;
+          cell_area.height -= vertical_separator;
+
+          /* Select the detail for drawing the cell.  relevant
+           * factors are parity, sortedness, and whether to
+           * display rules.
+           */
+
+          /* FIXME when we have style properties, clean this up.
+           */
+
+          if (tree_view->priv->has_rules)
+            {
+              if (flags & GTK_CELL_RENDERER_SORTED)
+                {
+                  if (parity)
+                    detail = "cell_odd_ruled_sorted";
+                  else
+                    detail = "cell_even_ruled_sorted";
+                }
+              else
+                {
+                  if (parity)
+                    detail = "cell_odd_ruled";
+                  else
+                    detail = "cell_even_ruled";
+                }
+            }
+          else
+            {
+              if (flags & GTK_CELL_RENDERER_SORTED)
+                {
+                  if (parity)
+                    detail = "cell_odd_sorted";
+                  else
+                    detail = "cell_even_sorted";
+                }
+              else
+                {
+                  if (parity)
+                    detail = "cell_odd";
+                  else
+                    detail = "cell_even";
+                }
+            }
+
+          g_assert (detail);
+
+          /* Draw background */
+          gtk_paint_flat_box (widget->style,
+                              event->window,
+                              (flags & GTK_CELL_RENDERER_SELECTED) ?
+                              GTK_STATE_SELECTED : GTK_STATE_NORMAL,
+                              GTK_SHADOW_NONE,
+                              &event->area,
+                              widget,
+                              detail,
+                              background_area.x,
+                              background_area.y,
+                              background_area.width,
+                              background_area.height);
+
+         if (i == tree_view->priv->expander_column &&
+              TREE_VIEW_DRAW_EXPANDERS(tree_view))
+           {
+             cell_area.x += depth*tree_view->priv->tab_offset;
+             cell_area.width -= depth*tree_view->priv->tab_offset;
 
-  dirty_marked = gtk_tree_view_discover_dirty_iter (tree_view,
-                                                   iter,
-                                                   gtk_tree_path_get_depth (path),
-                                                   &height);
+              /* If we have an expander column, the highlight underline
+               * starts with that column, so that it indicates which
+               * level of the tree we're dropping at.
+               */
+              highlight_x = cell_area.x;
+
+             gtk_tree_view_column_cell_render (column,
+                                               event->window,
+                                               &background_area,
+                                               &cell_area,
+                                               &event->area,
+                                               flags);
+             if ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT)
+               {
+                 gint x, y;
+                 gdk_window_get_pointer (tree_view->priv->bin_window, &x, &y, 0);
+                 gtk_tree_view_draw_arrow (GTK_TREE_VIEW (widget),
+                                            tree,
+                                           node,
+                                           x, y);
+               }
+           }
+         else
+           {
+             gtk_tree_view_column_cell_render (column,
+                                               event->window,
+                                               &background_area,
+                                               &cell_area,
+                                               &event->area,
+                                               flags);
+           }
+         cell_offset += column->displayed_width;
+       }
 
-  if (GTK_RBNODE_GET_HEIGHT (node) != height + TREE_VIEW_VERTICAL_SEPERATOR)
-    {
-      _gtk_rbtree_node_set_height (tree, node, height + TREE_VIEW_VERTICAL_SEPERATOR);
-      gtk_widget_queue_resize (GTK_WIDGET (data));
-      return;
-    }
-  if (dirty_marked)
-    gtk_widget_queue_resize (GTK_WIDGET (data));
-  else
-    {
-      /* FIXME: just redraw the node */
-      gtk_widget_queue_draw (GTK_WIDGET (data));
-    }
-}
+      if (node == cursor && GTK_WIDGET_HAS_FOCUS (widget))
+       gtk_tree_view_draw_focus (widget);
 
-static void
-gtk_tree_view_inserted (GtkTreeModel *model,
-                       GtkTreePath  *path,
-                       GtkTreeIter  *iter,
-                       gpointer      data)
-{
-  GtkTreeView *tree_view = (GtkTreeView *) data;
-  gint *indices;
-  GtkRBTree *tmptree, *tree;
-  GtkRBNode *tmpnode = NULL;
-  gint max_height;
-  gint depth;
-  gint i = 0;
+      if (node == drag_highlight)
+        {
+          /* Draw indicator for the drop
+           */
+          gint highlight_y = -1;
+         GtkRBTree *tree = NULL;
+         GtkRBNode *node = NULL;
+         gint width;
+
+          switch (tree_view->priv->drag_dest_pos)
+            {
+            case GTK_TREE_VIEW_DROP_BEFORE:
+              highlight_y = background_area.y - vertical_separator/2;
+              break;
+
+            case GTK_TREE_VIEW_DROP_AFTER:
+              highlight_y = background_area.y + background_area.height + vertical_separator/2;
+              break;
+
+            case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
+            case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
+             _gtk_tree_view_find_node (tree_view, drag_dest_path, &tree, &node);
+
+             if (tree == NULL)
+               break;
+             gdk_drawable_get_size (tree_view->priv->bin_window,
+                                    &width, NULL);
+             gtk_paint_focus (widget->style,
+                              tree_view->priv->bin_window,
+                              NULL,
+                              widget,
+                              "add-mode",
+                              0, BACKGROUND_FIRST_PIXEL (tree_view, tree, node),
+                              width - 1, BACKGROUND_HEIGHT (node) - 1);
+
+              break;
+            }
+
+          if (highlight_y >= 0)
+            {
+              gdk_draw_line (event->window,
+                             widget->style->black_gc,
+                             highlight_x,
+                             highlight_y,
+                             bin_window_width - highlight_x,
+                             highlight_y);
+            }
+        }
 
-  tmptree = tree = tree_view->priv->tree;
-  g_return_if_fail (path != NULL || iter != NULL);
+      y_offset += max_height;
+      if (node->children)
+       {
+         GtkTreeIter parent = iter;
+         gboolean has_child;
 
-  if (path == NULL)
-    path = gtk_tree_model_get_path (model, iter);
-  else if (iter == NULL)
-    gtk_tree_model_get_iter (model, iter, path);
+         tree = node->children;
+         node = tree->root;
 
-  depth = gtk_tree_path_get_depth (path);
-  indices = gtk_tree_path_get_indices (path);
+          g_assert (node != tree->nil);
 
-  /* First, find the parent tree */
-  while (i < depth - 1)
-    {
-      if (tmptree == NULL)
-       {
-         /* We aren't showing the node */
-         return;
-       }
+         while (node->left != tree->nil)
+           node = node->left;
+         has_child = gtk_tree_model_iter_children (tree_view->priv->model,
+                                                   &iter,
+                                                   &parent);
+         depth++;
 
-      tmpnode = _gtk_rbtree_find_count (tmptree, indices[i] + 1);
-      if (tmpnode == NULL)
-       {
-         g_warning ("A node was inserted with a parent that's not in the tree.\n" \
-                    "This possibly means that a GtkTreeModel inserted a child node\n" \
-                    "before the parent was inserted.");
-         return;
+         /* Sanity Check! */
+         TREE_VIEW_INTERNAL_ASSERT (has_child, FALSE);
        }
-      else if (!GTK_RBNODE_FLAG_SET (tmpnode, GTK_RBNODE_IS_PARENT))
+      else
        {
-         /* In theory, the model should have emitted child_toggled here.  We
-          * try to catch it anyway, just to be safe, in case the model hasn't.
-          */
-         GtkTreePath *tmppath = _gtk_tree_view_find_path (tree_view,
-                                                          tree,
-                                                          tmpnode);
-         gtk_tree_view_child_toggled (model, tmppath, NULL, data);
-         gtk_tree_path_free (tmppath);
-         return;
-       }
-
-      tmptree = tmpnode->children;
-      tree = tmptree;
-      i++;
-    }
+         gboolean done = FALSE;
+         do
+           {
+             node = _gtk_rbtree_next (tree, node);
+             if (node != NULL)
+               {
+                 gboolean has_next = gtk_tree_model_iter_next (tree_view->priv->model, &iter);
+                 done = TRUE;
 
-  if (tree == NULL)
-    return;
+                 /* Sanity Check! */
+                 TREE_VIEW_INTERNAL_ASSERT (has_next, FALSE);
+               }
+             else
+               {
+                 GtkTreeIter parent_iter = iter;
+                 gboolean has_parent;
 
-  /* next, update the selection */
-  if (tree_view->priv->anchor)
-    {
-      gint *select_indices = gtk_tree_path_get_indices (tree_view->priv->anchor);
-      gint select_depth = gtk_tree_path_get_depth (tree_view->priv->anchor);
+                 node = tree->parent_node;
+                 tree = tree->parent_tree;
+                 if (tree == NULL)
+                   /* we've run out of tree.  It's okay to return though, as
+                    * we'd only break out of the while loop below. */
+                   return TRUE;
+                 has_parent = gtk_tree_model_iter_parent (tree_view->priv->model,
+                                                          &iter,
+                                                          &parent_iter);
+                 depth--;
 
-      for (i = 0; i < depth && i < select_depth; i++)
-       {
-         if (indices[i] < select_indices[i])
-           {
-             select_indices[i]++;
-             break;
-           }
-         else if (indices[i] > select_indices[i])
-           break;
-         else if (i == depth - 1)
-           {
-             select_indices[i]++;
-             break;
+                 /* Sanity check */
+                 TREE_VIEW_INTERNAL_ASSERT (has_parent, FALSE);
+               }
            }
+         while (!done);
        }
     }
+  while (y_offset < event->area.height);
 
-  /* ref the node */
-  gtk_tree_model_ref_iter (tree_view->priv->model, iter);
-  max_height = gtk_tree_view_insert_iter_height (tree_view,
-                                                tree,
-                                                iter,
-                                                depth);
-  if (indices[depth - 1] == 0)
-    {
-      tmpnode = _gtk_rbtree_find_count (tree, 1);
-      _gtk_rbtree_insert_before (tree, tmpnode, max_height);
-    }
-  else
-    {
-      tmpnode = _gtk_rbtree_find_count (tree, indices[depth - 1]);
-      _gtk_rbtree_insert_after (tree, tmpnode, max_height);
-    }
+  if (cursor_path)
+    gtk_tree_path_free (cursor_path);
 
-  _gtk_tree_view_set_size (tree_view, -1, tree_view->priv->height + max_height);
+  if (drag_dest_path)
+    gtk_tree_path_free (drag_dest_path);
+
+  return TRUE;
 }
 
-static void
-gtk_tree_view_child_toggled (GtkTreeModel *model,
-                            GtkTreePath  *path,
-                            GtkTreeIter  *iter,
-                            gpointer      data)
+static gboolean
+gtk_tree_view_expose (GtkWidget      *widget,
+                     GdkEventExpose *event)
 {
-  GtkTreeView *tree_view = (GtkTreeView *)data;
-  GtkTreeIter real_iter;
-  gboolean has_child;
-  GtkRBTree *tree;
-  GtkRBNode *node;
-
-  g_return_if_fail (path != NULL || iter != NULL);
+  GtkTreeView *tree_view;
 
-  if (iter)
-    real_iter = *iter;
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
 
-  if (path == NULL)
-    path = gtk_tree_model_get_path (model, iter);
-  else if (iter == NULL)
-    gtk_tree_model_get_iter (model, &real_iter, path);
+  tree_view = GTK_TREE_VIEW (widget);
 
-  if (_gtk_tree_view_find_node (tree_view,
-                               path,
-                               &tree,
-                               &node))
-    /* We aren't actually showing the node */
-    return;
+  if (event->window == tree_view->priv->bin_window)
+    return gtk_tree_view_bin_expose (widget, event);
 
-  has_child = gtk_tree_model_iter_has_child (model, &real_iter);
-  /* Sanity check.
-   */
-  if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT) == has_child)
-    return;
+  return TRUE;
+}
 
-  if (has_child)
-    GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PARENT);
-  else
-    GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_IS_PARENT);
+static gboolean
+gtk_tree_view_key_press (GtkWidget   *widget,
+                        GdkEventKey *event)
+{
+  GtkTreeView *tree_view = (GtkTreeView *) widget;
 
-  if (has_child && GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IS_LIST))
+  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG))
     {
-      GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IS_LIST);
-      if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS))
+      if (event->keyval == GDK_Escape)
        {
-         GList *list;
-         for (list = tree_view->priv->column; list; list = list->next)
-           if (GTK_TREE_VIEW_COLUMN (list->data)->visible)
-             {
-               GTK_TREE_VIEW_COLUMN (list->data)->dirty = TRUE;
-               break;
-             }
+         tree_view->priv->cur_reorder = NULL;
+         gtk_tree_view_button_release_drag_column (widget, NULL);
        }
-      gtk_widget_queue_resize (GTK_WIDGET (tree_view));
-    }
-  else
-    {
-      /* FIXME: Just redraw the node */
-      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+      return TRUE;
     }
+  return (* GTK_WIDGET_CLASS (parent_class)->key_press_event) (widget, event);
 }
 
-static void
-gtk_tree_view_deleted (GtkTreeModel *model,
-                      GtkTreePath  *path,
-                      gpointer      data)
+/* FIXME Is this function necessary? Can I get an enter_notify event
+ * w/o either an expose event or a mouse motion event?
+ */
+static gboolean
+gtk_tree_view_enter_notify (GtkWidget        *widget,
+                           GdkEventCrossing *event)
 {
-  GtkTreeView *tree_view = (GtkTreeView *)data;
+  GtkTreeView *tree_view;
   GtkRBTree *tree;
   GtkRBNode *node;
-  GList *list;
+  gint new_y;
 
-  g_return_if_fail (path != NULL);
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
 
-  if (_gtk_tree_view_find_node (tree_view, path, &tree, &node))
-    return;
+  tree_view = GTK_TREE_VIEW (widget);
 
-  /* next, update the selection */
-  if (tree_view->priv->anchor)
-    {
-      gint i;
-      gint depth = gtk_tree_path_get_depth (path);
-      gint *indices = gtk_tree_path_get_indices (path);
-      gint select_depth = gtk_tree_path_get_depth (tree_view->priv->anchor);
-      gint *select_indices = gtk_tree_path_get_indices (tree_view->priv->anchor);
+  /* Sanity check it */
+  if (event->window != tree_view->priv->bin_window)
+    return FALSE;
 
-      if (gtk_tree_path_compare (path, tree_view->priv->anchor) == 0)
-       {
-         if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED) &&
-             tree_view->priv->selection)
-           gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->selection),
-                                    "selection_changed");
-       }
-      else
-       {
-         for (i = 0; i < depth && i < select_depth; i++)
-           {
-             if (indices[i] < select_indices[i])
-               {
-                 select_indices[i] = MAX (select_indices[i], 0);
-                 break;
-               }
-             else if (indices[i] > select_indices[i])
-               break;
-             else if (i == depth - 1)
-               {
-                 select_indices[i] = MAX (select_indices[i], 0);
-                 break;
-               }
-           }
-       }
-    }
+  if (tree_view->priv->tree == NULL)
+    return FALSE;
 
-  for (list = tree_view->priv->column; list; list = list->next)
-    if (((GtkTreeViewColumn *)list->data)->visible &&
-       ((GtkTreeViewColumn *)list->data)->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
-      ((GtkTreeViewColumn *)list->data)->dirty = TRUE;
+  if ((tree_view->priv->button_pressed_node != NULL) &&
+      (tree_view->priv->button_pressed_node != node))
+    return TRUE;
 
-  if (tree->root->count == 1)
-    _gtk_rbtree_remove (tree);
-  else
-    _gtk_rbtree_remove_node (tree, node);
+  /* find the node internally */
+  new_y = ((gint)event->y<TREE_VIEW_HEADER_HEIGHT (tree_view))?TREE_VIEW_HEADER_HEIGHT (tree_view):(gint)event->y;
+
+  _gtk_rbtree_find_offset (tree_view->priv->tree,
+                           TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, new_y),
+                           &tree,
+                           &node);
+
+  if (node == NULL)
+    return FALSE;
+
+  do_prelight (tree_view, tree, node, event->x, new_y);
+
+  if (tree_view->priv->prelight_node)
+    gtk_tree_view_queue_draw_node (tree_view,
+                                   tree_view->priv->prelight_tree,
+                                   tree_view->priv->prelight_node,
+                                   NULL);
+
+  return TRUE;
+}
+
+static gboolean
+gtk_tree_view_leave_notify (GtkWidget        *widget,
+                           GdkEventCrossing *event)
+{
+  GtkTreeView *tree_view;
+
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
+
+  tree_view = GTK_TREE_VIEW (widget);
+
+  if (tree_view->priv->prelight_node)
+    gtk_tree_view_queue_draw_node (tree_view,
+                                   tree_view->priv->prelight_tree,
+                                   tree_view->priv->prelight_node,
+                                   NULL);
 
-  _gtk_tree_view_set_size (GTK_TREE_VIEW (data), -1, -1);
-  gtk_widget_queue_resize (data);
+  ensure_unprelighted (tree_view);
+
+  return TRUE;
 }
 
-/* Internal tree functions */
+
 static gint
-gtk_tree_view_insert_iter_height (GtkTreeView *tree_view,
-                                 GtkRBTree   *tree,
-                                 GtkTreeIter *iter,
-                                 gint         depth)
+gtk_tree_view_focus_in (GtkWidget     *widget,
+                       GdkEventFocus *event)
 {
-  GtkTreeViewColumn *column;
-  GtkCellRenderer *cell;
-  gboolean first = TRUE;
-  GList *list;
-  gint max_height = 0;
+  GtkTreeView *tree_view;
 
-  /* do stuff with node */
-  for (list = tree_view->priv->column; list; list = list->next)
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  tree_view = GTK_TREE_VIEW (widget);
+
+  GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
+
+  gtk_widget_queue_draw (widget);
+
+  return FALSE;
+}
+
+
+static gint
+gtk_tree_view_focus_out (GtkWidget     *widget,
+                        GdkEventFocus *event)
+{
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
+
+  gtk_widget_queue_draw (widget);
+  GTK_TREE_VIEW (widget)->priv->in_extended_selection = FALSE;
+  GTK_TREE_VIEW (widget)->priv->in_free_motion = FALSE;
+  return FALSE;
+}
+
+
+/* Drag-and-drop */
+
+static void
+set_source_row (GdkDragContext *context,
+                GtkTreeModel   *model,
+                GtkTreePath    *source_row)
+{
+  g_object_set_data_full (G_OBJECT (context),
+                          "gtk-tree-view-source-row",
+                          source_row ? gtk_tree_row_reference_new (model, source_row) : NULL,
+                          (GDestroyNotify) (source_row ? gtk_tree_row_reference_free : NULL));
+}
+
+static GtkTreePath*
+get_source_row (GdkDragContext *context)
+{
+  GtkTreeRowReference *ref =
+    g_object_get_data (G_OBJECT (context), "gtk-tree-view-source-row");
+
+  if (ref)
+    return gtk_tree_row_reference_get_path (ref);
+  else
+    return NULL;
+}
+
+
+static void
+set_dest_row (GdkDragContext *context,
+              GtkTreeModel   *model,
+              GtkTreePath    *dest_row)
+{
+  g_object_set_data_full (G_OBJECT (context),
+                          "gtk-tree-view-dest-row",
+                          dest_row ? gtk_tree_row_reference_new (model, dest_row) : NULL,
+                          (GDestroyNotify) (dest_row ? gtk_tree_row_reference_free : NULL));
+}
+
+static GtkTreePath*
+get_dest_row (GdkDragContext *context)
+{
+  GtkTreeRowReference *ref =
+    g_object_get_data (G_OBJECT (context), "gtk-tree-view-dest-row");
+
+  if (ref)
+    return gtk_tree_row_reference_get_path (ref);
+  else
+    return NULL;
+}
+
+/* Get/set whether drag_motion requested the drag data and
+ * drag_data_received should thus not actually insert the data,
+ * since the data doesn't result from a drop.
+ */
+static void
+set_status_pending (GdkDragContext *context,
+                    GdkDragAction   suggested_action)
+{
+  g_object_set_data (G_OBJECT (context),
+                     "gtk-tree-view-status-pending",
+                     GINT_TO_POINTER (suggested_action));
+}
+
+static GdkDragAction
+get_status_pending (GdkDragContext *context)
+{
+  return GPOINTER_TO_INT (g_object_get_data (G_OBJECT (context),
+                                             "gtk-tree-view-status-pending"));
+}
+
+static TreeViewDragInfo*
+get_info (GtkTreeView *tree_view)
+{
+  return g_object_get_data (G_OBJECT (tree_view), "gtk-tree-view-drag-info");
+}
+
+static void
+clear_source_info (TreeViewDragInfo *di)
+{
+  if (di->source_target_list)
+    gtk_target_list_unref (di->source_target_list);
+
+  if (di->row_draggable_closure)
+    g_closure_unref (di->row_draggable_closure);
+
+  di->source_target_list = NULL;
+  di->row_draggable_closure = NULL;
+}
+
+static void
+clear_dest_info (TreeViewDragInfo *di)
+{
+  if (di->location_droppable_closure)
+    g_closure_unref (di->location_droppable_closure);
+
+  if (di->dest_target_list)
+    gtk_target_list_unref (di->dest_target_list);
+
+  di->location_droppable_closure = NULL;
+  di->dest_target_list = NULL;
+}
+
+static void
+destroy_info (TreeViewDragInfo *di)
+{
+  clear_source_info (di);
+  clear_dest_info (di);
+  g_free (di);
+}
+
+static TreeViewDragInfo*
+ensure_info (GtkTreeView *tree_view)
+{
+  TreeViewDragInfo *di;
+
+  di = get_info (tree_view);
+
+  if (di == NULL)
     {
-      gint height = 0, width = 0;
-      column = list->data;
+      di = g_new0 (TreeViewDragInfo, 1);
 
-      if (!column->visible)
-       continue;
-      if (column->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
-       {
-         first = FALSE;;
-         continue;
-       }
+      g_object_set_data_full (G_OBJECT (tree_view),
+                              "gtk-tree-view-drag-info",
+                              di,
+                              (GDestroyNotify) destroy_info);
+    }
 
-      cell = column->cell;
-      gtk_tree_view_column_set_cell_data (column, tree_view->priv->model, iter);
+  return di;
+}
+
+static void
+remove_info (GtkTreeView *tree_view)
+{
+  g_object_set_data (G_OBJECT (tree_view), "gtk-tree-view-drag-info", NULL);
+}
 
-      gtk_cell_renderer_get_size (cell, GTK_WIDGET (tree_view), &width, &height);
-      max_height = MAX (max_height, TREE_VIEW_VERTICAL_SEPERATOR + height);
+static gint
+drag_scan_timeout (gpointer data)
+{
+  GtkTreeView *tree_view;
+  gint x, y;
+  GdkModifierType state;
+  GtkTreePath *path = NULL;
+  GtkTreeViewColumn *column = NULL;
+  GdkRectangle visible_rect;
 
-      if (first == TRUE && TREE_VIEW_DRAW_EXPANDERS (tree_view))
-       column->size = MAX (column->size, depth * tree_view->priv->tab_offset + width);
-      else
-       column->size = MAX (column->size, width);
+  tree_view = GTK_TREE_VIEW (data);
+
+  gdk_window_get_pointer (tree_view->priv->bin_window,
+                          &x, &y, &state);
 
-      first = FALSE;
+  gtk_tree_view_get_visible_rect (tree_view, &visible_rect);
+
+  /* See if we are near the edge. */
+  if ((x - visible_rect.x) < SCROLL_EDGE_SIZE ||
+      (visible_rect.x + visible_rect.width - x) < SCROLL_EDGE_SIZE ||
+      (y - visible_rect.y) < SCROLL_EDGE_SIZE ||
+      (visible_rect.y + visible_rect.height - y) < SCROLL_EDGE_SIZE)
+    {
+      gtk_tree_view_get_path_at_pos (tree_view,
+                                     tree_view->priv->bin_window,
+                                     x, y,
+                                     &path,
+                                     &column,
+                                     NULL,
+                                     NULL);
+
+      if (path != NULL)
+        {
+          gtk_tree_view_scroll_to_cell (tree_view,
+                                        path,
+                                        column,
+                                        0.5, 0.5);
+
+          gtk_tree_path_free (path);
+        }
     }
-  return max_height;
 
+  return TRUE;
 }
 
+
 static void
-gtk_tree_view_build_tree (GtkTreeView *tree_view,
-                         GtkRBTree   *tree,
-                         GtkTreeIter *iter,
-                         gint         depth,
-                         gboolean     recurse,
-                         gboolean     calc_bounds)
+remove_scroll_timeout (GtkTreeView *tree_view)
 {
-  GtkRBNode *temp = NULL;
-  gint max_height;
+  if (tree_view->priv->scroll_timeout != 0)
+    {
+      gtk_timeout_remove (tree_view->priv->scroll_timeout);
+      tree_view->priv->scroll_timeout = 0;
+    }
+}
+static gboolean
+check_model_dnd (GtkTreeModel *model,
+                 GType         required_iface,
+                 const gchar  *signal)
+{
+  if (model == NULL || !G_TYPE_CHECK_INSTANCE_TYPE ((model), required_iface))
+    {
+      g_warning ("You must override the default '%s' handler "
+                 "on GtkTreeView when using models that don't support "
+                 "the %s interface and enabling drag-and-drop. The simplest way to do this "
+                 "is to connect to '%s' and call "
+                 "gtk_signal_emit_stop_by_name() in your signal handler to prevent "
+                 "the default handler from running. Look at the source code "
+                 "for the default handler in gtktreeview.c to get an idea what "
+                 "your handler should do. (gtktreeview.c is in the GTK source "
+                 "code.) If you're using GTK from a language other than C, "
+                 "there may be a more natural way to override default handlers, e.g. via derivation.",
+                 signal, g_type_name (required_iface), signal);
+      return FALSE;
+    }
+  else
+    return TRUE;
+}
 
-  do
+static void
+remove_open_timeout (GtkTreeView *tree_view)
+{
+  if (tree_view->priv->open_dest_timeout != 0)
     {
-      max_height = 0;
-      if (calc_bounds)
-       max_height = gtk_tree_view_insert_iter_height (tree_view,
-                                                      tree,
-                                                      iter,
-                                                      depth);
+      gtk_timeout_remove (tree_view->priv->open_dest_timeout);
+      tree_view->priv->open_dest_timeout = 0;
+    }
+}
 
-      gtk_tree_model_ref_iter (tree_view->priv->model, iter);
-      temp = _gtk_rbtree_insert_after (tree, temp, max_height);
-      if (recurse)
-       {
-         GtkTreeIter child;
 
-         if (gtk_tree_model_iter_children (tree_view->priv->model, &child, iter));
-           {
-             temp->children = _gtk_rbtree_new ();
-             temp->children->parent_tree = tree;
-             temp->children->parent_node = temp;
-             gtk_tree_view_build_tree (tree_view, temp->children, &child, depth + 1, recurse, calc_bounds);
-           }
-       }
-      if (gtk_tree_model_iter_has_child (tree_view->priv->model, iter))
+static gint
+open_row_timeout (gpointer data)
+{
+  GtkTreeView *tree_view = data;
+  GtkTreePath *dest_path = NULL;
+  GtkTreeViewDropPosition pos;
+
+  gtk_tree_view_get_drag_dest_row (tree_view,
+                                   &dest_path,
+                                   &pos);
+
+  if (dest_path &&
+      (pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER ||
+       pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE))
+    {
+      gtk_tree_view_expand_row (tree_view, dest_path, FALSE);
+      tree_view->priv->open_dest_timeout = 0;
+
+      gtk_tree_path_free (dest_path);
+
+      return FALSE;
+    }
+  else
+    {
+      if (dest_path)
+        gtk_tree_path_free (dest_path);
+      return TRUE;
+    }
+}
+
+/* Returns TRUE if event should not be propagated to parent widgets */
+static gboolean
+set_destination_row (GtkTreeView    *tree_view,
+                     GdkDragContext *context,
+                     gint            x,
+                     gint            y,
+                     GdkDragAction  *suggested_action,
+                     GdkAtom        *target)
+{
+  GtkTreePath *path = NULL;
+  GtkTreeViewDropPosition pos;
+  GtkTreeViewDropPosition old_pos;
+  TreeViewDragInfo *di;
+  GtkWidget *widget;
+  GtkTreePath *old_dest_path = NULL;
+
+  *suggested_action = 0;
+  *target = GDK_NONE;
+
+  widget = GTK_WIDGET (tree_view);
+
+  di = get_info (tree_view);
+
+  if (di == NULL)
+    {
+      /* someone unset us as a drag dest, note that if
+       * we return FALSE drag_leave isn't called
+       */
+
+      gtk_tree_view_set_drag_dest_row (tree_view,
+                                       NULL,
+                                       GTK_TREE_VIEW_DROP_BEFORE);
+
+      remove_scroll_timeout (GTK_TREE_VIEW (widget));
+      remove_open_timeout (GTK_TREE_VIEW (widget));
+
+      return FALSE; /* no longer a drop site */
+    }
+
+  *target = gtk_drag_dest_find_target (widget, context, di->dest_target_list);
+  if (*target == GDK_NONE)
+    {
+      return FALSE;
+    }
+
+  if (!gtk_tree_view_get_dest_row_at_pos (tree_view,
+                                          x, y,
+                                          &path,
+                                          &pos))
+    {
+      /* can't drop here */
+      remove_open_timeout (tree_view);
+
+      gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
+                                       NULL,
+                                       GTK_TREE_VIEW_DROP_BEFORE);
+
+      /* don't propagate to parent though */
+      return TRUE;
+    }
+
+  g_assert (path);
+
+  /* If we left the current row's "open" zone, unset the timeout for
+   * opening the row
+   */
+  gtk_tree_view_get_drag_dest_row (tree_view,
+                                   &old_dest_path,
+                                   &old_pos);
+
+  if (old_dest_path &&
+      (gtk_tree_path_compare (path, old_dest_path) != 0 ||
+       !(pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER ||
+         pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)))
+    remove_open_timeout (tree_view);
+
+  if (old_dest_path)
+    gtk_tree_path_free (old_dest_path);
+
+  if (TRUE /* FIXME if the location droppable predicate */)
+    {
+      GtkWidget *source_widget;
+
+      *suggested_action = context->suggested_action;
+
+      source_widget = gtk_drag_get_source_widget (context);
+
+      if (source_widget == widget)
+        {
+          /* Default to MOVE, unless the user has
+           * pressed ctrl or alt to affect available actions
+           */
+          if ((context->actions & GDK_ACTION_MOVE) != 0)
+            *suggested_action = GDK_ACTION_MOVE;
+        }
+
+      gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
+                                       path, pos);
+    }
+  else
+    {
+      /* can't drop here */
+      remove_open_timeout (tree_view);
+
+      gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
+                                       NULL,
+                                       GTK_TREE_VIEW_DROP_BEFORE);
+    }
+
+  return TRUE;
+}
+static GtkTreePath*
+get_logical_dest_row (GtkTreeView *tree_view)
+
+{
+  /* adjust path to point to the row the drop goes in front of */
+  GtkTreePath *path = NULL;
+  GtkTreeViewDropPosition pos;
+
+  gtk_tree_view_get_drag_dest_row (tree_view, &path, &pos);
+
+  if (path == NULL)
+    return NULL;
+
+  if (pos == GTK_TREE_VIEW_DROP_BEFORE)
+    ; /* do nothing */
+  else if (pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE ||
+           pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
+    {
+      /* get first child, drop before it */
+      gtk_tree_path_append_index (path, 0);
+    }
+  else
+    {
+      g_assert (pos == GTK_TREE_VIEW_DROP_AFTER);
+      gtk_tree_path_next (path);
+    }
+
+  return path;
+}
+
+static gboolean
+gtk_tree_view_maybe_begin_dragging_row (GtkTreeView      *tree_view,
+                                        GdkEventMotion   *event)
+{
+  GdkDragContext *context;
+  TreeViewDragInfo *di;
+  GtkTreePath *path = NULL;
+  gint button;
+  gint cell_x, cell_y;
+  GtkTreeModel *model;
+
+  di = get_info (tree_view);
+
+  if (di == NULL)
+    return FALSE;
+
+  if (tree_view->priv->pressed_button < 0)
+    return FALSE;
+
+  if (!gtk_drag_check_threshold (GTK_WIDGET (tree_view),
+                                 tree_view->priv->press_start_x,
+                                 tree_view->priv->press_start_y,
+                                 event->x, event->y))
+    return FALSE;
+
+  model = gtk_tree_view_get_model (tree_view);
+
+  if (model == NULL)
+    return FALSE;
+
+  button = tree_view->priv->pressed_button;
+  tree_view->priv->pressed_button = -1;
+
+  gtk_tree_view_get_path_at_pos (tree_view,
+                                 tree_view->priv->bin_window,
+                                 tree_view->priv->press_start_x,
+                                 tree_view->priv->press_start_y,
+                                 &path,
+                                 NULL,
+                                 &cell_x,
+                                 &cell_y);
+
+  if (path == NULL)
+    return FALSE;
+
+  /* FIXME if the path doesn't match the row_draggable predicate,
+   * return FALSE and free path
+   */
+
+  /* FIXME Check whether we're a start button, if not return FALSE and
+   * free path
+   */
+
+  context = gtk_drag_begin (GTK_WIDGET (tree_view),
+                            di->source_target_list,
+                            di->source_actions,
+                            button,
+                            (GdkEvent*)event);
+
+  gtk_drag_set_icon_default (context);
+
+  {
+    GdkPixmap *row_pix;
+
+    row_pix = gtk_tree_view_create_row_drag_icon (tree_view,
+                                                  path);
+
+    gtk_drag_set_icon_pixmap (context,
+                              gdk_drawable_get_colormap (row_pix),
+                              row_pix,
+                              NULL,
+                              /* the + 1 is for the black border in the icon */
+                              tree_view->priv->press_start_x + 1,
+                              cell_y + 1);
+
+    gdk_pixmap_unref (row_pix);
+  }
+
+  set_source_row (context, model, path);
+  gtk_tree_path_free (path);
+
+  return TRUE;
+}
+
+
+static void
+gtk_tree_view_drag_begin (GtkWidget      *widget,
+                          GdkDragContext *context)
+{
+  /* do nothing */
+}
+
+static void
+gtk_tree_view_drag_end (GtkWidget      *widget,
+                        GdkDragContext *context)
+{
+  /* do nothing */
+}
+
+/* Default signal implementations for the drag signals */
+static void
+gtk_tree_view_drag_data_get (GtkWidget        *widget,
+                             GdkDragContext   *context,
+                             GtkSelectionData *selection_data,
+                             guint             info,
+                             guint             time)
+{
+  GtkTreeView *tree_view;
+  GtkTreeModel *model;
+  TreeViewDragInfo *di;
+  GtkTreePath *source_row;
+
+  tree_view = GTK_TREE_VIEW (widget);
+
+  model = gtk_tree_view_get_model (tree_view);
+
+  if (model == NULL)
+    return;
+
+  di = get_info (GTK_TREE_VIEW (widget));
+
+  if (di == NULL)
+    return;
+
+  source_row = get_source_row (context);
+
+  if (source_row == NULL)
+    return;
+
+  /* We can implement the GTK_TREE_MODEL_ROW target generically for
+   * any model; for DragSource models there are some other targets
+   * we also support.
+   */
+
+  if (GTK_IS_TREE_DRAG_SOURCE (model) &&
+      gtk_tree_drag_source_drag_data_get (GTK_TREE_DRAG_SOURCE (model),
+                                          source_row,
+                                          selection_data))
+    goto done;
+
+  /* If drag_data_get does nothing, try providing row data. */
+  if (selection_data->target == gdk_atom_intern ("GTK_TREE_MODEL_ROW", FALSE))
+    {
+      gtk_selection_data_set_tree_row (selection_data,
+                                       model,
+                                       source_row);
+    }
+
+ done:
+  gtk_tree_path_free (source_row);
+}
+
+
+static void
+gtk_tree_view_drag_data_delete (GtkWidget      *widget,
+                                GdkDragContext *context)
+{
+  TreeViewDragInfo *di;
+  GtkTreeModel *model;
+  GtkTreeView *tree_view;
+  GtkTreePath *source_row;
+
+  tree_view = GTK_TREE_VIEW (widget);
+  model = gtk_tree_view_get_model (tree_view);
+
+  if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_SOURCE, "drag_data_delete"))
+    return;
+
+  di = get_info (tree_view);
+
+  if (di == NULL)
+    return;
+
+  source_row = get_source_row (context);
+
+  if (source_row == NULL)
+    return;
+
+  gtk_tree_drag_source_drag_data_delete (GTK_TREE_DRAG_SOURCE (model),
+                                         source_row);
+
+  gtk_tree_path_free (source_row);
+
+  set_source_row (context, NULL, NULL);
+}
+
+static void
+gtk_tree_view_drag_leave (GtkWidget      *widget,
+                          GdkDragContext *context,
+                          guint             time)
+{
+  TreeViewDragInfo *di;
+
+  di = get_info (GTK_TREE_VIEW (widget));
+
+  /* unset any highlight row */
+  gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
+                                   NULL,
+                                   GTK_TREE_VIEW_DROP_BEFORE);
+
+  remove_scroll_timeout (GTK_TREE_VIEW (widget));
+  remove_open_timeout (GTK_TREE_VIEW (widget));
+}
+
+
+static gboolean
+gtk_tree_view_drag_motion (GtkWidget        *widget,
+                           GdkDragContext   *context,
+                           gint              x,
+                           gint              y,
+                           guint             time)
+{
+  GtkTreePath *path = NULL;
+  GtkTreeViewDropPosition pos;
+  GtkTreeView *tree_view;
+  GdkDragAction suggested_action = 0;
+  GdkAtom target;
+
+  tree_view = GTK_TREE_VIEW (widget);
+
+  if (!set_destination_row (tree_view, context, x, y, &suggested_action, &target))
+    return FALSE;
+
+  //  gtk_tree_view_ensure_scroll_timeout (tree_view);
+
+  gtk_tree_view_get_drag_dest_row (tree_view, &path, &pos);
+
+  if (path == NULL)
+    {
+      /* Can't drop here. */
+      gdk_drag_status (context, 0, time);
+    }
+  else
+    {
+      if (tree_view->priv->open_dest_timeout == 0 &&
+          (pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER ||
+           pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE))
+        {
+          tree_view->priv->open_dest_timeout =
+            gtk_timeout_add (500, open_row_timeout, tree_view);
+        }
+
+      if (target == gdk_atom_intern ("GTK_TREE_MODEL_ROW", FALSE))
+        {
+          /* Request data so we can use the source row when
+           * determining whether to accept the drop
+           */
+          set_status_pending (context, suggested_action);
+          gtk_drag_get_data (widget, context, target, time);
+        }
+      else
+        {
+          set_status_pending (context, 0);
+          gdk_drag_status (context, suggested_action, time);
+        }
+    }
+
+  if (path)
+    gtk_tree_path_free (path);
+
+  return TRUE;
+}
+
+
+static gboolean
+gtk_tree_view_drag_drop (GtkWidget        *widget,
+                         GdkDragContext   *context,
+                         gint              x,
+                         gint              y,
+                         guint             time)
+{
+  GtkTreeView *tree_view;
+  GtkTreePath *path;
+  GdkDragAction suggested_action = 0;
+  GdkAtom target = GDK_NONE;
+  TreeViewDragInfo *di;
+  GtkTreeModel *model;
+
+  tree_view = GTK_TREE_VIEW (widget);
+
+  model = gtk_tree_view_get_model (tree_view);
+
+  remove_scroll_timeout (GTK_TREE_VIEW (widget));
+  remove_open_timeout (GTK_TREE_VIEW (widget));
+
+  di = get_info (tree_view);
+
+  if (di == NULL)
+    return FALSE;
+
+  if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_DEST, "drag_drop"))
+    return FALSE;
+
+  if (!set_destination_row (tree_view, context, x, y, &suggested_action, &target))
+    return FALSE;
+
+  path = get_logical_dest_row (tree_view);
+
+  if (target != GDK_NONE && path != NULL)
+    {
+      /* in case a motion had requested drag data, change things so we
+       * treat drag data receives as a drop.
+       */
+      set_status_pending (context, 0);
+
+      set_dest_row (context, model, path);
+    }
+
+  if (path)
+    gtk_tree_path_free (path);
+
+  /* Unset this thing */
+  gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
+                                   NULL,
+                                   GTK_TREE_VIEW_DROP_BEFORE);
+
+  if (target != GDK_NONE)
+    {
+      gtk_drag_get_data (widget, context, target, time);
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+static void
+gtk_tree_view_drag_data_received (GtkWidget        *widget,
+                                  GdkDragContext   *context,
+                                  gint              x,
+                                  gint              y,
+                                  GtkSelectionData *selection_data,
+                                  guint             info,
+                                  guint             time)
+{
+  GtkTreePath *path;
+  TreeViewDragInfo *di;
+  gboolean accepted = FALSE;
+  GtkTreeModel *model;
+  GtkTreeView *tree_view;
+  GtkTreePath *dest_row;
+  GdkDragAction suggested_action;
+
+  tree_view = GTK_TREE_VIEW (widget);
+
+  model = gtk_tree_view_get_model (tree_view);
+
+  if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_DEST, "drag_data_received"))
+    return;
+
+  di = get_info (tree_view);
+
+  if (di == NULL)
+    return;
+
+  suggested_action = get_status_pending (context);
+
+  if (suggested_action)
+    {
+      /* We are getting this data due to a request in drag_motion,
+       * rather than due to a request in drag_drop, so we are just
+       * supposed to call drag_status, not actually paste in the
+       * data.
+       */
+      path = get_logical_dest_row (tree_view);
+
+      if (path == NULL)
+        suggested_action = 0;
+
+      if (suggested_action)
+        {
+          GtkTreeModel *src_model = NULL;
+          GtkTreePath *src_path = NULL;
+
+          if (!gtk_selection_data_get_tree_row (selection_data,
+                                                &src_model,
+                                                &src_path))
+            suggested_action = 0;
+
+          if (suggested_action)
+            {
+              if (!gtk_tree_drag_dest_row_drop_possible (GTK_TREE_DRAG_DEST (model),
+                                                         src_model,
+                                                         src_path,
+                                                         path))
+                suggested_action = 0;
+
+              gtk_tree_path_free (src_path);
+            }
+        }
+
+      gdk_drag_status (context, suggested_action, time);
+
+      if (path)
+        gtk_tree_path_free (path);
+
+      /* If you can't drop, remove user drop indicator until the next motion */
+      if (suggested_action == 0)
+        gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
+                                         NULL,
+                                         GTK_TREE_VIEW_DROP_BEFORE);
+
+      return;
+    }
+
+  dest_row = get_dest_row (context);
+
+  if (dest_row == NULL)
+    return;
+
+  if (selection_data->length >= 0)
+    {
+      if (gtk_tree_drag_dest_drag_data_received (GTK_TREE_DRAG_DEST (model),
+                                                 dest_row,
+                                                 selection_data))
+        accepted = TRUE;
+    }
+
+  gtk_drag_finish (context,
+                   accepted,
+                   (context->action == GDK_ACTION_MOVE),
+                   time);
+
+  gtk_tree_path_free (dest_row);
+
+  /* drop dest_row */
+  set_dest_row (context, NULL, NULL);
+}
+
+
+
+/* GtkContainer Methods
+ */
+
+
+static void
+gtk_tree_view_remove (GtkContainer *container,
+                     GtkWidget    *widget)
+{
+  GtkTreeView *tree_view;
+  GtkTreeViewChild *child = NULL;
+  GList *tmp_list;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW (container));
+
+  tree_view = GTK_TREE_VIEW (container);
+
+  tmp_list = tree_view->priv->children;
+  while (tmp_list)
+    {
+      child = tmp_list->data;
+      if (child->widget == widget)
+       {
+         gtk_widget_unparent (widget);
+
+         tree_view->priv->children = g_list_remove_link (tree_view->priv->children, tmp_list);
+         g_list_free_1 (tmp_list);
+         g_free (child);
+         return;
+       }
+
+      tmp_list = tmp_list->next;
+    }
+
+  tmp_list = tree_view->priv->columns;
+
+  while (tmp_list)
+    {
+      GtkTreeViewColumn *column;
+      column = tmp_list->data;
+      if (column->button == widget)
+       {
+         gtk_widget_unparent (widget);
+         return;
+       }
+      tmp_list = tmp_list->next;
+    }
+
+}
+
+static void
+gtk_tree_view_forall (GtkContainer *container,
+                     gboolean      include_internals,
+                     GtkCallback   callback,
+                     gpointer      callback_data)
+{
+  GtkTreeView *tree_view;
+  GtkTreeViewChild *child = NULL;
+  GtkTreeViewColumn *column;
+  GList *tmp_list;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW (container));
+  g_return_if_fail (callback != NULL);
+
+  tree_view = GTK_TREE_VIEW (container);
+
+  tmp_list = tree_view->priv->children;
+  while (tmp_list)
+    {
+      child = tmp_list->data;
+      tmp_list = tmp_list->next;
+
+      (* callback) (child->widget, callback_data);
+    }
+  if (include_internals == FALSE)
+    return;
+
+  for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
+    {
+      column = tmp_list->data;
+
+      if (column->button)
+       (* callback) (column->button, callback_data);
+    }
+}
+
+/* Returns TRUE if the focus is within the headers, after the focus operation is
+ * done
+ */
+static gboolean
+gtk_tree_view_header_focus (GtkTreeView      *tree_view,
+                           GtkDirectionType  dir)
+{
+  GtkWidget *focus_child;
+  GtkContainer *container;
+
+  GList *last_column, *first_column;
+  GList *tmp_list;
+
+  if (! GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
+    return FALSE;
+
+  focus_child = GTK_CONTAINER (tree_view)->focus_child;
+  container = GTK_CONTAINER (tree_view);
+
+  last_column = g_list_last (tree_view->priv->columns);
+  while (last_column)
+    {
+      if (GTK_WIDGET_CAN_FOCUS (GTK_TREE_VIEW_COLUMN (last_column->data)->button) &&
+         GTK_TREE_VIEW_COLUMN (last_column->data)->visible)
+       break;
+      last_column = last_column->prev;
+    }
+
+  /* No headers are visible, or are focusable.  We can't focus in or out.
+   */
+  if (last_column == NULL)
+    return FALSE;
+
+  first_column = tree_view->priv->columns;
+  while (first_column)
+    {
+      if (GTK_WIDGET_CAN_FOCUS (GTK_TREE_VIEW_COLUMN (first_column->data)->button) &&
+         GTK_TREE_VIEW_COLUMN (first_column->data)->visible)
+       break;
+      first_column = first_column->next;
+    }
+
+  switch (dir)
+    {
+    case GTK_DIR_TAB_BACKWARD:
+    case GTK_DIR_TAB_FORWARD:
+    case GTK_DIR_UP:
+    case GTK_DIR_DOWN:
+      if (focus_child == NULL)
+       {
+         if (tree_view->priv->focus_column != NULL)
+           focus_child = tree_view->priv->focus_column->button;
+         else
+           focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
+         gtk_widget_grab_focus (focus_child);
+         break;
+       }
+      return FALSE;
+
+    case GTK_DIR_LEFT:
+    case GTK_DIR_RIGHT:
+      if (focus_child == NULL)
+       {
+         if (tree_view->priv->focus_column != NULL)
+           focus_child = tree_view->priv->focus_column->button;
+         else if (dir == GTK_DIR_LEFT)
+           focus_child = GTK_TREE_VIEW_COLUMN (last_column->data)->button;
+         else
+           focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
+         gtk_widget_grab_focus (focus_child);
+         break;
+       }
+
+      if (gtk_widget_child_focus (focus_child, dir))
+       {
+         /* The focus moves inside the button. */
+         /* This is probably a great example of bad UI */
+         break;
+       }
+
+      /* We need to move the focus among the row of buttons. */
+      for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
+       if (GTK_TREE_VIEW_COLUMN (tmp_list->data)->button == focus_child)
+         break;
+
+      if (tmp_list == first_column && dir == GTK_DIR_LEFT)
+       {
+         focus_child = GTK_TREE_VIEW_COLUMN (last_column->data)->button;
+         gtk_widget_grab_focus (focus_child);
+         break;
+       }
+      else if (tmp_list == last_column && dir == GTK_DIR_RIGHT)
+       {
+         focus_child = GTK_TREE_VIEW_COLUMN (first_column->data)->button;
+         gtk_widget_grab_focus (focus_child);
+         break;
+       }
+
+      while (tmp_list)
+       {
+         GtkTreeViewColumn *column;
+
+         if (dir == GTK_DIR_RIGHT)
+           tmp_list = tmp_list->next;
+         else
+           tmp_list = tmp_list->prev;
+
+         if (tmp_list == NULL)
+           {
+             g_warning ("Internal button not found");
+             break;
+           }
+         column = tmp_list->data;
+         if (column->button &&
+             column->visible &&
+             GTK_WIDGET_CAN_FOCUS (column->button))
+           {
+             focus_child = column->button;
+             gtk_widget_grab_focus (column->button);
+             break;
+           }
+       }
+      break;
+    default:
+      g_assert_not_reached ();
+      break;
+    }
+
+  /* if focus child is non-null, we assume it's been set to the current focus child
+   */
+  if (focus_child)
+    {
+      for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
+       if (GTK_TREE_VIEW_COLUMN (tmp_list->data)->button == focus_child)
+         break;
+
+      tree_view->priv->focus_column = GTK_TREE_VIEW_COLUMN (tmp_list->data);
+
+      /* If the following isn't true, then the view is smaller then the scrollpane.
+       */
+      if ((focus_child->allocation.x + focus_child->allocation.width) <=
+         (tree_view->priv->hadjustment->upper))
+       {
+         /* Scroll to the button, if needed */
+         if ((tree_view->priv->hadjustment->value + tree_view->priv->hadjustment->page_size) <
+             (focus_child->allocation.x + focus_child->allocation.width))
+           gtk_adjustment_set_value (tree_view->priv->hadjustment,
+                                     focus_child->allocation.x + focus_child->allocation.width -
+                                     tree_view->priv->hadjustment->page_size);
+         else if (tree_view->priv->hadjustment->value > focus_child->allocation.x)
+           gtk_adjustment_set_value (tree_view->priv->hadjustment,
+                                     focus_child->allocation.x);
+       }
+    }
+
+  return (focus_child != NULL);
+}
+
+/* We make the assumption that if container->focus_child != NULL, the focus must
+ * be in the header.  For now, this is accurate.  It may not be in the future.
+ */
+
+/* The sordid relationship between focus_column and scroll_column:
+ *
+ * The focus_column represents the column that currently has keyboard focus, and
+ * is used when navigating columns by keyboard.  scroll_column is used for
+ * handling scrolling by keyboard, such that in cases.
+ */
+static gint
+gtk_tree_view_focus (GtkWidget        *widget,
+                    GtkDirectionType  direction)
+{
+  GtkTreeView *tree_view;
+  GtkWidget *focus_child;
+  GtkContainer *container;
+
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
+  g_return_val_if_fail (GTK_WIDGET_VISIBLE (widget), FALSE);
+
+  container = GTK_CONTAINER (widget);
+  tree_view = GTK_TREE_VIEW (widget);
+
+  if (!GTK_WIDGET_IS_SENSITIVE (container))
+    return FALSE;
+
+  focus_child = container->focus_child;
+
+  /* Case 1.  Headers currently have focus. */
+  if (focus_child)
+    {
+      switch (direction)
+       {
+       case GTK_DIR_LEFT:
+       case GTK_DIR_RIGHT:
+         gtk_tree_view_header_focus (tree_view, direction);
+         return TRUE;
+       case GTK_DIR_TAB_BACKWARD:
+       case GTK_DIR_UP:
+         return FALSE;
+       case GTK_DIR_TAB_FORWARD:
+       case GTK_DIR_DOWN:
+         if (tree_view->priv->tree == NULL)
+           return FALSE;
+         gtk_tree_view_focus_to_cursor (tree_view);
+         return TRUE;
+       }
+    }
+
+  /* Case 2. We don't have focus at all. */
+  if (!GTK_WIDGET_HAS_FOCUS (container))
+    {
+      if (tree_view->priv->tree == NULL &&
+         (direction == GTK_DIR_TAB_BACKWARD ||
+          direction == GTK_DIR_UP))
+       return gtk_tree_view_header_focus (tree_view, direction);
+      if (((direction == GTK_DIR_TAB_FORWARD) ||
+          (direction == GTK_DIR_RIGHT) ||
+          (direction == GTK_DIR_DOWN) ||
+          (direction == GTK_DIR_LEFT)) &&
+         gtk_tree_view_header_focus (tree_view, direction))
+       return TRUE;
+
+      if (tree_view->priv->tree == NULL)
+       return FALSE;
+      gtk_tree_view_focus_to_cursor (tree_view);
+      return TRUE;
+    }
+
+  /* Case 3. We have focus already. */
+  if (tree_view->priv->tree == NULL)
+    return gtk_tree_view_header_focus (tree_view, direction);
+
+  if (direction == GTK_DIR_TAB_BACKWARD)
+    return (gtk_tree_view_header_focus (tree_view, direction));
+  else if (direction == GTK_DIR_TAB_FORWARD)
+    return FALSE;
+
+  /* Other directions caught by the keybindings */
+  gtk_tree_view_focus_to_cursor (tree_view);
+  return TRUE;
+}
+
+
+static void
+gtk_tree_view_set_focus_child (GtkContainer *container,
+                              GtkWidget    *child)
+{
+  GtkTreeView *tree_view = GTK_TREE_VIEW (container);
+  GList *list;
+
+  for (list = tree_view->priv->columns; list; list = list->next)
+    {
+      if (GTK_TREE_VIEW_COLUMN (list->data)->button == child)
+       {
+         tree_view->priv->focus_column = GTK_TREE_VIEW_COLUMN (list->data);
+         break;
+       }
+    }
+
+  (* parent_class->set_focus_child) (container, child);
+}
+
+static void
+gtk_tree_view_set_adjustments (GtkTreeView   *tree_view,
+                              GtkAdjustment *hadj,
+                              GtkAdjustment *vadj)
+{
+  gboolean need_adjust = FALSE;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+
+  if (hadj)
+    g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
+  else
+    hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
+  if (vadj)
+    g_return_if_fail (GTK_IS_ADJUSTMENT (vadj));
+  else
+    vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
+
+  if (tree_view->priv->hadjustment && (tree_view->priv->hadjustment != hadj))
+    {
+      gtk_signal_disconnect_by_data (GTK_OBJECT (tree_view->priv->hadjustment), tree_view);
+      gtk_object_unref (GTK_OBJECT (tree_view->priv->hadjustment));
+    }
+
+  if (tree_view->priv->vadjustment && (tree_view->priv->vadjustment != vadj))
+    {
+      gtk_signal_disconnect_by_data (GTK_OBJECT (tree_view->priv->vadjustment), tree_view);
+      gtk_object_unref (GTK_OBJECT (tree_view->priv->vadjustment));
+    }
+
+  if (tree_view->priv->hadjustment != hadj)
+    {
+      tree_view->priv->hadjustment = hadj;
+      gtk_object_ref (GTK_OBJECT (tree_view->priv->hadjustment));
+      gtk_object_sink (GTK_OBJECT (tree_view->priv->hadjustment));
+
+      gtk_signal_connect (GTK_OBJECT (tree_view->priv->hadjustment), "value_changed",
+                         (GtkSignalFunc) gtk_tree_view_adjustment_changed,
+                         tree_view);
+      need_adjust = TRUE;
+    }
+
+  if (tree_view->priv->vadjustment != vadj)
+    {
+      tree_view->priv->vadjustment = vadj;
+      gtk_object_ref (GTK_OBJECT (tree_view->priv->vadjustment));
+      gtk_object_sink (GTK_OBJECT (tree_view->priv->vadjustment));
+
+      gtk_signal_connect (GTK_OBJECT (tree_view->priv->vadjustment), "value_changed",
+                         (GtkSignalFunc) gtk_tree_view_adjustment_changed,
+                         tree_view);
+      need_adjust = TRUE;
+    }
+
+  if (need_adjust)
+    gtk_tree_view_adjustment_changed (NULL, tree_view);
+}
+
+static void
+gtk_tree_view_real_begin_extended_selection (GtkTreeView *tree_view)
+{
+  tree_view->priv->in_extended_selection = TRUE;
+}
+
+static void
+gtk_tree_view_real_end_extended_selection (GtkTreeView *tree_view)
+{
+  tree_view->priv->in_extended_selection = FALSE;
+}
+
+static void
+gtk_tree_view_real_begin_free_motion (GtkTreeView *tree_view)
+{
+  tree_view->priv->in_free_motion = TRUE;
+}
+
+static void
+gtk_tree_view_real_end_free_motion (GtkTreeView *tree_view)
+{
+  tree_view->priv->in_free_motion = FALSE;
+}
+
+static void
+gtk_tree_view_real_move_cursor (GtkTreeView       *tree_view,
+                               GtkMovementStep    step,
+                               gint               count)
+{
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+  g_return_if_fail (step == GTK_MOVEMENT_LOGICAL_POSITIONS ||
+                   step == GTK_MOVEMENT_VISUAL_POSITIONS ||
+                   step == GTK_MOVEMENT_DISPLAY_LINES ||
+                   step == GTK_MOVEMENT_PAGES ||
+                   step == GTK_MOVEMENT_BUFFER_ENDS);
+
+  if (tree_view->priv->tree == NULL)
+    return;
+
+  GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
+  gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+
+  switch (step)
+    {
+      /* currently we make no distinction.  When we go bi-di, we need to */
+    case GTK_MOVEMENT_LOGICAL_POSITIONS:
+    case GTK_MOVEMENT_VISUAL_POSITIONS:
+      gtk_tree_view_move_cursor_left_right (tree_view, count);
+      break;
+    case GTK_MOVEMENT_DISPLAY_LINES:
+      gtk_tree_view_move_cursor_up_down (tree_view, count);
+      break;
+    case GTK_MOVEMENT_PAGES:
+      gtk_tree_view_move_cursor_page_up_down (tree_view, count);
+      break;
+    case GTK_MOVEMENT_BUFFER_ENDS:
+      gtk_tree_view_move_cursor_start_end (tree_view, count);
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+}
+
+/* TreeModel Callbacks
+ */
+
+static void
+gtk_tree_view_range_changed (GtkTreeModel *model,
+                            GtkTreePath  *path,
+                            GtkTreeIter  *iter,
+                            GtkTreePath  *end_path,
+                            GtkTreeIter  *end_iter,
+                            gpointer      data)
+{
+  GtkTreeView *tree_view = (GtkTreeView *)data;
+  GtkRBTree *tree;
+  GtkRBNode *node;
+  gint height;
+  gboolean dirty_marked;
+  gboolean free_path = FALSE;
+  gint vertical_separator;
+
+
+  g_return_if_fail (path != NULL || iter != NULL);
+
+  gtk_widget_style_get (GTK_WIDGET (data), "vertical_separator", &vertical_separator, NULL);
+
+  if (path == NULL)
+    {
+      path = gtk_tree_model_get_path (model, iter);
+      free_path = TRUE;
+    }
+  else if (iter == NULL)
+    gtk_tree_model_get_iter (model, iter, path);
+
+  if (_gtk_tree_view_find_node (tree_view,
+                               path,
+                               &tree,
+                               &node))
+    /* We aren't actually showing the node */
+    goto done;
+
+  if (tree == NULL)
+    goto done;
+
+  dirty_marked = gtk_tree_view_discover_dirty_iter (tree_view,
+                                                   iter,
+                                                   gtk_tree_path_get_depth (path),
+                                                   &height);
+
+  if (GTK_RBNODE_GET_HEIGHT (node) != height + vertical_separator)
+    {
+      _gtk_rbtree_node_set_height (tree, node, height + vertical_separator);
+      gtk_widget_queue_resize (GTK_WIDGET (data));
+      goto done;
+    }
+  if (dirty_marked)
+    gtk_widget_queue_resize (GTK_WIDGET (data));
+  else
+    gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
+
+ done:
+  if (free_path)
+    gtk_tree_path_free (path);
+}
+
+static void
+gtk_tree_view_inserted (GtkTreeModel *model,
+                       GtkTreePath  *path,
+                       GtkTreeIter  *iter,
+                       gpointer      data)
+{
+  GtkTreeView *tree_view = (GtkTreeView *) data;
+  gint *indices;
+  GtkRBTree *tmptree, *tree;
+  GtkRBNode *tmpnode = NULL;
+  gint max_height;
+  gint depth;
+  gint i = 0;
+  gboolean free_path = FALSE;
+
+  if (tree_view->priv->tree == NULL)
+    tree_view->priv->tree = _gtk_rbtree_new ();
+
+  tmptree = tree = tree_view->priv->tree;
+  g_return_if_fail (path != NULL || iter != NULL);
+
+  if (path == NULL)
+    {
+      path = gtk_tree_model_get_path (model, iter);
+      free_path = TRUE;
+    }
+  else if (iter == NULL)
+    gtk_tree_model_get_iter (model, iter, path);
+
+  /* Update all row-references */
+  gtk_tree_row_reference_inserted (G_OBJECT (data), path);
+
+  depth = gtk_tree_path_get_depth (path);
+  indices = gtk_tree_path_get_indices (path);
+
+  /* First, find the parent tree */
+  while (i < depth - 1)
+    {
+      if (tmptree == NULL)
+       {
+         /* We aren't showing the node */
+          goto done;
+       }
+
+      tmpnode = _gtk_rbtree_find_count (tmptree, indices[i] + 1);
+      if (tmpnode == NULL)
+       {
+         g_warning ("A node was inserted with a parent that's not in the tree.\n" \
+                    "This possibly means that a GtkTreeModel inserted a child node\n" \
+                    "before the parent was inserted.");
+          goto done;
+       }
+      else if (!GTK_RBNODE_FLAG_SET (tmpnode, GTK_RBNODE_IS_PARENT))
+       {
+          /* FIXME enforce correct behavior on model, probably */
+         /* In theory, the model should have emitted has_child_toggled here.  We
+          * try to catch it anyway, just to be safe, in case the model hasn't.
+          */
+         GtkTreePath *tmppath = _gtk_tree_view_find_path (tree_view,
+                                                          tree,
+                                                          tmpnode);
+         gtk_tree_view_has_child_toggled (model, tmppath, NULL, data);
+         gtk_tree_path_free (tmppath);
+          goto done;
+       }
+
+      tmptree = tmpnode->children;
+      tree = tmptree;
+      i++;
+    }
+
+  if (tree == NULL)
+    goto done;
+
+  /* ref the node */
+  gtk_tree_model_ref_node (tree_view->priv->model, iter);
+  max_height = gtk_tree_view_insert_iter_height (tree_view,
+                                                tree,
+                                                iter,
+                                                depth);
+  if (indices[depth - 1] == 0)
+    {
+      tmpnode = _gtk_rbtree_find_count (tree, 1);
+      _gtk_rbtree_insert_before (tree, tmpnode, max_height);
+    }
+  else
+    {
+      tmpnode = _gtk_rbtree_find_count (tree, indices[depth - 1]);
+      _gtk_rbtree_insert_after (tree, tmpnode, max_height);
+    }
+
+  _gtk_tree_view_update_size (tree_view);
+
+ done:
+  if (free_path)
+    gtk_tree_path_free (path);
+}
+
+static void
+gtk_tree_view_has_child_toggled (GtkTreeModel *model,
+                                GtkTreePath  *path,
+                                GtkTreeIter  *iter,
+                                gpointer      data)
+{
+  GtkTreeView *tree_view = (GtkTreeView *)data;
+  GtkTreeIter real_iter;
+  gboolean has_child;
+  GtkRBTree *tree;
+  GtkRBNode *node;
+  gboolean free_path = FALSE;
+
+  g_return_if_fail (path != NULL || iter != NULL);
+
+  if (iter)
+    real_iter = *iter;
+
+  if (path == NULL)
+    {
+      path = gtk_tree_model_get_path (model, iter);
+      free_path = TRUE;
+    }
+  else if (iter == NULL)
+    gtk_tree_model_get_iter (model, &real_iter, path);
+
+  if (_gtk_tree_view_find_node (tree_view,
+                               path,
+                               &tree,
+                               &node))
+    /* We aren't actually showing the node */
+    goto done;
+
+  if (tree == NULL)
+    goto done;
+
+  has_child = gtk_tree_model_iter_has_child (model, &real_iter);
+  /* Sanity check.
+   */
+  if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT) == has_child)
+    goto done;
+
+  if (has_child)
+    GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PARENT);
+  else
+    GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_IS_PARENT);
+
+  if (has_child && GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IS_LIST))
+    {
+      GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IS_LIST);
+      if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS))
+       {
+         GList *list;
+
+         for (list = tree_view->priv->columns; list; list = list->next)
+           if (GTK_TREE_VIEW_COLUMN (list->data)->visible)
+             {
+               GTK_TREE_VIEW_COLUMN (list->data)->dirty = TRUE;
+               break;
+             }
+       }
+      gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+    }
+  else
+    {
+      /* FIXME: Just redraw the node */
+      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+    }
+
+ done:
+  if (free_path)
+    gtk_tree_path_free (path);
+}
+
+static void
+gtk_tree_view_deleted (GtkTreeModel *model,
+                      GtkTreePath  *path,
+                      gpointer      data)
+{
+  GtkTreeView *tree_view = (GtkTreeView *)data;
+  GtkRBTree *tree;
+  GtkRBNode *node;
+  GList *list;
+
+  g_return_if_fail (path != NULL);
+
+  if (_gtk_tree_view_find_node (tree_view, path, &tree, &node))
+    return;
+
+  if (tree == NULL)
+    return;
+
+  gtk_tree_row_reference_deleted (G_OBJECT (data), path);
+
+  /* next, update the selection */
+  if (tree_view->priv->anchor)
+    {
+      GtkTreePath *anchor_path;
+
+      /* the row reference may not have been updated yet. If it has not,
+       * then anchor_path and path being equal indicates that the anchor
+       * row was deleted. If it has, then anchor_path == NULL indicates the
+       * the anchor row was deleted.
+       */
+
+      anchor_path = gtk_tree_row_reference_get_path (tree_view->priv->anchor);
+
+      if (anchor_path == NULL ||
+          gtk_tree_path_compare (path, anchor_path) == 0)
+       {
+         if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED) &&
+              tree_view->priv->selection)
+           g_signal_emit_by_name (G_OBJECT (tree_view->priv->selection), "changed");
+       }
+
+      if (anchor_path)
+        gtk_tree_path_free (anchor_path);
+    }
+
+  for (list = tree_view->priv->columns; list; list = list->next)
+    if (((GtkTreeViewColumn *)list->data)->visible &&
+       ((GtkTreeViewColumn *)list->data)->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
+      ((GtkTreeViewColumn *)list->data)->dirty = TRUE;
+
+  /* Ensure we don't have a dangling pointer to a dead node */
+  ensure_unprelighted (tree_view);
+
+  g_assert (tree_view->priv->prelight_node == NULL);
+
+  if (tree->root->count == 1)
+    {
+      if (tree_view->priv->tree == tree)
+       tree_view->priv->tree = NULL;
+
+      _gtk_rbtree_remove (tree);
+    }
+  else
+    {
+      _gtk_rbtree_remove_node (tree, node);
+    }
+
+  _gtk_tree_view_update_size (GTK_TREE_VIEW (data));
+}
+
+
+static void
+gtk_tree_view_reordered (GtkTreeModel *model,
+                        GtkTreePath  *parent,
+                        GtkTreeIter  *iter,
+                        gint         *new_order,
+                        gpointer      data)
+{
+  GtkTreeView *tree_view = GTK_TREE_VIEW (data);
+  GtkRBTree *tree;
+  GtkRBNode *node;
+  gint len;
+
+  len = gtk_tree_model_iter_n_children (model, iter);
+
+  if (len < 2)
+    return;
+
+  gtk_tree_row_reference_reordered (G_OBJECT (data),
+                                   parent,
+                                   iter,
+                                   new_order);
+
+  if (_gtk_tree_view_find_node (tree_view,
+                               parent,
+                               &tree,
+                               &node))
+    return;
+
+  /* We need to special case the parent path */
+  if (tree == NULL)
+    tree = tree_view->priv->tree;
+  else
+    tree = node->children;
+
+  if (tree == NULL)
+    return;
+
+  /* FIXME: we need to unprelight our tree, if it's prelit. */
+  _gtk_rbtree_reorder (tree, new_order, len);
+
+  gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+}
+
+
+/* Internal tree functions
+ */
+
+
+static void
+gtk_tree_view_get_background_xrange (GtkTreeView       *tree_view,
+                                     GtkRBTree         *tree,
+                                     GtkTreeViewColumn *column,
+                                     gint              *x1,
+                                     gint              *x2)
+{
+  GtkTreeViewColumn *tmp_column = NULL;
+  gint total_width;
+  GList *list;
+
+  if (x1)
+    *x1 = 0;
+
+  if (x2)
+    *x2 = 0;
+
+  total_width = 0;
+  for (list = tree_view->priv->columns; list; list = list->next)
+    {
+      tmp_column = list->data;
+
+      if (tmp_column == column)
+        break;
+
+      if (tmp_column->visible)
+        total_width += tmp_column->width;
+    }
+
+  if (tmp_column != column)
+    {
+      g_warning (G_STRLOC": passed-in column isn't in the tree");
+      return;
+    }
+
+  if (x1)
+    *x1 = total_width;
+
+  if (x2)
+    {
+      if (column->visible)
+        *x2 = total_width + column->width;
+      else
+        *x2 = total_width; /* width of 0 */
+    }
+}
+
+static void
+gtk_tree_view_get_cell_xrange (GtkTreeView       *tree_view,
+                               GtkRBTree         *tree,
+                               GtkTreeViewColumn *column,
+                               gint              *x1,
+                               gint              *x2)
+{
+  GtkTreeViewColumn *tmp_column = NULL;
+  gint total_width;
+  GList *list;
+  gint i;
+
+  if (x1)
+    *x1 = 0;
+
+  if (x2)
+    *x2 = 0;
+
+  i = 0;
+  total_width = 0;
+  for (list = tree_view->priv->columns; list; list = list->next)
+    {
+      tmp_column = list->data;
+
+      if (tmp_column == column)
+        break;
+
+      if (tmp_column->visible)
+        total_width += tmp_column->width;
+
+      ++i;
+    }
+
+  if (tmp_column != column)
+    {
+      g_warning (G_STRLOC": passed-in column isn't in the tree");
+      return;
+    }
+
+  /* Remember we're getting the cell range, i.e. the cell_area passed
+   * to the cell renderer.
+   */
+
+  if (i == tree_view->priv->expander_column)
+    total_width += tree_view->priv->tab_offset * _gtk_rbtree_get_depth (tree);
+
+  if (x1)
+    *x1 = total_width;
+
+  if (x2)
+    {
+      if (column->visible)
+        *x2 = total_width + column->displayed_width;
+      else
+        *x2 = total_width; /* width of 0 */
+    }
+}
+
+static void
+gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
+                                gint        *x1,
+                                gint        *x2)
+{
+  gint x_offset = 0;
+  GList *list;
+  GtkTreeViewColumn *tmp_column = NULL;
+  gint total_width;
+  gint i;
+
+  i = 0;
+  total_width = 0;
+  for (list = tree_view->priv->columns; list; list = list->next)
+    {
+      tmp_column = list->data;
+
+      if (i == tree_view->priv->expander_column)
+        {
+          x_offset = total_width;
+          break;
+        }
+
+      if (tmp_column->visible)
+        total_width += tmp_column->width;
+
+      ++i;
+    }
+
+  if (x1)
+    *x1 = x_offset;
+
+  if (tmp_column && tmp_column->visible)
+    {
+      /* +1 because x2 isn't included in the range. */
+      if (x2)
+        *x2 = x_offset + tree_view->priv->tab_offset + 1;
+    }
+  else
+    {
+      /* return an empty range, the expander column is hidden */
+      if (x2)
+        *x2 = x_offset;
+    }
+}
+
+static void
+gtk_tree_view_setup_model (GtkTreeView *tree_view)
+{
+  GtkTreePath *path;
+  GtkTreeIter iter;
+
+  tree_view->priv->tree = NULL;
+
+  g_signal_connectc (tree_view->priv->model,
+                    "range_changed",
+                    (GCallback) gtk_tree_view_range_changed,
+                    tree_view,
+                    FALSE);
+  g_signal_connectc (tree_view->priv->model,
+                    "inserted",
+                    (GCallback) gtk_tree_view_inserted,
+                    tree_view,
+                    FALSE);
+  g_signal_connectc (tree_view->priv->model,
+                    "has_child_toggled",
+                    (GCallback) gtk_tree_view_has_child_toggled,
+                    tree_view,
+                    FALSE);
+  g_signal_connectc (tree_view->priv->model,
+                    "deleted",
+                    (GCallback) gtk_tree_view_deleted,
+                    tree_view,
+                    FALSE);
+  g_signal_connectc (tree_view->priv->model,
+                    "reordered",
+                    (GCallback) gtk_tree_view_reordered,
+                    tree_view,
+                    FALSE);
+
+  if (tree_view->priv->columns == NULL)
+    return;
+
+  path = gtk_tree_path_new_root ();
+
+  if (gtk_tree_model_get_iter (tree_view->priv->model, &iter, path))
+    {
+      tree_view->priv->tree = _gtk_rbtree_new ();
+      gtk_tree_view_build_tree (tree_view, tree_view->priv->tree, &iter, 1, FALSE, GTK_WIDGET_REALIZED (tree_view));
+    }
+
+  gtk_tree_path_free (path);
+
+  /*  FIXME: do I need to do this? gtk_tree_view_create_buttons (tree_view); */
+
+  GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_MODEL_SETUP);
+}
+
+static gint
+gtk_tree_view_insert_iter_height (GtkTreeView *tree_view,
+                                 GtkRBTree   *tree,
+                                 GtkTreeIter *iter,
+                                 gint         depth)
+{
+  GtkTreeViewColumn *column;
+  GList *list;
+  gint max_height = 0;
+  gint i;
+  gint vertical_separator;
+
+  i = 0;
+
+  gtk_widget_style_get (GTK_WIDGET (tree_view), "vertical_separator", &vertical_separator, NULL);
+  /* do stuff with node */
+  for (list = tree_view->priv->columns; list; list = list->next)
+    {
+      gint height = 0, width = 0;
+      column = list->data;
+
+      if (!column->visible)
+       continue;
+
+      if (column->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
+        {
+          ++i;
+          continue;
+        }
+
+      gtk_tree_view_column_cell_set_cell_data (column, tree_view->priv->model, iter);
+
+      gtk_tree_view_column_cell_get_size (column, NULL, NULL, NULL, &width, &height);
+      max_height = MAX (max_height, vertical_separator + height);
+
+      if (i == tree_view->priv->expander_column &&
+          TREE_VIEW_DRAW_EXPANDERS (tree_view))
+       _gtk_tree_view_column_set_width (column,
+                                        MAX (column->width, depth * tree_view->priv->tab_offset + width));
+      else
+        _gtk_tree_view_column_set_width (column,
+                                        MAX (column->width, width));
+
+      ++i;
+    }
+  return max_height;
+}
+
+static void
+gtk_tree_view_build_tree (GtkTreeView *tree_view,
+                         GtkRBTree   *tree,
+                         GtkTreeIter *iter,
+                         gint         depth,
+                         gboolean     recurse,
+                         gboolean     calc_bounds)
+{
+  GtkRBNode *temp = NULL;
+  gint max_height;
+
+  do
+    {
+      max_height = 0;
+      if (calc_bounds)
+       max_height = gtk_tree_view_insert_iter_height (tree_view,
+                                                      tree,
+                                                      iter,
+                                                      depth);
+
+      gtk_tree_model_ref_node (tree_view->priv->model, iter);
+      temp = _gtk_rbtree_insert_after (tree, temp, max_height);
+      if (recurse)
+       {
+         GtkTreeIter child;
+
+         if (gtk_tree_model_iter_children (tree_view->priv->model, &child, iter))
+           {
+             temp->children = _gtk_rbtree_new ();
+             temp->children->parent_tree = tree;
+             temp->children->parent_node = temp;
+             gtk_tree_view_build_tree (tree_view, temp->children, &child, depth + 1, recurse, calc_bounds);
+           }
+       }
+      if (gtk_tree_model_iter_has_child (tree_view->priv->model, iter))
+       {
+         if ((temp->flags&GTK_RBNODE_IS_PARENT) != GTK_RBNODE_IS_PARENT)
+           temp->flags ^= GTK_RBNODE_IS_PARENT;
+         GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IS_LIST);
+       }
+    }
+  while (gtk_tree_model_iter_next (tree_view->priv->model, iter));
+}
+
+static void
+gtk_tree_view_calc_size (GtkTreeView *tree_view,
+                        GtkRBTree   *tree,
+                        GtkTreeIter *iter,
+                        gint         depth)
+{
+  GtkRBNode *temp;
+  GtkTreeIter child;
+  GList *list;
+  GtkTreeViewColumn *column;
+  gint max_height;
+  gint vertical_separator;
+  gint i;
+
+  TREE_VIEW_INTERNAL_ASSERT_VOID (tree != NULL);
+
+  gtk_widget_style_get (GTK_WIDGET (tree_view), "vertical_separator", &vertical_separator, NULL);
+
+  temp = tree->root;
+  while (temp->left != tree->nil)
+    temp = temp->left;
+
+  do
+    {
+      max_height = 0;
+      /* Do stuff with node */
+      for (list = tree_view->priv->columns, i = 0; i < tree_view->priv->n_columns; list = list->next, i++)
+       {
+         gint height = 0, width = 0;
+         column = list->data;
+
+         if (!column->visible)
+           continue;
+
+         gtk_tree_view_column_cell_set_cell_data (column, tree_view->priv->model, iter);
+         gtk_tree_view_column_cell_get_size (column, NULL, NULL, NULL, &width, &height);
+         max_height = MAX (max_height, vertical_separator + height);
+
+         /* FIXME: I'm getting the width of all nodes here. )-: */
+         if (column->dirty == FALSE)
+           continue;
+
+         if (column->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
+           {
+             continue;
+           }
+         if (i == tree_view->priv->expander_column &&
+              TREE_VIEW_DRAW_EXPANDERS (tree_view))
+            _gtk_tree_view_column_set_width (column,
+                                            MAX (column->width, depth * tree_view->priv->tab_offset + width));
+         else
+            _gtk_tree_view_column_set_width (column, MAX (column->width, width));
+       }
+
+      _gtk_rbtree_node_set_height (tree, temp, max_height);
+
+      if (temp->children != NULL &&
+         gtk_tree_model_iter_children (tree_view->priv->model, &child, iter))
+       gtk_tree_view_calc_size (tree_view, temp->children, &child, depth + 1);
+      temp = _gtk_rbtree_next (tree, temp);
+    }
+  while (gtk_tree_model_iter_next (tree_view->priv->model, iter));
+}
+
+static gboolean
+gtk_tree_view_discover_dirty_iter (GtkTreeView *tree_view,
+                                  GtkTreeIter *iter,
+                                  gint         depth,
+                                  gint        *height)
+{
+  GtkTreeViewColumn *column;
+  GList *list;
+  gint i;
+  gboolean retval = FALSE;
+  gint tmpheight;
+
+  if (height)
+    *height = 0;
+
+  for (i = 0, list = tree_view->priv->columns; list; list = list->next, i++)
+    {
+      gint width;
+      column = list->data;
+      if (column->dirty == TRUE || column->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
+       continue;
+      if (!column->visible)
+       continue;
+
+      gtk_tree_view_column_cell_set_cell_data (column, tree_view->priv->model, iter);
+
+      if (height)
+       {
+         gtk_tree_view_column_cell_get_size (column,
+                                             NULL, NULL, NULL,
+                                             &width, &tmpheight);
+         *height = MAX (*height, tmpheight);
+       }
+      else
+       {
+         gtk_tree_view_column_cell_get_size (column,
+                                             NULL, NULL, NULL,
+                                             &width, NULL);
+       }
+      if (i == tree_view->priv->expander_column &&
+          TREE_VIEW_DRAW_EXPANDERS (tree_view))
+       {
+         if (depth * tree_view->priv->tab_offset + width > column->width)
+           {
+             column->dirty = TRUE;
+             retval = TRUE;
+           }
+       }
+      else
+       {
+         if (width > column->width)
+           {
+             column->dirty = TRUE;
+             retval = TRUE;
+           }
+       }
+    }
+
+  return retval;
+}
+
+static void
+gtk_tree_view_discover_dirty (GtkTreeView *tree_view,
+                             GtkRBTree   *tree,
+                             GtkTreeIter *iter,
+                             gint         depth)
+{
+  GtkRBNode *temp = tree->root;
+  GtkTreeViewColumn *column;
+  GList *list;
+  GtkTreeIter child;
+  gboolean is_all_dirty;
+
+  TREE_VIEW_INTERNAL_ASSERT_VOID (tree != NULL);
+
+  while (temp->left != tree->nil)
+    temp = temp->left;
+
+  do
+    {
+      TREE_VIEW_INTERNAL_ASSERT_VOID (temp != NULL);
+      is_all_dirty = TRUE;
+      for (list = tree_view->priv->columns; list; list = list->next)
+       {
+         column = list->data;
+         if (column->dirty == FALSE)
+           {
+             is_all_dirty = FALSE;
+             break;
+           }
+       }
+
+      if (is_all_dirty)
+       return;
+
+      gtk_tree_view_discover_dirty_iter (tree_view,
+                                        iter,
+                                        depth,
+                                        FALSE);
+      if (gtk_tree_model_iter_children (tree_view->priv->model, &child, iter) &&
+         temp->children != NULL)
+       gtk_tree_view_discover_dirty (tree_view, temp->children, &child, depth + 1);
+      temp = _gtk_rbtree_next (tree, temp);
+    }
+  while (gtk_tree_model_iter_next (tree_view->priv->model, iter));
+}
+
+
+static void
+gtk_tree_view_check_dirty (GtkTreeView *tree_view)
+{
+  GtkTreePath *path;
+  gboolean dirty = FALSE;
+  GList *list;
+  GtkTreeViewColumn *column;
+  GtkTreeIter iter;
+
+  if (!GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_MODEL_SETUP) &&
+      tree_view->priv->model)
+    gtk_tree_view_setup_model (tree_view);
+
+  for (list = tree_view->priv->columns; list; list = list->next)
+    {
+      column = list->data;
+      if (column->dirty)
+       {
+         dirty = TRUE;
+         if (column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
+           {
+              gint w = 1;
+
+              if (column->button)
+                w = MAX (w, column->button->requisition.width);
+
+              _gtk_tree_view_column_set_width (column, w);
+           }
+       }
+    }
+
+  if (dirty == FALSE)
+    return;
+
+  if (tree_view->priv->model == NULL)
+    return;
+
+  path = gtk_tree_path_new_root ();
+  if (gtk_tree_model_get_iter (tree_view->priv->model, &iter, path))
+    {
+      gtk_tree_view_calc_size (tree_view, tree_view->priv->tree, &iter, 1);
+      _gtk_tree_view_update_size (tree_view);
+    }
+
+  gtk_tree_path_free (path);
+
+  for (list = tree_view->priv->columns; list; list = list->next)
+    {
+      column = list->data;
+      column->dirty = FALSE;
+    }
+}
+
+/* Make sure the node is visible vertically */
+static void
+gtk_tree_view_clamp_node_visible (GtkTreeView *tree_view,
+                                 GtkRBTree   *tree,
+                                 GtkRBNode   *node)
+{
+  gint offset;
+
+  /* We process updates because we want to clear old selected items when we scroll.
+   * if this is removed, we get a "selection streak" at the bottom. */
+  if (GTK_WIDGET_REALIZED (tree_view))
+    gdk_window_process_updates (tree_view->priv->bin_window, TRUE);
+
+  offset = _gtk_rbtree_node_find_offset (tree, node);
+
+  /* we reverse the order, b/c in the unusual case of the
+   * node's height being taller then the visible area, we'd rather
+   * have the node flush to the top
+   */
+  if (offset + GTK_RBNODE_GET_HEIGHT (node) >
+      tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size)
+    gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment),
+                             offset + GTK_RBNODE_GET_HEIGHT (node) -
+                             tree_view->priv->vadjustment->page_size);
+  if (offset < tree_view->priv->vadjustment->value)
+    gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment),
+                             offset);
+
+}
+
+/* This function could be more efficient.
+ * I'll optimize it if profiling seems to imply that
+ * it's important
+ */
+GtkTreePath *
+_gtk_tree_view_find_path (GtkTreeView *tree_view,
+                         GtkRBTree   *tree,
+                         GtkRBNode   *node)
+{
+  GtkTreePath *path;
+  GtkRBTree *tmp_tree;
+  GtkRBNode *tmp_node, *last;
+  gint count;
+
+  path = gtk_tree_path_new ();
+
+  g_return_val_if_fail (node != NULL, path);
+  g_return_val_if_fail (node != tree->nil, path);
+
+  count = 1 + node->left->count;
+
+  last = node;
+  tmp_node = node->parent;
+  tmp_tree = tree;
+  while (tmp_tree)
+    {
+      while (tmp_node != tmp_tree->nil)
+       {
+         if (tmp_node->right == last)
+           count += 1 + tmp_node->left->count;
+         last = tmp_node;
+         tmp_node = tmp_node->parent;
+       }
+      gtk_tree_path_prepend_index (path, count - 1);
+      last = tmp_tree->parent_node;
+      tmp_tree = tmp_tree->parent_tree;
+      if (last)
+       {
+         count = 1 + last->left->count;
+         tmp_node = last->parent;
+       }
+    }
+  return path;
+}
+
+/* Returns TRUE if we ran out of tree before finding the path.
+ */
+gboolean
+_gtk_tree_view_find_node (GtkTreeView  *tree_view,
+                         GtkTreePath  *path,
+                         GtkRBTree   **tree,
+                         GtkRBNode   **node)
+{
+  GtkRBNode *tmpnode = NULL;
+  GtkRBTree *tmptree = tree_view->priv->tree;
+  gint *indices = gtk_tree_path_get_indices (path);
+  gint depth = gtk_tree_path_get_depth (path);
+  gint i = 0;
+
+  *node = NULL;
+  *tree = NULL;
+
+  if (depth == 0)
+    return FALSE;
+  do
+    {
+      if (tmptree == NULL)
+       {
+         *node = tmpnode;
+         *tree = tmptree;
+         return TRUE;
+       }
+      tmpnode = _gtk_rbtree_find_count (tmptree, indices[i] + 1);
+      ++i;
+      if (i >= depth)
+       {
+         *node = tmpnode;
+         *tree = tmptree;
+         return FALSE;
+       }
+      tmptree = tmpnode->children;
+    }
+  while (1);
+}
+
+static void
+gtk_tree_view_add_move_binding (GtkBindingSet  *binding_set,
+                               guint           keyval,
+                               guint           modmask,
+                               GtkMovementStep step,
+                               gint            count)
+{
+
+  gtk_binding_entry_add_signal (binding_set, keyval, modmask,
+                                "move_cursor", 2,
+                                GTK_TYPE_ENUM, step,
+                                GTK_TYPE_INT, count);
+
+  gtk_binding_entry_add_signal (binding_set, keyval, GDK_SHIFT_MASK,
+                                "move_cursor", 2,
+                                GTK_TYPE_ENUM, step,
+                                GTK_TYPE_INT, count);
+
+  if ((modmask & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+   return;
+
+  gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+                                "move_cursor", 2,
+                                GTK_TYPE_ENUM, step,
+                                GTK_TYPE_INT, count);
+
+  gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK,
+                                "move_cursor", 2,
+                                GTK_TYPE_ENUM, step,
+                                GTK_TYPE_INT, count);
+}
+
+static void
+gtk_tree_view_unref_tree_helper (GtkTreeModel *model,
+                                GtkTreeIter  *iter,
+                                GtkRBTree    *tree,
+                                GtkRBNode    *node)
+{
+  do
+    {
+      g_return_if_fail (node != NULL);
+
+      if (node->children)
+       {
+         GtkTreeIter child;
+         GtkRBTree *new_tree;
+         GtkRBNode *new_node;
+
+         new_tree = node->children;
+         new_node = new_tree->root;
+
+         while (new_node && new_node->left != new_tree->nil)
+           new_node = new_node->left;
+
+         g_return_if_fail (gtk_tree_model_iter_children (model, &child, iter));
+         gtk_tree_view_unref_tree_helper (model, &child, new_tree, new_node);
+       }
+
+      gtk_tree_model_unref_node (model, iter);
+      node = _gtk_rbtree_next (tree, node);
+    }
+  while (gtk_tree_model_iter_next (model, iter));
+}
+
+static void
+gtk_tree_view_unref_tree (GtkTreeView *tree_view,
+                         GtkRBTree   *tree)
+{
+  GtkTreeIter iter;
+  GtkTreePath *path;
+  GtkRBNode *node;
+
+  node = tree->root;
+  while (node && node->left != tree->nil)
+    node = node->left;
+
+  g_return_if_fail (node != NULL);
+  path = _gtk_tree_view_find_path (tree_view, tree, node);
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_view->priv->model),
+                          &iter, path);
+  gtk_tree_view_unref_tree_helper (GTK_TREE_MODEL (tree_view->priv->model), &iter, tree, node);
+  gtk_tree_path_free (path);
+}
+
+static void
+gtk_tree_view_set_column_drag_info (GtkTreeView       *tree_view,
+                                   GtkTreeViewColumn *column)
+{
+  GtkTreeViewColumn *left_column;
+  GtkTreeViewColumn *cur_column = NULL;
+  GtkTreeViewColumnReorder *reorder;
+
+  GList *tmp_list;
+  gint left;
+
+  /* We want to precalculate the motion list such that we know what column slots
+   * are available.
+   */
+  left_column = NULL;
+
+  /* First, identify all possible drop spots */
+  tmp_list = tree_view->priv->columns;
+
+  while (tmp_list)
+    {
+      g_assert (tmp_list);
+
+      cur_column = GTK_TREE_VIEW_COLUMN (tmp_list->data);
+      tmp_list = tmp_list->next;
+
+      if (cur_column->visible == FALSE)
+       continue;
+
+      /* If it's not the column moving and func tells us to skip over the column, we continue. */
+      if (left_column != column && cur_column != column &&
+         tree_view->priv->column_drop_func &&
+         ! (* tree_view->priv->column_drop_func) (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))
+       {
+         left_column = cur_column;
+         continue;
+       }
+      reorder = g_new (GtkTreeViewColumnReorder, 1);
+      reorder->left_column = left_column;
+      left_column = reorder->right_column = cur_column;
+
+      tree_view->priv->column_drag_info = g_list_append (tree_view->priv->column_drag_info, reorder);
+    }
+
+  /* Add the last one */
+  if (tree_view->priv->column_drop_func == NULL ||
+      ((left_column != column) &&
+       (* tree_view->priv->column_drop_func) (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data)))
+    {
+      reorder = g_new (GtkTreeViewColumnReorder, 1);
+      reorder->left_column = left_column;
+      reorder->right_column = NULL;
+      tree_view->priv->column_drag_info = g_list_append (tree_view->priv->column_drag_info, reorder);
+    }
+
+  /* We quickly check to see if it even makes sense to reorder columns. */
+  /* If there is nothing that can be moved, then we return */
+
+  if (tree_view->priv->column_drag_info == NULL)
+    return;
+
+  /* We know there are always 2 slots possbile, as you can always return column. */
+  /* If that's all there is, return */
+  if (tree_view->priv->column_drag_info->next->next == NULL &&
+      ((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->data)->right_column == column &&
+      ((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->next->data)->left_column == column)
+    {
+      for (tmp_list = tree_view->priv->column_drag_info; tmp_list; tmp_list = tmp_list->next)
+       g_free (tmp_list->data);
+      g_list_free (tree_view->priv->column_drag_info);
+      tree_view->priv->column_drag_info = NULL;
+      return;
+    }
+  /* We fill in the ranges for the columns, now that we've isolated them */
+  left = - TREE_VIEW_COLUMN_DRAG_DEAD_MULTIPLIER (tree_view);
+
+  for (tmp_list = tree_view->priv->column_drag_info; tmp_list; tmp_list = tmp_list->next)
+    {
+      reorder = (GtkTreeViewColumnReorder *) tmp_list->data;
+
+      reorder->left_align = left;
+      if (tmp_list->next != NULL)
+       {
+         g_assert (tmp_list->next->data);
+         left = reorder->right_align = (reorder->right_column->button->allocation.x +
+                                        reorder->right_column->button->allocation.width +
+                                        ((GtkTreeViewColumnReorder *)tmp_list->next->data)->left_column->button->allocation.x)/2;
+       }
+      else
+       {
+         gint width;
+
+         gdk_window_get_size (tree_view->priv->header_window, &width, NULL);
+         reorder->right_align = width + TREE_VIEW_COLUMN_DRAG_DEAD_MULTIPLIER (tree_view);
+       }
+    }
+}
+
+void
+_gtk_tree_view_column_start_drag (GtkTreeView       *tree_view,
+                                 GtkTreeViewColumn *column)
+{
+  GdkEvent send_event;
+  GtkAllocation allocation;
+  gint x, y, width, height;
+
+  g_return_if_fail (tree_view->priv->column_drag_info == NULL);
+
+  gtk_tree_view_set_column_drag_info (tree_view, column);
+
+  if (tree_view->priv->column_drag_info == NULL)
+    return;
+
+  if (tree_view->priv->drag_window == NULL)
+    {
+      GdkWindowAttr attributes;
+      guint attributes_mask;
+
+      attributes.window_type = GDK_WINDOW_CHILD;
+      attributes.wclass = GDK_INPUT_OUTPUT;
+      attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
+      attributes.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view));
+      attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
+      attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+
+      tree_view->priv->drag_window = gdk_window_new (tree_view->priv->bin_window,
+                                                    &attributes,
+                                                    attributes_mask);
+      gdk_window_set_user_data (tree_view->priv->drag_window, GTK_WIDGET (tree_view));
+    }
+
+  gdk_pointer_ungrab (GDK_CURRENT_TIME);
+  gdk_keyboard_ungrab (GDK_CURRENT_TIME);
+
+  gtk_grab_remove (column->button);
+
+  send_event.crossing.type = GDK_LEAVE_NOTIFY;
+  send_event.crossing.send_event = TRUE;
+  send_event.crossing.window = column->button->window;
+  send_event.crossing.subwindow = NULL;
+  send_event.crossing.detail = GDK_NOTIFY_ANCESTOR;
+  send_event.crossing.time = GDK_CURRENT_TIME;
+
+  gtk_propagate_event (column->button, &send_event);
+
+  send_event.button.type = GDK_BUTTON_RELEASE;
+  send_event.button.window = GDK_ROOT_PARENT ();
+  send_event.button.send_event = TRUE;
+  send_event.button.time = GDK_CURRENT_TIME;
+  send_event.button.x = -1;
+  send_event.button.y = -1;
+  send_event.button.axes = NULL;
+  send_event.button.state = 0;
+  send_event.button.button = 1;
+  send_event.button.device = gdk_core_pointer;
+  send_event.button.x_root = 0;
+  send_event.button.y_root = 0;
+
+  gtk_propagate_event (column->button, &send_event);
+
+  gdk_window_move_resize (tree_view->priv->drag_window,
+                         column->button->allocation.x,
+                         column->button->allocation.y + column->button->allocation.height,
+                         column->button->allocation.width,
+                         column->button->allocation.height);
+  gdk_window_reparent (column->button->window, tree_view->priv->drag_window, 0, 0);
+  tree_view->priv->drag_column_x = column->button->allocation.x;
+  allocation = column->button->allocation;
+  allocation.x = 0;
+  gtk_widget_size_allocate (column->button, &allocation);
+  gtk_widget_set_parent_window (column->button, tree_view->priv->drag_window);
+
+  tree_view->priv->drag_column = column;
+  gdk_window_show (tree_view->priv->drag_window);
+
+  gdk_window_get_origin (tree_view->priv->header_window, &x, &y);
+  gdk_window_get_size (tree_view->priv->header_window, &width, &height);
+
+  gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+  while (gtk_events_pending ())
+    gtk_main_iteration ();
+
+  GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG);
+  gdk_pointer_grab (tree_view->priv->drag_window,
+                   FALSE,
+                   GDK_POINTER_MOTION_MASK|GDK_BUTTON_RELEASE_MASK,
+                   NULL, NULL, GDK_CURRENT_TIME);
+  gdk_keyboard_grab (tree_view->priv->drag_window,
+                    FALSE,
+                    GDK_CURRENT_TIME);
+
+}
+
+static void
+gtk_tree_view_queue_draw_node (GtkTreeView  *tree_view,
+                              GtkRBTree    *tree,
+                              GtkRBNode    *node,
+                              GdkRectangle *clip_rect)
+{
+  GdkRectangle rect;
+
+  if (!GTK_WIDGET_REALIZED (tree_view))
+    return;
+
+  rect.x = 0;
+  rect.width = MAX (tree_view->priv->width, GTK_WIDGET (tree_view)->allocation.width);
+
+  rect.y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
+  rect.height = BACKGROUND_HEIGHT (node);
+
+  if (clip_rect)
+    {
+      GdkRectangle new_rect;
+
+      gdk_rectangle_intersect (clip_rect, &rect, &new_rect);
+
+      gdk_window_invalidate_rect (tree_view->priv->bin_window, &new_rect, TRUE);
+    }
+  else
+    {
+      gdk_window_invalidate_rect (tree_view->priv->bin_window, &rect, TRUE);
+    }
+}
+
+static void
+gtk_tree_view_queue_draw_path (GtkTreeView      *tree_view,
+                               GtkTreePath      *path,
+                               GdkRectangle     *clip_rect)
+{
+  GtkRBTree *tree = NULL;
+  GtkRBNode *node = NULL;
+
+  _gtk_tree_view_find_node (tree_view, path, &tree, &node);
+
+  if (tree)
+    gtk_tree_view_queue_draw_node (tree_view, tree, node, clip_rect);
+}
+
+/* x and y are the mouse position
+ */
+static void
+gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
+                          GtkRBTree   *tree,
+                         GtkRBNode   *node,
+                         gint         x,
+                         gint         y)
+{
+  GdkRectangle area;
+  GtkStateType state;
+  GtkWidget *widget;
+  gint x_offset = 0;
+  gint vertical_separator;
+  gint expander_height;
+
+  gtk_widget_style_get (GTK_WIDGET (tree_view),
+                       "vertical_separator", &vertical_separator,
+                       "expander_height", &expander_height,
+                       NULL);
+
+  if (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT))
+    return;
+
+  widget = GTK_WIDGET (tree_view);
+
+  gtk_tree_view_get_arrow_xrange (tree_view, &x_offset, NULL);
+
+  area.x = x_offset;
+  area.y = CELL_FIRST_PIXEL (tree_view, tree, node, vertical_separator);
+  area.width = tree_view->priv->tab_offset - 2;
+  area.height = CELL_HEIGHT (node, vertical_separator);
+
+  if (node == tree_view->priv->button_pressed_node)
+    {
+      if (x >= area.x && x <= (area.x + area.width) &&
+         y >= area.y && y <= (area.y + area.height))
+        state = GTK_STATE_ACTIVE;
+      else
+        state = GTK_STATE_NORMAL;
+    }
+  else
+    {
+      if (node == tree_view->priv->prelight_node &&
+         GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
+       state = GTK_STATE_PRELIGHT;
+      else
+       state = GTK_STATE_NORMAL;
+    }
+
+  gtk_paint_expander (widget->style,
+                      tree_view->priv->bin_window,
+                      state,
+                      &area,
+                      widget,
+                      "treeview",
+                      area.x,
+                      (area.y + (area.height - expander_height) / 2 - (area.height + 1) % 2),
+                      node->children != NULL);
+}
+
+
+static void
+_gtk_tree_view_update_col_width (GtkTreeView *tree_view)
+{
+  GList *list, *last_column;
+  GtkTreeViewColumn *column;
+  gint width = 0;
+
+  for (last_column = g_list_last (tree_view->priv->columns);
+       last_column &&
+        !(GTK_TREE_VIEW_COLUMN (last_column->data)->visible) &&
+        GTK_WIDGET_CAN_FOCUS (GTK_TREE_VIEW_COLUMN (last_column->data)->button);
+       last_column = last_column->prev)
+    ;
+
+  if (last_column == NULL)
+    return;
+
+  for (list = tree_view->priv->columns; list != last_column; list = list->next)
+    {
+      column = GTK_TREE_VIEW_COLUMN (list->data);
+      if (! column->visible)
+       continue;
+
+      width += column->width;
+      column->displayed_width = (CLAMP (column->width, (column->min_width!=-1)?column->min_width:column->width, (column->max_width!=-1)?column->max_width:column->width));
+    }
+  column = GTK_TREE_VIEW_COLUMN (last_column->data);
+  column->displayed_width = MAX (GTK_WIDGET (tree_view)->allocation.width, tree_view->priv->width) - width;
+}
+
+static void
+gtk_tree_view_focus_to_cursor (GtkTreeView *tree_view)
+
+{
+  GtkTreePath *cursor_path;
+
+  if ((tree_view->priv->tree == NULL) ||
+      (! GTK_WIDGET_REALIZED (tree_view)))
+    return;
+
+  GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
+  gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+
+  cursor_path = NULL;
+  if (tree_view->priv->cursor)
+    cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+
+  if (cursor_path == NULL)
+    {
+      GtkTreePath *tmp_path = gtk_tree_path_new_root ();
+      /* FIXME: Get the first one visible!!! */
+      if (tree_view->priv->cursor)
+       gtk_tree_row_reference_free (tree_view->priv->cursor);
+
+      tree_view->priv->cursor =
+       gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view), tree_view->priv->model, tmp_path);
+      cursor_path = tmp_path;
+    }
+
+  if (tree_view->priv->selection->type == GTK_TREE_SELECTION_SINGLE)
+    gtk_tree_view_real_set_cursor (tree_view, cursor_path, TRUE, 0);
+  else
+    gtk_tree_view_real_set_cursor (tree_view, cursor_path, FALSE, 0);
+  gtk_tree_path_free (cursor_path);
+
+}
+
+static void
+gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view,
+                                  gint         count)
+{
+  GtkRBTree *cursor_tree = NULL;
+  GtkRBNode *cursor_node = NULL;
+  GtkRBTree *new_cursor_tree = NULL;
+  GtkRBNode *new_cursor_node = NULL;
+  GtkTreePath *cursor_path = NULL;
+
+  cursor_path = NULL;
+  if (tree_view->priv->cursor)
+    cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+
+  if (cursor_path == NULL)
+    return;
+
+  _gtk_tree_view_find_node (tree_view, cursor_path,
+                           &cursor_tree, &cursor_node);
+
+  if (count == -1)
+    _gtk_rbtree_prev_full (cursor_tree, cursor_node,
+                          &new_cursor_tree, &new_cursor_node);
+  else
+    _gtk_rbtree_next_full (cursor_tree, cursor_node,
+                          &new_cursor_tree, &new_cursor_node);
+
+  if (new_cursor_node)
+    {
+      gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
+      gtk_tree_path_free (cursor_path);
+
+      cursor_path = _gtk_tree_view_find_path (tree_view, new_cursor_tree, new_cursor_node);
+      if (!tree_view->priv->in_free_motion)
+       _gtk_tree_selection_internal_select_node (tree_view->priv->selection,
+                                                 new_cursor_node,
+                                                 new_cursor_tree,
+                                                 cursor_path,
+                                                 tree_view->priv->in_extended_selection?GDK_SHIFT_MASK:0);
+      gtk_tree_row_reference_free (tree_view->priv->cursor);
+      tree_view->priv->cursor = gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view), tree_view->priv->model, cursor_path);
+      gtk_tree_view_clamp_node_visible (tree_view, new_cursor_tree, new_cursor_node);
+    }
+  else
+    {
+      gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node);
+    }
+
+  gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+  gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
+  gtk_tree_path_free (cursor_path);
+}
+
+static void
+gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view,
+                                       gint         count)
+{
+  g_print ("gtk_tree_view_move_cursor_page_up_down\n");
+}
+
+static void
+gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view,
+                                     gint         count)
+{
+  GtkRBTree *cursor_tree = NULL;
+  GtkRBNode *cursor_node = NULL;
+  GtkTreePath *cursor_path = NULL;
+
+  g_print ("gtk_tree_view_move_cursor_left_right\n");
+
+  cursor_path = NULL;
+  if (tree_view->priv->cursor)
+    cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+
+  if (cursor_path == NULL)
+    return;
+
+  _gtk_tree_view_find_node (tree_view, cursor_path,
+                           &cursor_tree, &cursor_node);
+  gtk_tree_path_free (cursor_path);
+
+
+}
+
+static void
+gtk_tree_view_move_cursor_start_end (GtkTreeView *tree_view,
+                                    gint         count)
+{
+  GtkRBTree *cursor_tree;
+  GtkRBNode *cursor_node;
+  GtkTreePath *path;
+
+  g_return_if_fail (tree_view->priv->tree != NULL);
+
+  if (count == -1)
+    {
+      cursor_tree = tree_view->priv->tree;
+      cursor_node = cursor_tree->root;
+      while (cursor_node && cursor_node->left != cursor_tree->nil)
+       cursor_node = cursor_node->left;
+    }
+  else
+    {
+      cursor_tree = tree_view->priv->tree;
+      cursor_node = cursor_tree->root;
+      do
+       {
+         while (cursor_node && cursor_node->right != cursor_tree->nil)
+           cursor_node = cursor_node->right;
+         if (cursor_node->children == NULL)
+           break;
+
+         cursor_tree = cursor_node->children;
+         cursor_node = cursor_tree->root;
+       }
+      while (1);
+    }
+
+  path = _gtk_tree_view_find_path (tree_view, cursor_tree, cursor_node);
+  _gtk_tree_selection_internal_select_node (tree_view->priv->selection,
+                                           cursor_node,
+                                           cursor_tree,
+                                           path,
+                                           FALSE?GDK_SHIFT_MASK:0);
+
+  gtk_tree_row_reference_free (tree_view->priv->cursor);
+  tree_view->priv->cursor = gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view), tree_view->priv->model, path);
+  gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node);
+}
+
+static void
+gtk_tree_view_real_select_cursor_row (GtkTreeView *tree_view)
+{
+  GtkRBTree *cursor_tree = NULL;
+  GtkRBNode *cursor_node = NULL;
+  GtkTreePath *cursor_path = NULL;
+
+  cursor_path = NULL;
+  if (tree_view->priv->cursor)
+    cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+
+  if (cursor_path == NULL)
+    return;
+
+  _gtk_tree_view_find_node (tree_view, cursor_path,
+                           &cursor_tree, &cursor_node);
+  if (cursor_tree == NULL)
+    return;
+
+  _gtk_tree_selection_internal_select_node (tree_view->priv->selection,
+                                           cursor_node,
+                                           cursor_tree,
+                                           cursor_path,
+                                           0);
+
+  gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node);
+
+  gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+  gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
+  gtk_tree_path_free (cursor_path);
+}
+
+static void
+gtk_tree_view_real_toggle_cursor_row (GtkTreeView *tree_view)
+{
+  GtkRBTree *cursor_tree = NULL;
+  GtkRBNode *cursor_node = NULL;
+  GtkTreePath *cursor_path = NULL;
+
+  cursor_path = NULL;
+  if (tree_view->priv->cursor)
+    cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+
+  if (cursor_path == NULL)
+    return;
+
+  _gtk_tree_view_find_node (tree_view, cursor_path,
+                           &cursor_tree, &cursor_node);
+  if (cursor_tree == NULL)
+    return;
+
+  _gtk_tree_selection_internal_select_node (tree_view->priv->selection,
+                                           cursor_node,
+                                           cursor_tree,
+                                           cursor_path,
+                                           GDK_CONTROL_MASK);
+
+  gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node);
+
+  gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+  gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
+  gtk_tree_path_free (cursor_path);
+}
+
+
+
+static void
+gtk_tree_view_real_expand_collapse_cursor_row (GtkTreeView *tree_view,
+                                              gboolean     logical,
+                                              gboolean     expand,
+                                              gboolean     open_all)
+{
+  GtkTreePath *cursor_path = NULL;
+
+  cursor_path = NULL;
+  if (tree_view->priv->cursor)
+    cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+
+  if (cursor_path == NULL)
+    return;
+
+  if (expand)
+    gtk_tree_view_expand_row (tree_view, cursor_path, open_all);
+  else
+    gtk_tree_view_collapse_row (tree_view, cursor_path);
+
+  gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+  gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
+  gtk_tree_path_free (cursor_path);
+}
+
+static void
+gtk_tree_view_real_select_cursor_parent (GtkTreeView *tree_view)
+{
+  GtkRBTree *cursor_tree = NULL;
+  GtkRBNode *cursor_node = NULL;
+  GtkTreePath *cursor_path = NULL;
+
+  cursor_path = NULL;
+  if (tree_view->priv->cursor)
+    cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
+
+  if (cursor_path == NULL)
+    return;
+
+  _gtk_tree_view_find_node (tree_view, cursor_path,
+                           &cursor_tree, &cursor_node);
+  if (cursor_tree == NULL)
+    return;
+
+  if (cursor_tree->parent_node)
+    {
+      gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
+      cursor_node = cursor_tree->parent_node;
+      cursor_tree = cursor_tree->parent_tree;
+
+      gtk_tree_path_up (cursor_path);
+      gtk_tree_row_reference_free (tree_view->priv->cursor);
+      tree_view->priv->cursor = gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view), tree_view->priv->model, cursor_path);
+      _gtk_tree_selection_internal_select_node (tree_view->priv->selection,
+                                               cursor_node,
+                                               cursor_tree,
+                                               cursor_path,
+                                               0);
+    }
+
+  gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node);
+
+  gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+  gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL);
+  gtk_tree_path_free (cursor_path);
+}
+
+void
+_gtk_tree_view_update_size (GtkTreeView *tree_view)
+{
+  gint width, height;
+  GList *list;
+  GtkTreeViewColumn *column;
+  gint vertical_separator;
+  gint i;
+
+  gtk_widget_style_get (GTK_WIDGET (tree_view), "vertical_separator", &vertical_separator, NULL);
+
+  if (tree_view->priv->model == NULL)
+    {
+      tree_view->priv->width = 0;
+      tree_view->priv->height = 0;
+      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+      return;
+    }
+
+  width = 0;
+  for (list = tree_view->priv->columns, i = 0; list; list = list->next, i++)
+    {
+      column = list->data;
+      if (!column->visible)
+       continue;
+      width += TREE_VIEW_COLUMN_WIDTH (column);
+    }
+
+  if (tree_view->priv->tree == NULL)
+    height = 0;
+  else
+    height = tree_view->priv->tree->root->offset + vertical_separator;
+
+  if (tree_view->priv->width != width)
+    {
+      tree_view->priv->width = width;
+      tree_view->priv->hadjustment->upper = width;
+      gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->hadjustment), "changed");
+    }
+
+  if (tree_view->priv->height != height)
+    {
+      tree_view->priv->height = height;
+      tree_view->priv->vadjustment->upper = tree_view->priv->height;
+      gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->vadjustment), "changed");
+    }
+
+  if (GTK_WIDGET_REALIZED (tree_view))
+    {
+      gdk_window_resize (tree_view->priv->bin_window, MAX (width, GTK_WIDGET (tree_view)->allocation.width), height + TREE_VIEW_HEADER_HEIGHT (tree_view));
+      gdk_window_resize (tree_view->priv->header_window, MAX (width, GTK_WIDGET (tree_view)->allocation.width), tree_view->priv->header_height);
+
+      _gtk_tree_view_update_col_width (tree_view);
+    }
+
+  gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+}
+
+/* this function returns the new width of the column being resized given
+ * the column and x position of the cursor; the x cursor position is passed
+ * in as a pointer and automagicly corrected if it's beyond min/max limits
+ */
+static gint
+gtk_tree_view_new_column_width (GtkTreeView *tree_view,
+                               gint       i,
+                               gint      *x)
+{
+  GtkTreeViewColumn *column;
+  gint width;
+
+  /* first translate the x position from widget->window
+   * to clist->clist_window
+   */
+
+  column = g_list_nth (tree_view->priv->columns, i)->data;
+  width = *x - column->button->allocation.x;
+
+  /* Clamp down the value */
+  if (column->min_width == -1)
+    width = MAX (column->button->requisition.width,
+                width);
+  else
+    width = MAX (column->min_width,
+                width);
+  if (column->max_width != -1)
+    width = MIN (width, column->max_width != -1);
+  *x = column->button->allocation.x + width;
+
+  return width;
+}
+
+
+/* Callbacks */
+static void
+gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment,
+                                 GtkTreeView   *tree_view)
+{
+  if (GTK_WIDGET_REALIZED (tree_view))
+    {
+      gdk_window_move (tree_view->priv->bin_window,
+                      - tree_view->priv->hadjustment->value,
+                      - tree_view->priv->vadjustment->value);
+      gdk_window_move (tree_view->priv->header_window,
+                      - tree_view->priv->hadjustment->value,
+                      0);
+
+      gdk_window_process_updates (tree_view->priv->bin_window, TRUE);
+      gdk_window_process_updates (tree_view->priv->header_window, TRUE);
+    }
+}
+
+\f
+
+/* Public methods
+ */
+
+/**
+ * gtk_tree_view_new:
+ *
+ * Creates a new #GtkTreeView widget.
+ *
+ * Return value: A newly created #GtkTreeView widget.
+ **/
+GtkWidget *
+gtk_tree_view_new (void)
+{
+  GtkTreeView *tree_view;
+
+  tree_view = GTK_TREE_VIEW (gtk_type_new (gtk_tree_view_get_type ()));
+
+  return GTK_WIDGET (tree_view);
+}
+
+/**
+ * gtk_tree_view_new_with_model:
+ * @model: the model.
+ *
+ * Creates a new #GtkTreeView widget with the model initialized to @model.
+ *
+ * Return value: A newly created #GtkTreeView widget.
+ **/
+GtkWidget *
+gtk_tree_view_new_with_model (GtkTreeModel *model)
+{
+  GtkTreeView *tree_view;
+
+  tree_view = GTK_TREE_VIEW (gtk_type_new (gtk_tree_view_get_type ()));
+  gtk_tree_view_set_model (tree_view, model);
+
+  return GTK_WIDGET (tree_view);
+}
+
+/* Public Accessors
+ */
+
+/**
+ * gtk_tree_view_get_model:
+ * @tree_view: a #GtkTreeView
+ *
+ * Returns the model the the #GtkTreeView is based on.  Returns NULL if the
+ * model is unset.
+ *
+ * Return value: A #GtkTreeModel, or NULL if none is currently being used.
+ **/
+GtkTreeModel *
+gtk_tree_view_get_model (GtkTreeView *tree_view)
+{
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
+
+  return tree_view->priv->model;
+}
+
+/**
+ * gtk_tree_view_set_model:
+ * @tree_view: A #GtkTreeNode.
+ * @model: The model.
+ *
+ * Sets the model for a #GtkTreeView.  If the @tree_view already has a model
+ * set, it will remove it before setting the new model.  If @model is NULL, then
+ * it will unset the old model.
+ **/
+void
+gtk_tree_view_set_model (GtkTreeView  *tree_view,
+                        GtkTreeModel *model)
+{
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+
+  if (model == tree_view->priv->model)
+    return;
+
+  if (model != NULL)
+    g_object_ref (model);
+
+  if (tree_view->priv->model != NULL)
+    {
+      if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_MODEL_SETUP))
+       {
+         g_signal_handlers_disconnect_matched (G_OBJECT (tree_view->priv->model),
+                                               G_SIGNAL_MATCH_DATA,
+                                               0, 0, NULL,
+                                               NULL, tree_view);
+         g_signal_handlers_disconnect_matched (G_OBJECT (tree_view->priv->model),
+                                               G_SIGNAL_MATCH_DATA,
+                                               0, 0, NULL,
+                                               NULL, tree_view);
+         g_signal_handlers_disconnect_matched (G_OBJECT (tree_view->priv->model),
+                                               G_SIGNAL_MATCH_DATA,
+                                               0, 0, NULL,
+                                               NULL, tree_view);
+         g_signal_handlers_disconnect_matched (G_OBJECT (tree_view->priv->model),
+                                               G_SIGNAL_MATCH_DATA,
+                                               0, 0, NULL,
+                                               NULL, tree_view);
+         g_signal_handlers_disconnect_matched (G_OBJECT (tree_view->priv->model),
+                                               G_SIGNAL_MATCH_DATA,
+                                               0, 0, NULL,
+                                               NULL, tree_view);
+         if (tree_view->priv->tree)
+           _gtk_rbtree_free (tree_view->priv->tree);
+       }
+
+      if (tree_view->priv->drag_dest_row)
+        gtk_tree_row_reference_free (tree_view->priv->drag_dest_row);
+
+      GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_MODEL_SETUP);
+      g_object_unref (tree_view->priv->model);
+    }
+
+  tree_view->priv->model = model;
+
+  if (model == NULL)
+    {
+      tree_view->priv->tree = NULL;
+      if (GTK_WIDGET_REALIZED (tree_view))
+       _gtk_tree_view_update_size (tree_view);
+    }
+  else if (GTK_WIDGET_REALIZED (tree_view))
+    {
+      gtk_tree_view_setup_model (tree_view);
+      _gtk_tree_view_update_size (tree_view);
+    }
+
+  g_object_notify (G_OBJECT (tree_view), "model");
+}
+
+/**
+ * gtk_tree_view_get_selection:
+ * @tree_view: A #GtkTreeView.
+ *
+ * Gets the #GtkTreeSelection associated with @tree_view.
+ *
+ * Return value: A #GtkTreeSelection object.
+ **/
+GtkTreeSelection *
+gtk_tree_view_get_selection (GtkTreeView *tree_view)
+{
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
+
+  return tree_view->priv->selection;
+}
+
+/**
+ * gtk_tree_view_get_hadjustment:
+ * @tree_view: A #GtkTreeView
+ *
+ * Gets the #GtkAdjustment currently being used for the horizontal aspect.
+ *
+ * Return value: A #GtkAdjustment object, or NULL if none is currently being
+ * used.
+ **/
+GtkAdjustment *
+gtk_tree_view_get_hadjustment (GtkTreeView *tree_view)
+{
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
+
+  if (tree_view->priv->hadjustment == NULL)
+    gtk_tree_view_set_hadjustment (tree_view, NULL);
+
+  return tree_view->priv->hadjustment;
+}
+
+/**
+ * gtk_tree_view_set_hadjustment:
+ * @tree_view: A #GtkTreeView
+ * @adjustment: The #GtkAdjustment to set, or NULL
+ *
+ * Sets the #GtkAdjustment for the current horizontal aspect.
+ **/
+void
+gtk_tree_view_set_hadjustment (GtkTreeView   *tree_view,
+                              GtkAdjustment *adjustment)
+{
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+
+  gtk_tree_view_set_adjustments (tree_view,
+                                adjustment,
+                                tree_view->priv->vadjustment);
+
+  g_object_notify (G_OBJECT (tree_view), "hadjustment");
+}
+
+/**
+ * gtk_tree_view_get_vadjustment:
+ * @tree_view: A #GtkTreeView
+ *
+ * Gets the #GtkAdjustment currently being used for the vertical aspect.
+ *
+ * Return value: A #GtkAdjustment object, or NULL if none is currently being
+ * used.
+ **/
+GtkAdjustment *
+gtk_tree_view_get_vadjustment (GtkTreeView *tree_view)
+{
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
+
+  if (tree_view->priv->vadjustment == NULL)
+    gtk_tree_view_set_vadjustment (tree_view, NULL);
+
+  return tree_view->priv->vadjustment;
+}
+
+/**
+ * gtk_tree_view_set_vadjustment:
+ * @tree_view: A #GtkTreeView
+ * @adjustment: The #GtkAdjustment to set, or NULL
+ *
+ * Sets the #GtkAdjustment for the current vertical aspect.
+ **/
+void
+gtk_tree_view_set_vadjustment (GtkTreeView   *tree_view,
+                              GtkAdjustment *adjustment)
+{
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+
+  gtk_tree_view_set_adjustments (tree_view,
+                                tree_view->priv->hadjustment,
+                                adjustment);
+
+  g_object_notify (G_OBJECT (tree_view), "vadjustment");
+}
+
+/* Column and header operations */
+
+/**
+ * gtk_tree_view_get_headers_visible:
+ * @tree_view: A #GtkTreeView.
+ *
+ * Returns TRUE if the headers on the @tree_view are visible.
+ *
+ * Return value: Whether the headers are visible or not.
+ **/
+gboolean
+gtk_tree_view_get_headers_visible (GtkTreeView *tree_view)
+{
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+
+  return GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE);
+}
+
+/**
+ * gtk_tree_view_set_headers_visible:
+ * @tree_view: A #GtkTreeView.
+ * @headers_visible: TRUE if the headers are visible
+ *
+ * Sets the the visibility state of the headers.
+ **/
+void
+gtk_tree_view_set_headers_visible (GtkTreeView *tree_view,
+                                  gboolean     headers_visible)
+{
+  gint x, y;
+  GList *list;
+  GtkTreeViewColumn *column;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+
+  headers_visible = !! headers_visible;
+
+  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE) == headers_visible)
+    return;
+
+  if (headers_visible)
+    GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE);
+  else
+    GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE);
+
+  if (GTK_WIDGET_REALIZED (tree_view))
+    {
+      gdk_window_get_position (tree_view->priv->bin_window, &x, &y);
+      if (headers_visible)
+       {
+         gdk_window_move_resize (tree_view->priv->bin_window, x, y, tree_view->priv->width, tree_view->priv->height + TREE_VIEW_HEADER_HEIGHT (tree_view));
+
+          if (GTK_WIDGET_MAPPED (tree_view))
+            gtk_tree_view_map_buttons (tree_view);
+       }
+      else
        {
-         if ((temp->flags&GTK_RBNODE_IS_PARENT) != GTK_RBNODE_IS_PARENT)
-           temp->flags ^= GTK_RBNODE_IS_PARENT;
-         GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IS_LIST);
+         gdk_window_move_resize (tree_view->priv->bin_window, x, y, tree_view->priv->width, tree_view->priv->height);
+
+         for (list = tree_view->priv->columns; list; list = list->next)
+           {
+             column = list->data;
+             gtk_widget_unmap (column->button);
+           }
+         gdk_window_hide (tree_view->priv->header_window);
        }
     }
-  while (gtk_tree_model_iter_next (tree_view->priv->model, iter));
+
+  tree_view->priv->vadjustment->page_size = GTK_WIDGET (tree_view)->allocation.height - TREE_VIEW_HEADER_HEIGHT (tree_view);
+  tree_view->priv->vadjustment->page_increment = (GTK_WIDGET (tree_view)->allocation.height - TREE_VIEW_HEADER_HEIGHT (tree_view)) / 2;
+  tree_view->priv->vadjustment->lower = 0;
+  tree_view->priv->vadjustment->upper = tree_view->priv->height;
+  gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->vadjustment), "changed");
+
+  gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+
+  g_object_notify (G_OBJECT (tree_view), "headers_visible");
 }
 
-static void
-gtk_tree_view_calc_size (GtkTreeView *tree_view,
-                        GtkRBTree   *tree,
-                        GtkTreeIter *iter,
-                        gint         depth)
+
+/**
+ * gtk_tree_view_columns_autosize:
+ * @tree_view: A #GtkTreeView.
+ *
+ * Resizes all columns to their optimal width.
+ **/
+void
+gtk_tree_view_columns_autosize (GtkTreeView *tree_view)
 {
-  GtkRBNode *temp = tree->root;
-  GtkTreeIter child;
-  GtkCellRenderer *cell;
+  gboolean dirty = FALSE;
   GList *list;
   GtkTreeViewColumn *column;
-  gint max_height;
-  gint i;
-
-  TREE_VIEW_INTERNAL_ASSERT_VOID (tree != NULL);
 
-  while (temp->left != tree->nil)
-    temp = temp->left;
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-  do
+  for (list = tree_view->priv->columns; list; list = list->next)
     {
-      max_height = 0;
-      /* Do stuff with node */
-      for (list = tree_view->priv->column, i = 0; i < tree_view->priv->columns; list = list->next, i++)
-       {
-         gint height = 0, width = 0;
-         column = list->data;
+      column = list->data;
+      if (column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
+       continue;
+      column->dirty = TRUE;
+      dirty = TRUE;
+    }
 
-         if (!column->visible)
-           continue;
+  if (dirty)
+    gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+}
 
-         gtk_tree_view_column_set_cell_data (column, tree_view->priv->model, iter);
-         cell = column->cell;
-         gtk_cell_renderer_get_size (cell, GTK_WIDGET (tree_view), &width, &height);
-         max_height = MAX (max_height, TREE_VIEW_VERTICAL_SEPERATOR + height);
+/**
+ * gtk_tree_view_set_headers_clickable:
+ * @tree_view: A #GtkTreeView.
+ * @setting: TRUE if the columns are clickable.
+ *
+ * Allow the column title buttons to be clicked.
+ **/
+void
+gtk_tree_view_set_headers_clickable (GtkTreeView *tree_view,
+                                    gboolean   setting)
+{
+  GList *list;
 
-         /* FIXME: I'm getting the width of all nodes here. )-: */
-         if (column->dirty == FALSE || column->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
-           continue;
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+  g_return_if_fail (tree_view->priv->model != NULL);
 
-         if (i == 0 && TREE_VIEW_DRAW_EXPANDERS (tree_view))
-           column->size = MAX (column->size, depth * tree_view->priv->tab_offset + width);
-         else
-           column->size = MAX (column->size, width);
-       }
-      _gtk_rbtree_node_set_height (tree, temp, max_height);
-      if (temp->children != NULL &&
-         gtk_tree_model_iter_children (tree_view->priv->model, &child, iter))
-       gtk_tree_view_calc_size (tree_view, temp->children, &child, depth + 1);
-      temp = _gtk_rbtree_next (tree, temp);
-    }
-  while (gtk_tree_model_iter_next (tree_view->priv->model, iter));
+  for (list = tree_view->priv->columns; list; list = list->next)
+    gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (list->data), setting);
+
+  g_object_notify (G_OBJECT (tree_view), "headers_clickable");
 }
 
-static gboolean
-gtk_tree_view_discover_dirty_iter (GtkTreeView *tree_view,
-                                  GtkTreeIter *iter,
-                                  gint         depth,
-                                  gint        *height)
+
+/**
+ * gtk_tree_view_set_rules_hint
+ * @tree_view: a #GtkTreeView
+ * @setting: %TRUE if the tree requires reading across rows
+ *
+ * This function tells GTK+ that the user interface for your
+ * application requires users to read across tree rows and associate
+ * cells with one another. By default, GTK+ will then render the tree
+ * with alternating row colors. <emphasis>DO NOT</emphasis> use it
+ * just because you prefer the appearance of the ruled tree; that's a
+ * question for the theme. Some themes will draw tree rows in
+ * alternating colors even when rules are turned off, and users who
+ * prefer that appearance all the time can choose those themes. You
+ * should call this function only as a <emphasis>semantic</emphasis>
+ * hint to the theme engine that your tree makes alternating colors
+ * useful from a functional standpoint (since it has lots of columns,
+ * generally).
+ *
+ **/
+void
+gtk_tree_view_set_rules_hint (GtkTreeView  *tree_view,
+                              gboolean      setting)
 {
-  GtkCellRenderer *cell;
-  GtkTreeViewColumn *column;
-  GList *list;
-  gint i;
-  gint retval = FALSE;
-  gint tmpheight;
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-  if (height)
-    *height = 0;
+  setting = setting != FALSE;
 
-  for (i = 0, list = tree_view->priv->column; list; list = list->next, i++)
+  if (tree_view->priv->has_rules != setting)
     {
-      gint width;
-      column = list->data;
-      if (column->dirty == TRUE || column->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
-       continue;
-      if (!column->visible)
-       continue;
+      tree_view->priv->has_rules = setting;
+      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+    }
 
-      cell = column->cell;
-      gtk_tree_view_column_set_cell_data (column, tree_view->priv->model, iter);
+  g_object_notify (G_OBJECT (tree_view), "rules_hint");
+}
 
-      if (height)
-       {
-         gtk_cell_renderer_get_size (cell, GTK_WIDGET (tree_view), &width, &tmpheight);
-         *height = MAX (*height, tmpheight);
-       }
-      else
-       {
-         gtk_cell_renderer_get_size (cell, GTK_WIDGET (tree_view), &width, NULL);
-       }
-      if (i == 0 && TREE_VIEW_DRAW_EXPANDERS (tree_view))
-       {
-         if (depth * tree_view->priv->tab_offset + width > column->size)
-           {
-             column->dirty = TRUE;
-             retval = TRUE;
-           }
-       }
-      else
-       {
-         if (width > column->size)
-           {
-             column->dirty = TRUE;
-             retval = TRUE;
-           }
-       }
-    }
+/**
+ * gtk_tree_view_get_rules_hint
+ * @tree_view: a #GtkTreeView
+ *
+ * Gets the setting set by gtk_tree_view_set_rules_hint().
+ *
+ * Return value: %TRUE if rules are useful for the user of this tree
+ **/
+gboolean
+gtk_tree_view_get_rules_hint (GtkTreeView  *tree_view)
+{
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
 
-  return retval;
+  return tree_view->priv->has_rules;
 }
 
-static void
-gtk_tree_view_discover_dirty (GtkTreeView *tree_view,
-                             GtkRBTree   *tree,
-                             GtkTreeIter *iter,
-                             gint         depth)
+/* Public Column functions
+ */
+
+/**
+ * gtk_tree_view_append_column:
+ * @tree_view: A #GtkTreeView.
+ * @column: The #GtkTreeViewColumn to add.
+ *
+ * Appends @column to the list of columns.
+ *
+ * Return value: The number of columns in @tree_view after appending.
+ **/
+gint
+gtk_tree_view_append_column (GtkTreeView       *tree_view,
+                            GtkTreeViewColumn *column)
 {
-  GtkRBNode *temp = tree->root;
-  GtkTreeViewColumn *column;
-  GList *list;
-  GtkTreeIter child;
-  gboolean is_all_dirty;
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
+  g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), -1);
+  g_return_val_if_fail (column->tree_view == NULL, -1);
 
-  TREE_VIEW_INTERNAL_ASSERT_VOID (tree != NULL);
+  return gtk_tree_view_insert_column (tree_view, column, -1);
+}
 
-  while (temp->left != tree->nil)
-    temp = temp->left;
 
-  do
+/**
+ * gtk_tree_view_remove_column:
+ * @tree_view: A #GtkTreeView.
+ * @column: The #GtkTreeViewColumn to remove.
+ *
+ * Removes @column from @tree_view.
+ *
+ * Return value: The number of columns in @tree_view after removing.
+ **/
+gint
+gtk_tree_view_remove_column (GtkTreeView       *tree_view,
+                             GtkTreeViewColumn *column)
+{
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
+  g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), -1);
+  g_return_val_if_fail (column->tree_view == GTK_WIDGET (tree_view), -1);
+
+  _gtk_tree_view_column_unset_tree_view (column);
+
+  if (tree_view->priv->focus_column == column)
+    tree_view->priv->focus_column = NULL;
+
+  tree_view->priv->columns = g_list_remove (tree_view->priv->columns, column);
+
+  tree_view->priv->n_columns--;
+
+  if (GTK_WIDGET_REALIZED (tree_view))
     {
-      is_all_dirty = TRUE;
-      for (list = tree_view->priv->column; list; list = list->next)
+      GList *list;
+
+      _gtk_tree_view_column_unrealize_button (column);
+      for (list = tree_view->priv->columns; list; list = list->next)
        {
-         column = list->data;
-         if (column->dirty == FALSE)
-           {
-             is_all_dirty = FALSE;
-             break;
-           }
+         column = GTK_TREE_VIEW_COLUMN (list->data);
+         if (column->visible)
+           column->dirty = TRUE;
        }
 
-      if (is_all_dirty)
-       return;
+      if (tree_view->priv->n_columns == 0 &&
+         gtk_tree_view_get_headers_visible (tree_view))
+       gdk_window_hide (tree_view->priv->header_window);
 
-      gtk_tree_view_discover_dirty_iter (tree_view,
-                                        iter,
-                                        depth,
-                                        FALSE);
-      if (gtk_tree_model_iter_children (tree_view->priv->model, &child, iter) &&
-         temp->children != NULL)
-       gtk_tree_view_discover_dirty (tree_view, temp->children, &child, depth + 1);
-      temp = _gtk_rbtree_next (tree, temp);
+      gtk_widget_queue_resize (GTK_WIDGET (tree_view));
     }
-  while (gtk_tree_model_iter_next (tree_view->priv->model, iter));
-}
 
+  g_object_unref (G_OBJECT (column));
+  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[COLUMNS_CHANGED], 0);
+
+  return tree_view->priv->n_columns;
+}
 
-static void
-gtk_tree_view_check_dirty (GtkTreeView *tree_view)
+/**
+ * gtk_tree_view_insert_column:
+ * @tree_view: A #GtkTreeView.
+ * @column: The #GtkTreeViewColumn to be inserted.
+ * @position: The position to insert @column in.
+ *
+ * This inserts the @column into the @tree_view at @position.  If @position is
+ * -1, then the column is inserted at the end.
+ *
+ * Return value: The number of columns in @tree_view after insertion.
+ **/
+gint
+gtk_tree_view_insert_column (GtkTreeView       *tree_view,
+                             GtkTreeViewColumn *column,
+                             gint               position)
 {
-  GtkTreePath *path;
-  gboolean dirty = FALSE;
-  GList *list;
-  GtkTreeViewColumn *column;
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
+  g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), -1);
+  g_return_val_if_fail (column->tree_view == NULL, -1);
+
+  g_object_ref (G_OBJECT (column));
 
-  for (list = tree_view->priv->column; list; list = list->next)
+  if (tree_view->priv->n_columns == 0 &&
+      GTK_WIDGET_REALIZED (tree_view) &&
+      gtk_tree_view_get_headers_visible (tree_view))
     {
-      column = list->data;
-      if (column->dirty)
+      gdk_window_show (tree_view->priv->header_window);
+    }
+
+  tree_view->priv->columns = g_list_insert (tree_view->priv->columns,
+                                           column, position);
+  tree_view->priv->n_columns++;
+
+  _gtk_tree_view_column_set_tree_view (column, tree_view);
+
+  if (GTK_WIDGET_REALIZED (tree_view))
+    {
+      GList *list;
+
+      _gtk_tree_view_column_realize_button (column);
+
+      for (list = tree_view->priv->columns; list; list = list->next)
        {
-         dirty = TRUE;
-         if (column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
-           {
-             column->size = column->button->requisition.width;
-           }
+         column = GTK_TREE_VIEW_COLUMN (list->data);
+         if (column->visible)
+           column->dirty = TRUE;
        }
+      gtk_widget_queue_resize (GTK_WIDGET (tree_view));
     }
-  if (dirty == FALSE)
-    return;
 
-  path = gtk_tree_path_new_root ();
-  if (path != NULL)
-    {
-      GtkTreeIter iter;
+  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[COLUMNS_CHANGED], 0);
 
-      gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
-      gtk_tree_path_free (path);
-      gtk_tree_view_calc_size (tree_view, tree_view->priv->tree, &iter, 1);
-      _gtk_tree_view_set_size (tree_view, -1, -1);
-    }
+  return tree_view->priv->n_columns;
+}
 
-  for (list = tree_view->priv->column; list; list = list->next)
+/**
+ * gtk_tree_view_insert_column_with_attributes:
+ * @tree_view: A #GtkTreeView
+ * @position: The position to insert the new column in.
+ * @title: The title to set the header to.
+ * @cell: The #GtkCellRenderer.
+ * @Varargs: A NULL terminated list of attributes.
+ *
+ * Creates a new #GtkTreeViewColumn and inserts it into the @tree_view at
+ * @position.  If @position is -1, then the newly created column is inserted at
+ * the end.  The column is initialized with the attributes given.
+ *
+ * Return value: The number of columns in @tree_view after insertion.
+ **/
+gint
+gtk_tree_view_insert_column_with_attributes (GtkTreeView     *tree_view,
+                                            gint             position,
+                                            gchar           *title,
+                                            GtkCellRenderer *cell,
+                                            ...)
+{
+  GtkTreeViewColumn *column;
+  gchar *attribute;
+  va_list args;
+  gint column_id;
+
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
+
+  column = gtk_tree_view_column_new ();
+
+  gtk_tree_view_column_set_title (column, title);
+  gtk_tree_view_column_set_cell_renderer (column, cell);
+
+  va_start (args, cell);
+
+  attribute = va_arg (args, gchar *);
+
+  while (attribute != NULL)
     {
-      column = list->data;
-      column->dirty = FALSE;
+      column_id = va_arg (args, gint);
+      gtk_tree_view_column_add_attribute (column, attribute, column_id);
+      attribute = va_arg (args, gchar *);
     }
+
+  va_end (args);
+
+  gtk_tree_view_insert_column (tree_view, column, position);
+  g_object_unref (column);
+
+  return tree_view->priv->n_columns;
 }
 
-static void
-gtk_tree_view_create_button (GtkTreeView *tree_view,
-                            gint         i)
+/**
+ * gtk_tree_view_insert_column_with_data_func:
+ * @tree_view: a #GtkTreeView
+ * @position: Position to insert, -1 for append
+ * @title: column title
+ * @cell: cell renderer for column
+ * @func: function to set attributes of cell renderer
+ * @data: data for @func
+ * @dnotify: destroy notifier for @data
+ *
+ * Convenience function that inserts a new column into the #GtkTreeView
+ * with the given cell renderer and a #GtkCellDataFunc to set cell renderer
+ * attributes (normally using data from the model). See also
+ * gtk_tree_view_column_set_cell_data_func(), gtk_tree_view_column_set_cell_renderer().
+ *
+ * Return value: number of columns in the tree view post-insert
+ **/
+gint
+gtk_tree_view_insert_column_with_data_func  (GtkTreeView               *tree_view,
+                                             gint                       position,
+                                             gchar                     *title,
+                                             GtkCellRenderer           *cell,
+                                             GtkTreeCellDataFunc        func,
+                                             gpointer                   data,
+                                             GDestroyNotify             dnotify)
 {
-  GtkWidget *button;
   GtkTreeViewColumn *column;
 
-  column = g_list_nth (tree_view->priv->column, i)->data;
-  gtk_widget_push_composite_child ();
-  button = column->button = gtk_button_new ();
-  gtk_widget_pop_composite_child ();
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
+
+  column = gtk_tree_view_column_new ();
+
+  gtk_tree_view_column_set_title (column, title);
+  gtk_tree_view_column_set_cell_renderer (column, cell);
+  gtk_tree_view_column_set_cell_data_func (column, func, data, dnotify);
 
-  gtk_widget_set_parent (button, GTK_WIDGET (tree_view));
+  gtk_tree_view_insert_column (tree_view, column, position);
 
-  gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                     (GtkSignalFunc) gtk_tree_view_button_clicked,
-                     (gpointer) tree_view);
+  g_object_unref (column);
+
+  return tree_view->priv->n_columns;
 }
 
-static void
-gtk_tree_view_create_buttons (GtkTreeView *tree_view)
+/**
+ * gtk_tree_view_get_column:
+ * @tree_view: A #GtkTreeView.
+ * @n: The position of the column, counting from 0.
+ *
+ * Gets the #GtkTreeViewColumn at the given position in the #tree_view.
+ *
+ * Return value: The #GtkTreeViewColumn, or NULL if the position is outside the
+ * range of columns.
+ **/
+GtkTreeViewColumn *
+gtk_tree_view_get_column (GtkTreeView *tree_view,
+                         gint         n)
 {
-  GtkWidget *alignment;
-  GtkWidget *label;
-  GtkRequisition requisition;
-  GList *list;
-  GtkTreeViewColumn *column;
-  gint i;
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
 
-  for (list = tree_view->priv->column, i = 0; list; list = list->next, i++)
-    {
-      column = list->data;
+  if (n < 0 || n >= tree_view->priv->n_columns)
+    return NULL;
 
-      gtk_tree_view_create_button (tree_view, i);
-      switch (column->justification)
-       {
-       case GTK_JUSTIFY_LEFT:
-         alignment = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
-         break;
-       case GTK_JUSTIFY_RIGHT:
-         alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-         break;
-       case GTK_JUSTIFY_CENTER:
-         alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-         break;
-       case GTK_JUSTIFY_FILL:
-       default:
-         alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-         break;
-       }
-      label = gtk_label_new (column->title);
+  if (tree_view->priv->columns == NULL)
+    return NULL;
 
-      gtk_container_add (GTK_CONTAINER (alignment), label);
-      gtk_container_add (GTK_CONTAINER (column->button), alignment);
+  return GTK_TREE_VIEW_COLUMN (g_list_nth (tree_view->priv->columns, n)->data);
+}
 
-      gtk_widget_show (label);
-      gtk_widget_show (alignment);
-      gtk_widget_size_request (column->button, &requisition);
+/**
+ * gtk_tree_view_get_columns:
+ * @tree_view: A #GtkTreeView
+ *
+ * Returns a #GList of all the #GtkTreeViewColumn s currently in @tree_view.
+ * The returned list must be freed with g_list_free ().
+ *
+ * Return value: A list of #GtkTreeViewColumn s
+ **/
+GList *
+gtk_tree_view_get_columns (GtkTreeView *tree_view)
+{
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
 
-      column->size = MAX (column->size, requisition.width);
-      tree_view->priv->header_height = MAX (tree_view->priv->header_height, requisition.height);
-    }
-  if (GTK_WIDGET_REALIZED (tree_view))
-    {
-      gtk_tree_view_realize_buttons (tree_view);
-      if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
-       {
-         /* We need to do this twice, as we need to map
-          * all the buttons before we map the columns */
-         for (list = tree_view->priv->column; list; list = list->next)
-           {
-             column = list->data;
-             if (column->visible == FALSE)
-               continue;
-             gtk_widget_map (column->button);
-           }
-         for (list = tree_view->priv->column; list; list = list->next)
-           {
-             column = list->data;
-             if (column->visible == FALSE)
-               continue;
-             if (column->column_type == GTK_TREE_VIEW_COLUMN_RESIZEABLE)
-               {
-                 gdk_window_raise (column->window);
-                 gdk_window_show (column->window);
-               }
-             else
-               gdk_window_hide (column->window);
-           }
-       }
-    }
+  return g_list_copy (tree_view->priv->columns);
 }
 
-static void
-gtk_tree_view_button_clicked (GtkWidget *widget,
-                             gpointer   data)
+/**
+ * gtk_tree_view_move_column_after:
+ * @tree_view: A #GtkTreeView
+ * @column: The #GtkTreeViewColumn to be moved.
+ * @base_column: The #GtkTreeViewColumn to be moved relative to.
+ *
+ * Moves @column to be after to @base_column.  If @base_column is NULL, then
+ * @column is placed in the first position.
+ **/
+void
+gtk_tree_view_move_column_after (GtkTreeView       *tree_view,
+                                GtkTreeViewColumn *column,
+                                GtkTreeViewColumn *base_column)
 {
-  GList *list;
-  GtkTreeView *tree_view;
+  GList *column_list_el, *base_el = NULL;
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_TREE_VIEW (data));
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-  tree_view = GTK_TREE_VIEW (data);
+  column_list_el = g_list_find (tree_view->priv->columns, column);
+  g_return_if_fail (column_list_el != NULL);
 
-  /* find the column who's button was pressed */
-  for (list = tree_view->priv->column; list; list = list->next)
-    if (GTK_TREE_VIEW_COLUMN (list->data)->button == widget)
-      break;
+  if (base_column)
+    {
+      base_el = g_list_find (tree_view->priv->columns, base_column);
+      g_return_if_fail (base_el != NULL);
+    }
+
+  if (column_list_el->prev == base_el)
+    return;
+
+  tree_view->priv->columns = g_list_remove_link (tree_view->priv->columns, column_list_el);
+  if (base_el == NULL)
+    {
+      column_list_el->prev = NULL;
+      column_list_el->next = tree_view->priv->columns;
+      if (column_list_el->next)
+       column_list_el->next->prev = column_list_el;
+      tree_view->priv->columns = column_list_el;
+    }
+  else
+    {
+      column_list_el->prev = base_el;
+      column_list_el->next = base_el->next;
+      if (column_list_el->next)
+       column_list_el->next->prev = column_list_el;
+      base_el->next = column_list_el;
+    }
+
+  if (GTK_WIDGET_REALIZED (tree_view))
+    {
+      //gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+      _gtk_tree_view_update_size (tree_view);
+      gtk_tree_view_size_allocate_buttons (GTK_WIDGET (tree_view));
+    }
 
-  /* FIXME:
-   * gtk_signal_emit (GTK_OBJECT (clist), clist_signals[CLICK_COLUMN], i); */
+  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[COLUMNS_CHANGED], 0);
 }
 
-/* Make sure the node is visible vertically */
-static void
-gtk_tree_view_clamp_node_visible (GtkTreeView *tree_view,
-                                 GtkRBTree   *tree,
-                                 GtkRBNode   *node)
+/**
+ * gtk_tree_view_set_expander_column:
+ * @tree_view: A #GtkTreeView
+ * @col: The column to draw the expander arrow at.
+ *
+ * Sets the column offset to draw the expander arrow at.
+ **/
+void
+gtk_tree_view_set_expander_column (GtkTreeView *tree_view,
+                                   gint         col)
 {
-  gint offset;
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-  offset = _gtk_rbtree_node_find_offset (tree, node);
+  if (tree_view->priv->expander_column != col)
+    {
+      tree_view->priv->expander_column = col;
 
-  /* we reverse the order, b/c in the unusual case of the
-   * node's height being taller then the visible area, we'd rather
-   * have the node flush to the top
-   */
-  if (offset + GTK_RBNODE_GET_HEIGHT (node) >
-      tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size)
-    gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment),
-                             offset + GTK_RBNODE_GET_HEIGHT (node) -
-                             tree_view->priv->vadjustment->page_size);
-  if (offset < tree_view->priv->vadjustment->value)
-    gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment),
-                             offset);
+      g_object_notify (G_OBJECT (tree_view), "expander_column");
+    }
 }
 
-/* This function could be more efficient.
- * I'll optimize it if profiling seems to imply that
- * it's important */
-GtkTreePath *
-_gtk_tree_view_find_path (GtkTreeView *tree_view,
-                         GtkRBTree   *tree,
-                         GtkRBNode   *node)
+/**
+ * gtk_tree_view_get_expander_column:
+ * @tree_view:
+ *
+ * Returns the offset of the column that is the current expander column.  This
+ * column has the expander arrow drawn next to it.
+ *
+ * Return value: The offset of the expander column.
+ **/
+gint
+gtk_tree_view_get_expander_column (GtkTreeView *tree_view)
 {
-  GtkTreePath *path;
-  GtkRBTree *tmp_tree;
-  GtkRBNode *tmp_node, *last;
-  gint count;
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
 
-  path = gtk_tree_path_new ();
+  return tree_view->priv->expander_column;
+}
 
-  g_return_val_if_fail (node != NULL, path);
-  g_return_val_if_fail (node != tree->nil, path);
 
-  count = 1 + node->left->count;
+/**
+ * gtk_tree_view_set_column_drag_function:
+ * @tree_view: A #GtkTreeView.
+ * @func: A function to determine which columns are reorderable, or NULL.
+ * @user_data: User data to be passed to @func, or NULL
+ * @destroy: Destroy notifier for @user_data, or NULL
+ *
+ * Sets a user function for determining where a column may be dropped when
+ * dragged.  This function is called on every column pair in turn at the
+ * beginning of a column drag to determine where a drop can take place.  The
+ * arguments passed to @func are: the @tree_view, the #GtkTreeViewColumn being
+ * dragged, the two #GtkTreeViewColumn s determining the drop spot, and
+ * @user_data.  If either of the #GtkTreeViewColumn arguments for the drop spot
+ * are NULL, then they indicate an edge.  If @func is set to be NULL, then
+ * @tree_view reverts to the default behavior of allowing all columns to be
+ * dropped everywhere.
+ **/
+void
+gtk_tree_view_set_column_drag_function (GtkTreeView               *tree_view,
+                                       GtkTreeViewColumnDropFunc  func,
+                                       gpointer                   user_data,
+                                       GtkDestroyNotify           destroy)
+{
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-  last = node;
-  tmp_node = node->parent;
-  tmp_tree = tree;
-  while (tmp_tree)
-    {
-      while (tmp_node != tmp_tree->nil)
-       {
-         if (tmp_node->right == last)
-           count += 1 + tmp_node->left->count;
-         last = tmp_node;
-         tmp_node = tmp_node->parent;
-       }
-      gtk_tree_path_prepend_index (path, count - 1);
-      last = tmp_tree->parent_node;
-      tmp_tree = tmp_tree->parent_tree;
-      if (last)
-       {
-         count = 1 + last->left->count;
-         tmp_node = last->parent;
-       }
-    }
-  return path;
+  if (tree_view->priv->column_drop_func_data_destroy)
+    (* tree_view->priv->column_drop_func_data_destroy) (tree_view->priv->column_drop_func_data);
+
+  tree_view->priv->column_drop_func = func;
+  tree_view->priv->column_drop_func_data = user_data;
+  tree_view->priv->column_drop_func_data_destroy = destroy;
 }
 
-/* Returns whether or not it's a parent, or not */
-gboolean
-_gtk_tree_view_find_node (GtkTreeView  *tree_view,
-                         GtkTreePath  *path,
-                         GtkRBTree   **tree,
-                         GtkRBNode   **node)
+/**
+ * gtk_tree_view_scroll_to_point:
+ * @tree_view: a #GtkTreeView
+ * @tree_x: X coordinate of new top-left pixel of visible area
+ * @tree_y: Y coordinate of new top-left pixel of visible area
+ *
+ * Scrolls the tree view such that the top-left corner of the visible
+ * area is @tree_x, @tree_y, where @tree_x and @tree_y are specified
+ * in tree window coordinates.  The @tree_view must be realized before
+ * this function is called.  If it isn't, you probably want ot be
+ * using gtk_tree_view_scroll_to_cell.
+ **/
+void
+gtk_tree_view_scroll_to_point (GtkTreeView *tree_view,
+                               gint         tree_x,
+                               gint         tree_y)
 {
-  GtkRBNode *tmpnode = NULL;
-  GtkRBTree *tmptree = tree_view->priv->tree;
-  gint *indices = gtk_tree_path_get_indices (path);
-  gint depth = gtk_tree_path_get_depth (path);
-  gint i = 0;
+  GtkAdjustment *hadj;
+  GtkAdjustment *vadj;
 
-  *node = NULL;
-  *tree = NULL;
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+  g_return_if_fail (GTK_WIDGET_REALIZED (tree_view));
 
-  do
-    {
-      if (tmptree == NULL)
-       {
-         *node = tmpnode;
-         *tree = tmptree;
-         return TRUE;
-       }
-      tmpnode = _gtk_rbtree_find_count (tmptree, indices[i] + 1);
-      if (++i >= depth)
-       {
-         *node = tmpnode;
-         *tree = tmptree;
-         return FALSE;
-       }
-      tmptree = tmpnode->children;
-    }
-  while (1);
+  hadj = tree_view->priv->hadjustment;
+  vadj = tree_view->priv->vadjustment;
+
+  gtk_adjustment_set_value (hadj, CLAMP (tree_x, hadj->lower, hadj->upper));
+  gtk_adjustment_set_value (vadj, CLAMP (tree_y, vadj->lower, vadj->upper));
 }
 
-/* x and y are the mouse position
- */
-static void
-gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
-                         GtkRBNode   *node,
-                         gint         offset,
-                         gint         x,
-                         gint         y)
+/**
+ * gtk_tree_view_scroll_to_cell
+ * @tree_view: A #GtkTreeView.
+ * @path: The path of the row to move to.
+ * @column: The #GtkTreeViewColumn to move horizontally to.
+ * @row_align: The vertical alignment of the row specified by @path.
+ * @col_align: The horizontal alignment of the column specified by @column.
+ *
+ * Moves the alignments of @tree_view to the position specified by
+ * @column and @path.  If @column is NULL, then no horizontal
+ * scrolling occurs.  Likewise, if @path is NULL no vertical scrolling
+ * occurs.  @row_align determines where the row is placed, and
+ * @col_align determines where @column is placed.  Both are expected
+ * to be between 0.0 and 1.0. 0.0 means left/top alignment, 1.0 means
+ * right/bottom alignment, 0.5 means center.
+ **/
+void
+gtk_tree_view_scroll_to_cell (GtkTreeView       *tree_view,
+                              GtkTreePath       *path,
+                              GtkTreeViewColumn *column,
+                              gfloat             row_align,
+                              gfloat             col_align)
 {
-  GdkRectangle area;
-  GtkStateType state;
-  GtkShadowType shadow;
-  GdkPoint points[3];
+  GdkRectangle cell_rect;
+  GdkRectangle vis_rect;
+  gint dest_x, dest_y;
 
-  if (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT))
-    return;
+  /* FIXME work on unmapped/unrealized trees? maybe implement when
+   * we do incremental reflow for trees
+   */
 
-  area.x = 0;
-  area.y = offset + TREE_VIEW_VERTICAL_SEPERATOR;
-  area.width = tree_view->priv->tab_offset - 2;
-  area.height = GTK_RBNODE_GET_HEIGHT (node) - TREE_VIEW_VERTICAL_SEPERATOR;
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+  g_return_if_fail (row_align >= 0.0);
+  g_return_if_fail (row_align <= 1.0);
+  g_return_if_fail (col_align >= 0.0);
+  g_return_if_fail (col_align <= 1.0);
+  g_return_if_fail (path != NULL || column != NULL);
 
-  if (node == tree_view->priv->button_pressed_node)
-    {
-      if (x >= area.x && x <= (area.x + area.width) &&
-         y >= area.y && y <= (area.y + area.height))
-       {
-         state = GTK_STATE_ACTIVE;
-         shadow = GTK_SHADOW_IN;
-       }
-      else
-       {
-         state = GTK_STATE_NORMAL;
-         shadow = GTK_SHADOW_OUT;
-       }
-    }
-  else
+  row_align = CLAMP (row_align, 0.0, 1.0);
+  col_align = CLAMP (col_align, 0.0, 1.0);
+
+  if (! GTK_WIDGET_REALIZED (tree_view))
     {
-      state = (node==tree_view->priv->prelight_node&&GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT)?GTK_STATE_PRELIGHT:GTK_STATE_NORMAL);
-      shadow = GTK_SHADOW_OUT;
+      if (path)
+       tree_view->priv->scroll_to_path = gtk_tree_path_copy (path);
+      if (column)
+       tree_view->priv->scroll_to_column = column;
+      tree_view->priv->scroll_to_row_align = row_align;
+      tree_view->priv->scroll_to_col_align = col_align;
+
+      return;
     }
 
-  if (node->children == NULL)
+  gtk_tree_view_get_cell_area (tree_view, path, column, &cell_rect);
+  gtk_tree_view_get_visible_rect (tree_view, &vis_rect);
+
+  dest_x = vis_rect.x;
+  dest_y = vis_rect.y;
+
+  if (path)
     {
-      points[0].x = area.x + 2;
-      points[0].y = area.y + (area.height - TREE_VIEW_EXPANDER_HEIGHT)/2;
-      points[1].x = points[0].x + TREE_VIEW_EXPANDER_WIDTH/2;
-      points[1].y = points[0].y + TREE_VIEW_EXPANDER_HEIGHT/2;
-      points[2].x = points[0].x;
-      points[2].y = points[0].y + TREE_VIEW_EXPANDER_HEIGHT;
+      dest_x = cell_rect.x +
+        cell_rect.width * row_align -
+        vis_rect.width * row_align;
     }
-  else
+
+  if (column)
     {
-      points[0].x = area.x;
-      points[0].y = area.y + (area.height - TREE_VIEW_EXPANDER_WIDTH/2)/2;
-      points[1].x = points[0].x + TREE_VIEW_EXPANDER_WIDTH;
-      points[1].y = points[0].y;
-      points[2].x = points[0].x + (TREE_VIEW_EXPANDER_WIDTH) /2;
-      points[2].y = points[0].y + TREE_VIEW_EXPANDER_HEIGHT/2;
+      dest_y = cell_rect.y +
+        cell_rect.height * col_align -
+        vis_rect.height * col_align;
     }
 
-  gdk_draw_polygon (tree_view->priv->bin_window,
-                   GTK_WIDGET (tree_view)->style->base_gc[state],
-                   TRUE, points, 3);
-  gdk_draw_polygon (tree_view->priv->bin_window,
-                   GTK_WIDGET (tree_view)->style->fg_gc[state],
-                   FALSE, points, 3);
-
-
-  /*    gtk_paint_arrow (GTK_WIDGET (tree_view)->style, */
-  /*              tree_view->priv->bin_window, */
-  /*              state, */
-  /*              shadow, */
-  /*              &area, */
-  /*              GTK_WIDGET (tree_view), */
-  /*              "GtkTreeView", */
-  /*              arrow_dir, */
-  /*              TRUE, */
-  /*              area.x, area.y, */
-  /*              area.width, area.height); */
+  gtk_tree_view_scroll_to_point (tree_view, dest_x, dest_y);
 }
 
+
+/**
+ * gtk_tree_view_row_activated:
+ * @tree_view: A #GtkTreeView
+ * @path: The #GtkTreePath to be activated.
+ * @column: The #GtkTreeViewColumn to be activated.
+ *
+ * Activates the cell determined by @path and @column.
+ **/
 void
-_gtk_tree_view_set_size (GtkTreeView     *tree_view,
-                        gint           width,
-                        gint           height)
+gtk_tree_view_row_activated (GtkTreeView       *tree_view,
+                            GtkTreePath       *path,
+                            GtkTreeViewColumn *column)
 {
-  GList *list;
-  GtkTreeViewColumn *column;
-  gint i;
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-  if (tree_view->priv->model == NULL)
-    {
-      tree_view->priv->width = 1;
-      tree_view->priv->height = 1;
-      return;
-    }
-  if (width == -1)
-    {
-      width = 0;
-      for (list = tree_view->priv->column, i = 0; list; list = list->next, i++)
-       {
-         column = list->data;
-         if (!column->visible)
-           continue;
-         width += TREE_VIEW_COLUMN_SIZE (column);
-       }
-    }
-  if (height == -1)
-    height = tree_view->priv->tree->root->offset + TREE_VIEW_VERTICAL_SEPERATOR;
+  /* FIXME: Actually activate the path internally, not just emit the signal */
+  /*  g_warning ("FIXME: Actually activate the path internally, not just emit the signal\n"); */
+  g_signal_emit (G_OBJECT(tree_view), tree_view_signals[ROW_ACTIVATED], 0, path, column);
+}
 
-  tree_view->priv->width = width;
-  tree_view->priv->height = height;
 
-  if (tree_view->priv->hadjustment->upper != tree_view->priv->width)
-    {
-      tree_view->priv->hadjustment->upper = tree_view->priv->width;
-      gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->hadjustment), "changed");
-    }
+static void
+gtk_tree_view_expand_all_helper (GtkRBTree  *tree,
+                                GtkRBNode  *node,
+                                gpointer  data)
+{
+  GtkTreeView *tree_view = data;
 
-  if (tree_view->priv->vadjustment->upper != tree_view->priv->height)
+  if (node->children)
+    _gtk_rbtree_traverse (node->children,
+                         node->children->root,
+                         G_PRE_ORDER,
+                         gtk_tree_view_expand_all_helper,
+                         data);
+  else if ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT && node->children == NULL)
     {
-      tree_view->priv->vadjustment->upper = tree_view->priv->height;
-      gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->vadjustment), "changed");
-    }
+      GtkTreePath *path;
+      GtkTreeIter iter;
+      GtkTreeIter child;
 
-  if (GTK_WIDGET_REALIZED (tree_view))
-    {
-      gdk_window_resize (tree_view->priv->bin_window, MAX (width, GTK_WIDGET (tree_view)->allocation.width), height + TREE_VIEW_HEADER_HEIGHT (tree_view));
-      gdk_window_resize (tree_view->priv->header_window, MAX (width, GTK_WIDGET (tree_view)->allocation.width), tree_view->priv->header_height);
+      node->children = _gtk_rbtree_new ();
+      node->children->parent_tree = tree;
+      node->children->parent_node = node;
+      path = _gtk_tree_view_find_path (tree_view, tree, node);
+      gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
+      gtk_tree_model_iter_children (tree_view->priv->model, &child, &iter);
+      gtk_tree_view_build_tree (tree_view,
+                               node->children,
+                               &child,
+                               gtk_tree_path_get_depth (path) + 1,
+                               TRUE,
+                               GTK_WIDGET_REALIZED (tree_view));
+      gtk_tree_path_free (path);
     }
-  gtk_widget_queue_resize (GTK_WIDGET (tree_view));
 }
 
-/* this function returns the new width of the column being resized given
- * the column and x position of the cursor; the x cursor position is passed
- * in as a pointer and automagicly corrected if it's beyond min/max limits */
-static gint
-gtk_tree_view_new_column_width (GtkTreeView *tree_view,
-                               gint       i,
-                               gint      *x)
+/**
+ * gtk_tree_view_expand_all:
+ * @tree_view: A #GtkTreeView.
+ *
+ * Recursively expands all nodes in the @tree_view.
+ **/
+void
+gtk_tree_view_expand_all (GtkTreeView *tree_view)
 {
-  GtkTreeViewColumn *column;
-  gint width;
-
-  /* first translate the x position from widget->window
-   * to clist->clist_window */
-
-  column = g_list_nth (tree_view->priv->column, i)->data;
-  width = *x - column->button->allocation.x;
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+  g_return_if_fail (tree_view->priv->tree != NULL);
 
-  /* Clamp down the value */
-  if (column->min_width == -1)
-    width = MAX (column->button->requisition.width,
-                width);
-  else
-    width = MAX (column->min_width,
-                width);
-  if (column->max_width != -1)
-    width = MIN (width, column->max_width != -1);
-  *x = column->button->allocation.x + width;
+  _gtk_rbtree_traverse (tree_view->priv->tree,
+                       tree_view->priv->tree->root,
+                       G_PRE_ORDER,
+                       gtk_tree_view_expand_all_helper,
+                       tree_view);
 
-  return width;
+  _gtk_tree_view_update_size (tree_view);
 }
 
-/* Callbacks */
 static void
-gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment,
-                                 GtkTreeView     *tree_view)
+gtk_tree_view_collapse_all_helper (GtkRBTree  *tree,
+                                  GtkRBNode  *node,
+                                  gpointer    data)
 {
-  if (GTK_WIDGET_REALIZED (tree_view))
+  if (node->children)
     {
-      gdk_window_move (tree_view->priv->bin_window,
-                      - tree_view->priv->hadjustment->value,
-                      - tree_view->priv->vadjustment->value);
-      gdk_window_move (tree_view->priv->header_window,
-                      - tree_view->priv->hadjustment->value,
-                      0);
+      GtkTreePath *path;
+      GtkTreeIter iter;
 
-      gdk_window_process_updates (tree_view->priv->bin_window, TRUE);
-      gdk_window_process_updates (tree_view->priv->header_window, TRUE);
+      path = _gtk_tree_view_find_path (GTK_TREE_VIEW (data),
+                                      node->children,
+                                      node->children->root);
+      gtk_tree_model_get_iter (GTK_TREE_VIEW (data)->priv->model,
+                              &iter,
+                              path);
+      gtk_tree_view_discover_dirty (GTK_TREE_VIEW (data),
+                                   node->children,
+                                   &iter,
+                                   gtk_tree_path_get_depth (path));
+
+      /* Ensure we don't have a dangling pointer to a dead node */
+      ensure_unprelighted (GTK_TREE_VIEW (data));
+
+      _gtk_rbtree_remove (node->children);
+      gtk_tree_path_free (path);
     }
 }
 
-\f
+/**
+ * gtk_tree_view_collapse_all:
+ * @tree_view: A #GtkTreeView.
+ *
+ * Recursively collapses all visible, expanded nodes in @tree_view.
+ **/
+void
+gtk_tree_view_collapse_all (GtkTreeView *tree_view)
+{
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+  g_return_if_fail (tree_view->priv->tree != NULL);
 
-/* Public methods
+  _gtk_rbtree_traverse (tree_view->priv->tree,
+                       tree_view->priv->tree->root,
+                       G_PRE_ORDER,
+                       gtk_tree_view_collapse_all_helper,
+                       tree_view);
+
+  if (GTK_WIDGET_MAPPED (tree_view))
+    gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+}
+
+/* FIXME the bool return values for expand_row and collapse_row are
+ * not analagous; they should be TRUE if the row had children and
+ * was not already in the requested state.
  */
 
+
+static gboolean
+gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
+                              GtkTreePath *path,
+                              GtkRBTree   *tree,
+                              GtkRBNode   *node,
+                              gboolean     open_all)
+{
+  GtkTreeIter iter;
+  GtkTreeIter child;
+  gboolean expand;
+
+  if (node->children)
+    return TRUE;
+
+  gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
+  if (! gtk_tree_model_iter_has_child (tree_view->priv->model, &iter))
+    return FALSE;
+
+  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[TEST_EXPAND_ROW], 0, &iter, path, &expand);
+
+  if (expand)
+    return FALSE;
+
+  node->children = _gtk_rbtree_new ();
+  node->children->parent_tree = tree;
+  node->children->parent_node = node;
+
+  gtk_tree_model_iter_children (tree_view->priv->model, &child, &iter);
+  gtk_tree_view_build_tree (tree_view,
+                           node->children,
+                           &child,
+                           gtk_tree_path_get_depth (path) + 1,
+                           open_all,
+                           GTK_WIDGET_REALIZED (tree_view));
+
+  if (GTK_WIDGET_MAPPED (tree_view))
+    {
+      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+      _gtk_tree_view_update_size (tree_view);
+    }
+
+  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[ROW_EXPANDED], 0, &iter, path);
+
+  return TRUE;
+}
+
+
 /**
- * gtk_tree_view_new:
- * 
- * Creates a new #GtkTreeView widget.
- * 
- * Return value: A newly created #GtkTreeView widget.
+ * gtk_tree_view_expand_row:
+ * @tree_view: a #GtkTreeView
+ * @path: path to a row
+ * @open_all: whether to recursively expand, or just expand immediate children
+ *
+ * Opens the row so its children are visible
+ *
+ * Return value: %TRUE if the row existed and had children
  **/
-GtkWidget *
-gtk_tree_view_new (void)
+gboolean
+gtk_tree_view_expand_row (GtkTreeView *tree_view,
+                         GtkTreePath *path,
+                         gboolean     open_all)
 {
-  GtkTreeView *tree_view;
+  GtkRBTree *tree;
+  GtkRBNode *node;
+
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+  g_return_val_if_fail (tree_view->priv->model != NULL, FALSE);
+  g_return_val_if_fail (path != NULL, FALSE);
+
+  if (_gtk_tree_view_find_node (tree_view,
+                               path,
+                               &tree,
+                               &node))
+    return FALSE;
+
+  return gtk_tree_view_real_expand_row (tree_view, path, tree, node, open_all);
+}
+
+static gboolean
+gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
+                                GtkTreePath *path,
+                                GtkRBTree   *tree,
+                                GtkRBNode   *node)
+{
+  GtkTreeIter iter;
+  gboolean collapse;
+
+  gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
+
+  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[TEST_COLLAPSE_ROW], 0, &iter, path, &collapse);
+
+  if (collapse)
+    return FALSE;
 
-  tree_view = GTK_TREE_VIEW (gtk_type_new (gtk_tree_view_get_type ()));
+  TREE_VIEW_INTERNAL_ASSERT (gtk_tree_model_iter_children (tree_view->priv->model,
+                                                          &iter,
+                                                          &iter),
+                            FALSE);
+  gtk_tree_view_discover_dirty (tree_view,
+                               node->children,
+                               &iter,
+                               gtk_tree_path_get_depth (path));
 
-  return GTK_WIDGET (tree_view);
-}
+  /* Ensure we don't have a dangling pointer to a dead node */
+  ensure_unprelighted (tree_view);
 
-/**
- * gtk_tree_view_new_with_model:
- * @model: the model.
- * 
- * Creates a new #GtkTreeView widget with the model initialized to @model.
- * 
- * Return value: A newly created #GtkTreeView widget.
- **/
-GtkWidget *
-gtk_tree_view_new_with_model (GtkTreeModel *model)
-{
-  GtkTreeView *tree_view;
+  g_assert (tree_view->priv->prelight_node == NULL);
 
-  tree_view = GTK_TREE_VIEW (gtk_type_new (gtk_tree_view_get_type ()));
-  gtk_tree_view_set_model (tree_view, model);
+  gtk_tree_view_unref_tree (tree_view, node->children);
+  _gtk_rbtree_remove (node->children);
 
-  return GTK_WIDGET (tree_view);
+  if (GTK_WIDGET_MAPPED (tree_view))
+    {
+      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+      _gtk_tree_view_update_size (tree_view);
+    }
+
+  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[ROW_COLLAPSED], 0, &iter, path);
+
+  return TRUE;
 }
 
 /**
- * gtk_tree_view_get_model:
+ * gtk_tree_view_collapse_row:
  * @tree_view: a #GtkTreeView
- * 
- * Returns the model the the #GtkTreeView is based on.  Returns NULL if the
- * model is unset.
- * 
- * Return value: A #GtkTreeModel, or NULL if none is currently being used.
+ * @path: path to a row in the @tree_view
+ *
+ * Collapses a row (hides its child rows, if they exist.)
+ *
+ * Return value: %TRUE if the row was collapsed.
  **/
-GtkTreeModel *
-gtk_tree_view_get_model (GtkTreeView *tree_view)
+gboolean
+gtk_tree_view_collapse_row (GtkTreeView *tree_view,
+                           GtkTreePath *path)
 {
-  g_return_val_if_fail (tree_view != NULL, NULL);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
+  GtkRBTree *tree;
+  GtkRBNode *node;
 
-  return tree_view->priv->model;
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+  g_return_val_if_fail (tree_view->priv->tree != NULL, FALSE);
+  g_return_val_if_fail (path != NULL, FALSE);
+
+  if (_gtk_tree_view_find_node (tree_view,
+                               path,
+                               &tree,
+                               &node))
+    return FALSE;
+
+  if (node->children == NULL)
+    return FALSE;
+
+  return gtk_tree_view_real_collapse_row (tree_view, path, tree, node);
 }
 
 static void
-gtk_tree_view_set_model_realized (GtkTreeView *tree_view)
+gtk_tree_view_map_expanded_rows_helper (GtkTreeView            *tree_view,
+                                       GtkRBTree              *tree,
+                                       GtkTreePath            *path,
+                                       GtkTreeViewMappingFunc  func,
+                                       gpointer                user_data)
 {
-  GtkTreePath *path;
-  GtkTreeIter iter;
+  GtkRBNode *node;
+  gint *indices;
+  gint depth;
+  gint i = 0;
 
-  tree_view->priv->tree = _gtk_rbtree_new ();
-
-  gtk_signal_connect (GTK_OBJECT (tree_view->priv->model),
-                     "changed",
-                     gtk_tree_view_changed,
-                     tree_view);
-  gtk_signal_connect (GTK_OBJECT (tree_view->priv->model),
-                     "inserted",
-                     gtk_tree_view_inserted,
-                     tree_view);
-  gtk_signal_connect (GTK_OBJECT (tree_view->priv->model),
-                     "child_toggled",
-                     gtk_tree_view_child_toggled,
-                     tree_view);
-  gtk_signal_connect (GTK_OBJECT (tree_view->priv->model),
-                     "deleted",
-                     gtk_tree_view_deleted,
-                     tree_view);
-
-  if (tree_view->priv->column == NULL)
+  if (tree == NULL || tree->root == NULL)
     return;
 
-  path = gtk_tree_path_new_root ();
-  if (path == NULL)
-    return;
+  node = tree->root;
 
-  gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
-  gtk_tree_path_free (path);
-  gtk_tree_view_build_tree (tree_view, tree_view->priv->tree, &iter, 1, FALSE, GTK_WIDGET_REALIZED (tree_view));
+  indices = gtk_tree_path_get_indices (path);
+  depth = gtk_tree_path_get_depth (path);
 
-  gtk_tree_view_create_buttons (tree_view);
-  GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_MODEL_SETUP);
+  while (node && node->left != tree->nil)
+    node = node->left;
+
+  while (node)
+    {
+      if (node->children)
+       {
+         gtk_tree_path_append_index (path, 0);
+         gtk_tree_view_map_expanded_rows_helper (tree_view, node->children, path, func, user_data);
+         gtk_tree_path_up (path);
+         (* func) (tree_view, path, user_data);
+       }
+      i++;
+      indices[depth -1] = i;
+      node = _gtk_rbtree_next (tree, node);
+    }
 }
 
 /**
- * gtk_tree_view_set_model:
- * @tree_view: A #GtkTreeNode.
- * @model: The model.
- * 
- * Sets the model for a #GtkTreeView.  If the @tree_view already has a model
- * set, it will remove it before setting the new model.  If @model is NULL, then
- * it will unset the old model.
+ * gtk_tree_view_map_expanded_rows:
+ * @tree_view: A #GtkTreeView
+ * @func: A function to be called
+ * @data: User data to be passed to the function.
+ *
+ * Calls @func on all expanded rows.
  **/
 void
-gtk_tree_view_set_model (GtkTreeView  *tree_view,
-                        GtkTreeModel *model)
+gtk_tree_view_map_expanded_rows (GtkTreeView            *tree_view,
+                                GtkTreeViewMappingFunc  func,
+                                gpointer                user_data)
 {
-  GList *list;
-  GtkTreeViewColumn *column;
+  GtkTreePath *path;
 
-  g_return_if_fail (tree_view != NULL);
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+  g_return_if_fail (func != NULL);
 
-  if (tree_view->priv->model != NULL)
-    {
-      for (list = tree_view->priv->column; list; list = list->next)
-       {
-         column = list->data;
-         if (column->button)
-           {
-             gtk_widget_unparent (column->button);
-             gdk_window_set_user_data (column->window, NULL);
-             gdk_window_destroy (column->window);
-           }
-       }
-      if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_MODEL_SETUP))
-       {
-         gtk_signal_disconnect_by_func (GTK_OBJECT (tree_view->priv->model),
-                                        gtk_tree_view_changed,
-                                        tree_view);
-         gtk_signal_disconnect_by_func (GTK_OBJECT (tree_view->priv->model),
-                                        gtk_tree_view_inserted,
-                                        tree_view);
-         gtk_signal_disconnect_by_func (GTK_OBJECT (tree_view->priv->model),
-                                        gtk_tree_view_child_toggled,
-                                        tree_view);
-         gtk_signal_disconnect_by_func (GTK_OBJECT (tree_view->priv->model),
-                                        gtk_tree_view_deleted,
-                                        tree_view);
-         _gtk_rbtree_free (tree_view->priv->tree);
-       }
-
-      g_list_free (tree_view->priv->column);
-      tree_view->priv->column = NULL;
-      GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_MODEL_SETUP);
-    }
+  path = gtk_tree_path_new_root ();
 
-  tree_view->priv->model = model;
-  if (model == NULL)
-    {
-      tree_view->priv->tree = NULL;
-      tree_view->priv->columns = 0;
-      tree_view->priv->column = NULL;
-      if (GTK_WIDGET_REALIZED (tree_view))
-       _gtk_tree_view_set_size (tree_view, 0, 0);
-      return;
-    }
+  gtk_tree_view_map_expanded_rows_helper (tree_view,
+                                         tree_view->priv->tree,
+                                         path, func, user_data);
 
-  if (GTK_WIDGET_REALIZED (tree_view))
-    {
-      gtk_tree_view_set_model_realized (tree_view);
-      _gtk_tree_view_set_size (tree_view, -1, -1);
-    }
+  gtk_tree_path_free (path);
 }
 
+static GtkTargetEntry row_targets[] = {
+  { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, 0 }
+};
+
 /**
- * gtk_tree_view_get_selection:
+ * gtk_tree_view_set_reorderable:
  * @tree_view: A #GtkTreeView.
- * 
- * Gets the #GtkTreeSelection associated with @tree_view.
- * 
- * Return value: A #GtkTreeSelection object.
+ * @reorderable: TRUE, if the tree can be reordered.
+ *
+ * This function is a convenience function to allow you to reorder models that
+ * support the #GtkDragSourceIface and the #GtkDragDestIface.  Both
+ * #GtkTreeStore and #GtkListStore support these.  If @reorderable is TRUE, then
+ * the user can reorder the model by dragging and dropping columns.  The
+ * developer will can listen to these changes by connecting to the model's
+ * signals.
+ *
+ * This function does not give you any degree of control over the order -- any
+ * reorderering is allowed.  If more control is needed, you should probably
+ * handle drag and drop manually.
  **/
-GtkTreeSelection *
-gtk_tree_view_get_selection (GtkTreeView *tree_view)
+void
+gtk_tree_view_set_reorderable (GtkTreeView *tree_view,
+                              gboolean     reorderable)
 {
-  g_return_val_if_fail (tree_view != NULL, NULL);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-  if (tree_view->priv->selection == NULL)
-    gtk_tree_selection_new_with_tree_view (tree_view);
+  if (tree_view->priv->reorderable == (reorderable?TRUE:FALSE))
+    return;
 
-  return tree_view->priv->selection;
+  gtk_tree_view_set_rows_drag_source (tree_view,
+                                      GDK_BUTTON1_MASK,
+                                      row_targets,
+                                      G_N_ELEMENTS (row_targets),
+                                      GDK_ACTION_MOVE,
+                                      NULL, NULL);
+  gtk_tree_view_set_rows_drag_dest (tree_view,
+                                    row_targets,
+                                    G_N_ELEMENTS (row_targets),
+                                    GDK_ACTION_MOVE,
+                                    NULL, NULL);
+
+  g_object_notify (G_OBJECT (tree_view), "reorderable");
 }
 
-/**
- * gtk_tree_view_get_hadjustment:
- * @tree_view: A #GtkTreeView
- * 
- * Gets the #GtkAdjustment currently being used for the horizontal aspect.
- * 
- * Return value: A #GtkAdjustment object, or NULL if none is currently being
- * used.
- **/
-GtkAdjustment *
-gtk_tree_view_get_hadjustment (GtkTreeView *tree_view)
+static void
+gtk_tree_view_real_set_cursor (GtkTreeView     *tree_view,
+                              GtkTreePath     *path,
+                              gboolean         clear_and_select,
+                              GdkModifierType  state)
 {
-  g_return_val_if_fail (tree_view != NULL, NULL);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
+  GtkRBTree *tree = NULL;
+  GtkRBNode *node = NULL;
 
-  return tree_view->priv->hadjustment;
+  if (tree_view->priv->cursor)
+    gtk_tree_row_reference_free (tree_view->priv->cursor);
+  tree_view->priv->cursor = gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view),
+                                                             tree_view->priv->model,
+                                                             path);
+  _gtk_tree_view_find_node (tree_view, path, &tree, &node);
+  if (tree == NULL)
+    return;
+
+  if (clear_and_select)
+    {
+      gtk_tree_selection_unselect_all (tree_view->priv->selection);
+      _gtk_tree_selection_internal_select_node (tree_view->priv->selection,
+                                               node, tree,
+                                               path, state);
+    }
+  gtk_tree_view_clamp_node_visible (tree_view, tree, node);
+  gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
 }
 
 /**
- * gtk_tree_view_set_hadjustment:
+ * gtk_tree_view_set_cursor:
  * @tree_view: A #GtkTreeView
- * @adjustment: The #GtkAdjustment to set, or NULL
- * 
- * Sets the #GtkAdjustment for the current horizontal aspect.
+ * @path: A #GtkTreePath
+ *
+ * Sets the current keyboard focus to be at @path, and selects it.  This is
+ * useful when you want to focus the user's attention on a particular row.  If
+ * you want to give the user keyboard focus in the tree_view, you should use
+ * this function to set the correct path, and gtk_widget_grab_focus (GTK_WIDGET
+ * (tree_view)) to actually give focus to the @tree_view.
  **/
 void
-gtk_tree_view_set_hadjustment (GtkTreeView   *tree_view,
-                              GtkAdjustment *adjustment)
+gtk_tree_view_set_cursor (GtkTreeView *tree_view,
+                         GtkTreePath *path)
 {
-  g_return_if_fail (tree_view != NULL);
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+  g_return_if_fail (path != NULL);
 
-  gtk_tree_view_set_adjustments (tree_view,
-                                adjustment,
-                                tree_view->priv->vadjustment);
+  gtk_tree_view_real_set_cursor (tree_view, path, TRUE, 0);
 }
 
+
 /**
- * gtk_tree_view_get_vadjustment:
- * @tree_view: A #GtkTreeView
- * 
- * Gets the #GtkAdjustment currently being used for the vertical aspect.
- * 
- * Return value: A #GtkAdjustment object, or NULL if none is currently being
- * used.
+ * gtk_tree_view_get_path_at_pos:
+ * @tree_view: A #GtkTreeView.
+ * @window: The #GdkWindow to check against.
+ * @x: The x position to be identified.
+ * @y: The y position to be identified.
+ * @path: A pointer to a #GtkTreePath pointer to be filled in, or %NULL
+ * @column: A pointer to a #GtkTreeViewColumn pointer to be filled in, or %NULL
+ * @cell_x: A pointer where the X coordinate relative to the cell can be placed, or %NULL
+ * @cell_y: A pointer where the Y coordinate relative to the cell can be placed, or %NULL
+ *
+ * Finds the path at the point (@x, @y) relative to @window.  If @window is
+ * NULL, then the point is found relative to the widget coordinates.  This
+ * function is expected to be called after an event, with event->window being
+ * passed in as @window.  It is primarily for things like popup menus.  If @path
+ * is non-NULL, then it will be filled with the #GtkTreePath at that point.
+ * This path should be freed with #gtk_tree_path_free.  If @column is non-NULL,
+ * then it will be filled with the column at that point. @cell_x and @cell_y
+ * return the coordinates relative to the cell background (i.e. the
+ * background_area passed to gtk_cell_renderer_render()).  This function only
+ * works if @tree_view is realized.
+ *
+ * Return value: TRUE if a row exists at that coordinate.
  **/
-GtkAdjustment *
-gtk_tree_view_get_vadjustment (GtkTreeView *tree_view)
+gboolean
+gtk_tree_view_get_path_at_pos (GtkTreeView        *tree_view,
+                              GdkWindow          *window,
+                              gint                x,
+                              gint                y,
+                              GtkTreePath       **path,
+                              GtkTreeViewColumn **column,
+                               gint               *cell_x,
+                               gint               *cell_y)
 {
-  g_return_val_if_fail (tree_view != NULL, NULL);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
+  GtkRBTree *tree;
+  GtkRBNode *node;
+  gint y_offset;
 
-  return tree_view->priv->vadjustment;
-}
+  g_return_val_if_fail (tree_view != NULL, FALSE);
+  g_return_val_if_fail (tree_view->priv->tree != NULL, FALSE);
+  g_return_val_if_fail (tree_view->priv->bin_window != NULL, FALSE);
 
-/**
- * gtk_tree_view_set_vadjustment:
- * @tree_view: A #GtkTreeView
- * @adjustment: The #GtkAdjustment to set, or NULL
- * 
- * Sets the #GtkAdjustment for the current vertical aspect.
- **/
-void
-gtk_tree_view_set_vadjustment (GtkTreeView   *tree_view,
-                              GtkAdjustment *adjustment)
-{
-  g_return_if_fail (tree_view != NULL);
-  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+  if (window)
+    g_return_val_if_fail (window == tree_view->priv->bin_window, FALSE);
 
-  gtk_tree_view_set_adjustments (tree_view,
-                                tree_view->priv->hadjustment,
-                                adjustment);
-}
+  if (path)
+    *path = NULL;
+  if (column)
+    *column = NULL;
 
-/**
- * gtk_tree_view_set_adjustments:
- * @tree_view: A #GtkTreeView
- * @hadj: The horizontal #GtkAdjustment to set, or NULL
- * @vadj: The vertical #GtkAdjustment to set, or NULL
- * 
- * Sets the horizonal and or vertical #GtkAdjustment.
- **/
-static void
-gtk_tree_view_set_adjustments (GtkTreeView   *tree_view,
-                              GtkAdjustment *hadj,
-                              GtkAdjustment *vadj)
-{
-  gboolean need_adjust = FALSE;
+  if (x > tree_view->priv->hadjustment->upper)
+    return FALSE;
 
-  g_return_if_fail (tree_view != NULL);
-  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+  if (x < 0 || y < 0)
+    return FALSE;
 
-  if (hadj)
-    g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
-  else
-    hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
-  if (vadj)
-    g_return_if_fail (GTK_IS_ADJUSTMENT (vadj));
-  else
-    vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
+  if (column || cell_x)
+    {
+      GtkTreeViewColumn *tmp_column;
+      GtkTreeViewColumn *last_column = NULL;
+      GList *list;
+      gint remaining_x = x;
+      gboolean found = FALSE;
+
+      for (list = tree_view->priv->columns; list; list = list->next)
+       {
+         tmp_column = list->data;
+
+         if (tmp_column->visible == FALSE)
+           continue;
+
+         last_column = tmp_column;
+         if (remaining_x <= tmp_column->width)
+           {
+              found = TRUE;
+
+              if (column)
+                *column = tmp_column;
+
+              if (cell_x)
+                *cell_x = remaining_x;
+
+             break;
+           }
+         remaining_x -= tmp_column->width;
+       }
 
-  if (tree_view->priv->hadjustment && (tree_view->priv->hadjustment != hadj))
-    {
-      gtk_signal_disconnect_by_data (GTK_OBJECT (tree_view->priv->hadjustment), tree_view);
-      gtk_object_unref (GTK_OBJECT (tree_view->priv->hadjustment));
-    }
+      if (!found)
+        {
+          if (column)
+            *column = last_column;
 
-  if (tree_view->priv->vadjustment && (tree_view->priv->vadjustment != vadj))
-    {
-      gtk_signal_disconnect_by_data (GTK_OBJECT (tree_view->priv->vadjustment), tree_view);
-      gtk_object_unref (GTK_OBJECT (tree_view->priv->vadjustment));
+          if (cell_x)
+            *cell_x = last_column->width + remaining_x;
+        }
     }
 
-  if (tree_view->priv->hadjustment != hadj)
+  if (window)
     {
-      tree_view->priv->hadjustment = hadj;
-      gtk_object_ref (GTK_OBJECT (tree_view->priv->hadjustment));
-      gtk_object_sink (GTK_OBJECT (tree_view->priv->hadjustment));
-
-      gtk_signal_connect (GTK_OBJECT (tree_view->priv->hadjustment), "value_changed",
-                         (GtkSignalFunc) gtk_tree_view_adjustment_changed,
-                         tree_view);
-      need_adjust = TRUE;
+      y_offset = _gtk_rbtree_find_offset (tree_view->priv->tree,
+                                          TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, y),
+                                          &tree, &node);
     }
-
-  if (tree_view->priv->vadjustment != vadj)
+  else
     {
-      tree_view->priv->vadjustment = vadj;
-      gtk_object_ref (GTK_OBJECT (tree_view->priv->vadjustment));
-      gtk_object_sink (GTK_OBJECT (tree_view->priv->vadjustment));
+      if (y < TREE_VIEW_HEADER_HEIGHT (tree_view))
+       return FALSE;
 
-      gtk_signal_connect (GTK_OBJECT (tree_view->priv->vadjustment), "value_changed",
-                         (GtkSignalFunc) gtk_tree_view_adjustment_changed,
-                         tree_view);
-      need_adjust = TRUE;
+      y_offset = _gtk_rbtree_find_offset (tree_view->priv->tree,
+                                          TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, y + tree_view->priv->vadjustment->value),
+                                          &tree, &node);
     }
 
-  if (need_adjust)
-    gtk_tree_view_adjustment_changed (NULL, tree_view);
-}
-
+  if (tree == NULL)
+    return FALSE;
 
-/* Column and header operations */
+  if (cell_y)
+    *cell_y = y_offset;
 
-/**
- * gtk_tree_view_get_headers_visible:
- * @tree_view: A #GtkTreeView.
- * 
- * Returns TRUE if the headers on the @tree_view are visible.
- * 
- * Return value: Whether the headers are visible or not.
- **/
-gboolean
-gtk_tree_view_get_headers_visible (GtkTreeView *tree_view)
-{
-  g_return_val_if_fail (tree_view != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+  if (path)
+    *path = _gtk_tree_view_find_path (tree_view, tree, node);
 
-  return GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE);
+  return TRUE;
 }
 
+
 /**
- * gtk_tree_view_set_headers_visible:
- * @tree_view: A #GtkTreeView.
- * @headers_visible: TRUE if the headers are visible
- * 
- * Sets the the visibility state of the headers.
+ * gtk_tree_view_get_cell_area:
+ * @tree_view: a #GtkTreeView
+ * @path: a #GtkTreePath for the row, or %NULL to get only horizontal coordinates
+ * @column: a #GtkTreeViewColumn for the column, or %NULL to get only vertical coordiantes
+ * @rect: rectangle to fill with cell rect
+ *
+ * Fills the bounding rectangle in tree window coordinates for the cell at the
+ * row specified by @path and the column specified by @column.  If @path is
+ * %NULL, the y and height fields of the rectangle will be filled with 0. If
+ * @column is %NULL, the x and width fields will be filled with 0.  The sum of
+ * all cell rects does not cover the entire tree; there are extra pixels in
+ * between rows, for example. The returned rectangle is equivalent to the
+ * @cell_area passed to gtk_cell_renderer_render().  This function is only valid
+ * if #tree_view is realized.
  **/
 void
-gtk_tree_view_set_headers_visible (GtkTreeView *tree_view,
-                                  gboolean     headers_visible)
+gtk_tree_view_get_cell_area (GtkTreeView        *tree_view,
+                             GtkTreePath        *path,
+                             GtkTreeViewColumn  *column,
+                             GdkRectangle       *rect)
 {
-  gint x, y;
-  GList *list;
-  GtkTreeViewColumn *column;
+  GtkRBTree *tree = NULL;
+  GtkRBNode *node = NULL;
+  gint vertical_separator;
 
-  g_return_if_fail (tree_view != NULL);
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+  g_return_if_fail (column == NULL || GTK_IS_TREE_VIEW_COLUMN (column));
+  g_return_if_fail (rect != NULL);
 
-  if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE) == headers_visible)
-    return;
+  gtk_widget_style_get (GTK_WIDGET (tree_view), "vertical_separator", &vertical_separator, NULL);
 
-  if (headers_visible)
-    GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE);
-  else
-    GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE);
+  rect->x = 0;
+  rect->y = 0;
+  rect->width = 0;
+  rect->height = 0;
 
-  if (GTK_WIDGET_REALIZED (tree_view))
+  if (path)
     {
-      gdk_window_get_position (tree_view->priv->bin_window, &x, &y);
-      if (headers_visible)
-       {
-         gdk_window_move_resize (tree_view->priv->bin_window, x, y, tree_view->priv->width, tree_view->priv->height + TREE_VIEW_HEADER_HEIGHT (tree_view));
-         for (list = tree_view->priv->column; list; list = list->next)
-           {
-             column = list->data;
-             gtk_widget_map (column->button);
-           }
-
-         for (list = tree_view->priv->column; list; list = list->next)
-           {
-             column = list->data;
-             if (column->visible == FALSE)
-               continue;
-             if (column->column_type == GTK_TREE_VIEW_COLUMN_RESIZEABLE)
-               {
-                 gdk_window_raise (column->window);
-                 gdk_window_show (column->window);
-               }
-             else
-               gdk_window_hide (column->window);
-           }
-         gdk_window_show (tree_view->priv->header_window);
-       }
-      else
-       {
-         gdk_window_move_resize (tree_view->priv->bin_window, x, y, tree_view->priv->width, tree_view->priv->height);
-         for (list = tree_view->priv->column; list; list = list->next)
-           {
-             column = list->data;
-             gtk_widget_unmap (column->button);
-           }
-         gdk_window_hide (tree_view->priv->header_window);
-       }
-    }
-
-  tree_view->priv->vadjustment->page_size = GTK_WIDGET (tree_view)->allocation.height - TREE_VIEW_HEADER_HEIGHT (tree_view);
-  tree_view->priv->vadjustment->page_increment = (GTK_WIDGET (tree_view)->allocation.height - TREE_VIEW_HEADER_HEIGHT (tree_view)) / 2;
-  tree_view->priv->vadjustment->lower = 0;
-  tree_view->priv->vadjustment->upper = tree_view->priv->height;
-  gtk_signal_emit_by_name (GTK_OBJECT (tree_view->priv->vadjustment), "changed");
+      /* Get vertical coords */
 
-  gtk_widget_queue_resize (GTK_WIDGET (tree_view));
-}
+      _gtk_tree_view_find_node (tree_view, path, &tree, &node);
 
+      if (tree == NULL)
+        {
+          g_warning (G_STRLOC": no row corresponding to path");
+          return;
+        }
 
-/**
- * gtk_tree_view_columns_autosize:
- * @tree_view: A #GtkTreeView.
- * 
- * Resizes all columns to their optimal width.
- **/
-void
-gtk_tree_view_columns_autosize (GtkTreeView *tree_view)
-{
-  gboolean dirty = FALSE;
-  GList *list;
-  GtkTreeViewColumn *column;
+      /* Remember that the rbtree stores node height including the vertical
+       * separator, see comment at top of file.
+       */
+      rect->y = CELL_FIRST_PIXEL (tree_view, tree, node, vertical_separator);
 
-  g_return_if_fail (tree_view != NULL);
-  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+      rect->height = CELL_HEIGHT (node, vertical_separator);
+    }
 
-  for (list = tree_view->priv->column; list; list = list->next)
+  if (column)
     {
-      column = list->data;
-      if (column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
-       continue;
-      column->dirty = TRUE;
-      dirty = TRUE;
-    }
+      gint x2 = 0;
 
-  if (dirty)
-    gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+      gtk_tree_view_get_cell_xrange (tree_view, tree, column, &rect->x, &x2);
+      rect->width = x2 - rect->x;
+    }
 }
 
 /**
- * gtk_tree_view_set_headers_active:
- * @tree_view: A #GtkTreeView.
- * @active: TRUE if the columns are active.
- * 
- * Sets the headers active (eg. keyboard navigable) or inactive.
+ * gtk_tree_view_get_background_area:
+ * @tree_view: a #GtkTreeView
+ * @path: a #GtkTreePath for the row, or %NULL to get only horizontal coordinates
+ * @column: a #GtkTreeViewColumn for the column, or %NULL to get only vertical coordiantes
+ * @rect: rectangle to fill with cell background rect
+ *
+ * Fills the bounding rectangle in tree window coordinates for the
+ * cell at the row specified by @path and the column specified by
+ * @column.  If @path is %NULL, the y and height fields of the
+ * rectangle will be filled with 0. If @column is %NULL, the x and
+ * width fields will be filled with 0.  The returned rectangle is
+ * equivalent to the @background_area passed to
+ * gtk_cell_renderer_render().  These background areas tile to cover
+ * the entire tree window (except for the area used for header
+ * buttons). Contrast with the cell_area, returned by
+ * gtk_tree_view_get_cell_area(), which returns only the cell itself,
+ * excluding surrounding borders and the tree expander area.
+ *
  **/
 void
-gtk_tree_view_set_headers_active (GtkTreeView *tree_view,
-                                 gboolean   active)
+gtk_tree_view_get_background_area (GtkTreeView        *tree_view,
+                                   GtkTreePath        *path,
+                                   GtkTreeViewColumn  *column,
+                                   GdkRectangle       *rect)
 {
-  GList *list;
+  GtkRBTree *tree = NULL;
+  GtkRBNode *node = NULL;
 
-  g_return_if_fail (tree_view != NULL);
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-  g_return_if_fail (tree_view->priv->model != NULL);
-
-  for (list = tree_view->priv->column; list; list = list->next)
-    gtk_tree_view_column_set_header_active (GTK_TREE_VIEW_COLUMN (list->data), active);
-}
+  g_return_if_fail (column == NULL || GTK_IS_TREE_VIEW_COLUMN (column));
+  g_return_if_fail (rect != NULL);
 
-/**
- * gtk_tree_view_append_column:
- * @tree_view: A #GtkTreeView.
- * @column: The #GtkTreeViewColumn to add.
- * 
- * Appends @column to the list of columns.
- * 
- * Return value: The number of columns in @tree_view.
- **/
-gint
-gtk_tree_view_append_column (GtkTreeView       *tree_view,
-                            GtkTreeViewColumn *column)
-{
-  g_return_val_if_fail (tree_view != NULL, -1);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
-  g_return_val_if_fail (column != NULL, -1);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), -1);
-  g_return_val_if_fail (column->tree_view == NULL, -1);
-
-  g_object_ref (G_OBJECT (column));
-  tree_view->priv->column = g_list_append (tree_view->priv->column,
-                                          column);
-  column->tree_view = GTK_WIDGET (tree_view);
-  return tree_view->priv->columns++;
-}
+  rect->x = 0;
+  rect->y = 0;
+  rect->width = 0;
+  rect->height = 0;
 
+  if (path)
+    {
+      /* Get vertical coords */
 
-/**
- * gtk_tree_view_remove_column:
- * @tree_view: A #GtkTreeView.
- * @column: The #GtkTreeViewColumn to remove.
- * 
- * Removes @column from @tree_view.
- * 
- * Return value: The number of columns in @tree_view.
- **/
-gint
-gtk_tree_view_remove_column (GtkTreeView       *tree_view,
-                             GtkTreeViewColumn *column)
-{
-  g_return_val_if_fail (tree_view != NULL, -1);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
-  g_return_val_if_fail (column != NULL, -1);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), -1);
-  g_return_val_if_fail (column->tree_view == GTK_WIDGET (tree_view), -1);
+      _gtk_tree_view_find_node (tree_view, path, &tree, &node);
 
-  tree_view->priv->column = g_list_remove (tree_view->priv->column,
-                                           column);
-  column->tree_view = NULL;
-  g_object_unref (G_OBJECT (column));
+      if (tree == NULL)
+        {
+          g_warning (G_STRLOC": no row corresponding to path");
+          return;
+        }
 
-  return tree_view->priv->columns--;
-}
+      rect->y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
 
+      rect->height = BACKGROUND_HEIGHT (node);
+    }
 
-/**
- * gtk_tree_view_insert_column:
- * @tree_view: A #GtkTreeView.
- * @column: The #GtkTreeViewColumn to be inserted.
- * @position: The position to insert @column in.
- * 
- * This inserts the @column into the @tree_view at @position.
- * 
- * Return value: The number of columns in @tree_view.
- **/
-gint
-gtk_tree_view_insert_column (GtkTreeView       *tree_view,
-                             GtkTreeViewColumn *column,
-                             gint               position)
-{
-  g_return_val_if_fail (tree_view != NULL, -1);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
-  g_return_val_if_fail (column != NULL, -1);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), -1);
-  g_return_val_if_fail (column->tree_view == NULL, -1);
+  if (column)
+    {
+      gint x2 = 0;
 
-  g_object_ref (G_OBJECT (column));
-  tree_view->priv->column = g_list_insert (tree_view->priv->column,
-                                           column, position);
-  column->tree_view = GTK_WIDGET (tree_view);
-  return tree_view->priv->columns++;
+      gtk_tree_view_get_background_xrange (tree_view, tree, column, &rect->x, &x2);
+      rect->width = x2 - rect->x;
+    }
 }
 
 /**
- * gtk_tree_view_get_column:
- * @tree_view: A #GtkTreeView.
- * @n: The position of the column, counting from 0.
- * 
- * Gets the #GtkTreeViewColumn at the given position in the #tree_view.
- * 
- * Return value: The #GtkTreeViewColumn, or NULL if the position is outside the
- * range of columns.
+ * gtk_tree_view_get_visible_rect:
+ * @tree_view: a #GtkTreeView
+ * @visible_rect: rectangle to fill
+ *
+ * Fills @visible_rect with the currently-visible region of the
+ * buffer, in tree coordinates. Convert to widget coordinates with
+ * gtk_tree_view_tree_to_widget_coords(). Tree coordinates start at
+ * 0,0 for row 0 of the tree, and cover the entire scrollable area of
+ * the tree.
  **/
-GtkTreeViewColumn *
-gtk_tree_view_get_column (GtkTreeView *tree_view,
-                         gint         n)
+void
+gtk_tree_view_get_visible_rect (GtkTreeView  *tree_view,
+                                GdkRectangle *visible_rect)
 {
-  g_return_val_if_fail (tree_view != NULL, NULL);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
-  g_return_val_if_fail (tree_view->priv->model != NULL, NULL);
-  g_return_val_if_fail (n >= 0 || n < tree_view->priv->columns, NULL);
+  GtkWidget *widget;
 
-  if (tree_view->priv->column == NULL)
-    return NULL;
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-  return GTK_TREE_VIEW_COLUMN (g_list_nth (tree_view->priv->column, n)->data);
+  widget = GTK_WIDGET (tree_view);
+
+  if (visible_rect)
+    {
+      visible_rect->x = tree_view->priv->hadjustment->value;
+      visible_rect->y = tree_view->priv->vadjustment->value;
+      visible_rect->width = widget->allocation.width;
+      visible_rect->height = widget->allocation.height - TREE_VIEW_HEADER_HEIGHT (tree_view);
+    }
 }
 
 /**
- * gtk_tree_view_move_to:
- * @tree_view: A #GtkTreeView.
- * @path: The path of the row to move to.
- * @column: The #GtkTreeViewColumn to move horizontally to.
- * @row_align: The vertical alignment of the row specified by @path.
- * @col_align: The horizontal alignment of the column specified by @column.
- * 
- * Moves the alignments of @tree_view to the position specified by @column and
- * @path.  If @column is NULL, then the first visible column is assumed, and the
- * @tree_view is left justified.  Likewise, if @path is NULL the first row is
- * assumed, and the @tree_view is top justified.  @row_align determines where
- * the @row is placed, and @col_align determines where @column is placed.  Both
- * are expected to be between 0.0 and 1.0.
+ * gtk_tree_view_widget_to_tree_coords:
+ * @tree_view: a #GtkTreeView
+ * @wx: widget X coordinate
+ * @wy: widget Y coordinate
+ * @tx: return location for tree X coordinate
+ * @ty: return location for tree Y coordinate
+ *
+ * Converts widget coordinates to coordinates for the
+ * tree window (the full scrollable area of the tree).
+ *
  **/
 void
-gtk_tree_view_move_to (GtkTreeView       *tree_view,
-                      GtkTreePath       *path,
-                      GtkTreeViewColumn *column,
-                      gfloat             row_align,
-                      gfloat             col_align)
+gtk_tree_view_widget_to_tree_coords (GtkTreeView *tree_view,
+                                     gint         wx,
+                                     gint         wy,
+                                     gint        *tx,
+                                     gint        *ty)
 {
-  GtkRBNode *node = NULL;
-  GtkRBTree *tree = NULL;
-
-  g_return_if_fail (tree_view != NULL);
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-  row_align = CLAMP (row_align, 0, 1);
-  col_align = CLAMP (col_align, 0, 1);
-
-  if (path != NULL)
+  if (tx)
     {
-      _gtk_tree_view_find_node (tree_view, path,
-                               &tree, &node);
-      /* Should we justify it to the bottom? */
-      if (node == NULL)
-       return;
+      *tx = wx + tree_view->priv->hadjustment->value;
     }
 
-  if (tree_view->priv->hadjustment && column >= 0)
+  if (ty)
     {
-      /* FIXME -- write  */
+      *ty = wy + tree_view->priv->vadjustment->value;
     }
 }
 
 /**
- * gtk_tree_view_get_path_at_pos:
- * @tree_view: A #GtkTreeView.
- * @window: The #GtkWindow to check against.
- * @x: The x position to be identified.
- * @y: The y position to be identified.
- * @path: A pointer to a #GtkTreePath pointer to be filled in, or NULL
- * @column: A pointer to a #GtkTreeViewColumn pointer to be filled in, or NULL
- * 
- * Finds the path at the point (@x, @y) relative to @window.  If @window is
- * NULL, then the point is found relative to the widget coordinates.  This
- * function is expected to be called after an event, with event->window being
- * passed in as @window.  It is primarily for things like popup menus.  If @path
- * is non-NULL, then it will be filled with the #GtkTreePath at that point.
- * This path should be freed with #gtk_tree_path_free.  If @column is non-NULL,
- * then it will be filled with the column at that point.
- * 
- * Return value: TRUE if a row exists at that coordinate.
+ * gtk_tree_view_tree_to_widget_coords:
+ * @tree_view: a #GtkTreeView
+ * @tx: tree X coordinate
+ * @ty: tree Y coordinate
+ * @wx: return location for widget X coordinate
+ * @wy: return location for widget Y coordinate
+ *
+ * Converts tree coordinates (coordinates in full scrollable area of the tree)
+ * to widget coordinates.
+ *
  **/
-gboolean
-gtk_tree_view_get_path_at_pos (GtkTreeView        *tree_view,
-                              GdkWindow          *window,
-                              gint                x,
-                              gint                y,
-                              GtkTreePath       **path,
-                              GtkTreeViewColumn **column)
+void
+gtk_tree_view_tree_to_widget_coords (GtkTreeView *tree_view,
+                                     gint         tx,
+                                     gint         ty,
+                                     gint        *wx,
+                                     gint        *wy)
+{
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+
+  if (wx)
+    {
+      *wx = tx - tree_view->priv->hadjustment->value;
+    }
+
+  if (wy)
+    {
+      *wy = ty - tree_view->priv->vadjustment->value;
+    }
+}
 
-{
-  GtkRBTree *tree;
-  GtkRBNode *node;
 
-  g_return_val_if_fail (tree_view != NULL, FALSE);
-  g_return_val_if_fail (tree_view->priv->tree != NULL, FALSE);
-  g_return_val_if_fail (x >= 0, FALSE);
-  g_return_val_if_fail (y >= 0, FALSE);
-  g_return_val_if_fail (tree_view->priv->bin_window != NULL, FALSE);
+void
+gtk_tree_view_set_rows_drag_source (GtkTreeView              *tree_view,
+                                    GdkModifierType           start_button_mask,
+                                    const GtkTargetEntry     *targets,
+                                    gint                      n_targets,
+                                    GdkDragAction             actions,
+                                    GtkTreeViewDraggableFunc  row_draggable_func,
+                                    gpointer                  user_data)
+{
+  TreeViewDragInfo *di;
 
-  if (window)
-    g_return_val_if_fail (window == tree_view->priv->bin_window, FALSE);
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-  if (path)
-    *path = NULL;
-  if (column)
-    *column = NULL;
+  di = ensure_info (tree_view);
+  clear_source_info (di);
 
-  if (x > tree_view->priv->hadjustment->upper)
-    return FALSE;
+  di->start_button_mask = start_button_mask;
+  di->source_target_list = gtk_target_list_new (targets, n_targets);
+  di->source_actions = actions;
 
-  if (column)
+  if (row_draggable_func)
     {
-      GtkTreeViewColumn *tmp_column;
-      GtkTreeViewColumn *last_column = NULL;
-      GList *list;
+      di->row_draggable_closure = g_cclosure_new ((GCallback) row_draggable_func,
+                                                  user_data, NULL);
+      g_closure_ref (di->row_draggable_closure);
+      g_closure_sink (di->row_draggable_closure);
+    }
 
-      for (list = tree_view->priv->column; list; list = list->next)
-       {
-         tmp_column = list->data;
+  di->source_set = TRUE;
+}
 
-         if (tmp_column->visible == FALSE)
-           continue;
+void
+gtk_tree_view_set_rows_drag_dest (GtkTreeView              *tree_view,
+                                  const GtkTargetEntry     *targets,
+                                  gint                      n_targets,
+                                  GdkDragAction             actions,
+                                  GtkTreeViewDroppableFunc  location_droppable_func,
+                                  gpointer                  user_data)
+{
+  TreeViewDragInfo *di;
 
-         last_column = tmp_column;
-         if (x <= tmp_column->size)
-           {
-             *column = tmp_column;
-             break;
-           }
-         x -= tmp_column->size;
-       }
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-      if (*column == NULL)
-       *column = last_column;
-    }
+  gtk_drag_dest_set (GTK_WIDGET (tree_view),
+                     0,
+                     NULL,
+                     0,
+                     actions);
 
-  if (window)
+  di = ensure_info (tree_view);
+  clear_dest_info (di);
+
+  if (targets)
+    di->dest_target_list = gtk_target_list_new (targets, n_targets);
+
+  if (location_droppable_func)
     {
-      _gtk_rbtree_find_offset (tree_view->priv->tree,
-                              y - TREE_VIEW_HEADER_HEIGHT (tree_view),
-                              &tree, &node);
+      di->location_droppable_closure = g_cclosure_new ((GCallback) location_droppable_func,
+                                                       user_data, NULL);
+      g_closure_ref (di->location_droppable_closure);
+      g_closure_sink (di->location_droppable_closure);
     }
-  else
-    {
-      if (y < TREE_VIEW_HEADER_HEIGHT (tree_view))
-       return FALSE;
 
-      _gtk_rbtree_find_offset (tree_view->priv->tree, y - TREE_VIEW_HEADER_HEIGHT (tree_view) +
-                              tree_view->priv->vadjustment->value,
-                              &tree, &node);
-    }
+  di->dest_set = TRUE;
+}
 
-  if (tree == NULL)
-    return FALSE;
+void
+gtk_tree_view_unset_rows_drag_source (GtkTreeView *tree_view)
+{
+  TreeViewDragInfo *di;
 
-  if (path)
-    *path = _gtk_tree_view_find_path (tree_view, tree, node);
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-  return TRUE;
+  di = get_info (tree_view);
+
+  if (di)
+    {
+      if (di->source_set)
+        {
+          clear_source_info (di);
+          di->source_set = FALSE;
+        }
+
+      if (!di->dest_set && !di->source_set)
+        remove_info (tree_view);
+    }
 }
 
-static void
-gtk_tree_view_expand_all_helper (GtkRBTree  *tree,
-                                GtkRBNode  *node,
-                                gpointer  data)
+void
+gtk_tree_view_unset_rows_drag_dest (GtkTreeView *tree_view)
 {
-  GtkTreeView *tree_view = data;
+  TreeViewDragInfo *di;
 
-  if (node->children)
-    _gtk_rbtree_traverse (node->children,
-                         node->children->root,
-                         G_PRE_ORDER,
-                         gtk_tree_view_expand_all_helper,
-                         data);
-  else if ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT && node->children == NULL)
-    {
-      GtkTreePath *path;
-      GtkTreeIter iter;
-      GtkTreeIter child;
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-      node->children = _gtk_rbtree_new ();
-      node->children->parent_tree = tree;
-      node->children->parent_node = node;
-      path = _gtk_tree_view_find_path (tree_view, tree, node);
-      gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
-      gtk_tree_model_iter_children (tree_view->priv->model, &child, &iter);
-      gtk_tree_view_build_tree (tree_view,
-                               node->children,
-                               &child,
-                               gtk_tree_path_get_depth (path) + 1,
-                               TRUE,
-                               GTK_WIDGET_REALIZED (tree_view));
-      gtk_tree_path_free (path);
+  di = get_info (tree_view);
+
+  if (di)
+    {
+      if (di->dest_set)
+        {
+          gtk_drag_dest_unset (GTK_WIDGET (tree_view));
+          clear_dest_info (di);
+          di->dest_set = FALSE;
+        }
+
+      if (!di->dest_set && !di->source_set)
+        remove_info (tree_view);
     }
 }
 
-/**
- * gtk_tree_view_expand_all:
- * @tree_view: A #GtkTreeView.
- * 
- * Recursively expands all nodes in the @tree_view.
- **/
 void
-gtk_tree_view_expand_all (GtkTreeView *tree_view)
+gtk_tree_view_set_drag_dest_row (GtkTreeView            *tree_view,
+                                 GtkTreePath            *path,
+                                 GtkTreeViewDropPosition pos)
 {
-  g_return_if_fail (tree_view != NULL);
+  GtkTreePath *current_dest;
+  /* Note; this function is exported to allow a custom DND
+   * implementation, so it can't touch TreeViewDragInfo
+   */
+
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-  g_return_if_fail (tree_view->priv->tree != NULL);
 
-  _gtk_rbtree_traverse (tree_view->priv->tree,
-                       tree_view->priv->tree->root,
-                       G_PRE_ORDER,
-                       gtk_tree_view_expand_all_helper,
-                       tree_view);
+  current_dest = NULL;
 
-  _gtk_tree_view_set_size (tree_view, -1,-1);
-}
+  if (tree_view->priv->drag_dest_row)
+    current_dest = gtk_tree_row_reference_get_path (tree_view->priv->drag_dest_row);
 
-static void
-gtk_tree_view_collapse_all_helper (GtkRBTree  *tree,
-                                  GtkRBNode  *node,
-                                  gpointer    data)
-{
-  if (node->children)
+  if (current_dest)
     {
-      GtkTreePath *path;
-      GtkTreeIter iter;
+      gtk_tree_view_queue_draw_path (tree_view, current_dest, NULL);
+      gtk_tree_path_free (current_dest);
+    }
 
-      path = _gtk_tree_view_find_path (GTK_TREE_VIEW (data),
-                                      node->children,
-                                      node->children->root);
-      gtk_tree_model_get_iter (GTK_TREE_VIEW (data)->priv->model,
-                              &iter,
-                              path);
-      gtk_tree_view_discover_dirty (GTK_TREE_VIEW (data),
-                                   node->children,
-                                   &iter,
-                                   gtk_tree_path_get_depth (path));
-      _gtk_rbtree_remove (node->children);
-      gtk_tree_path_free (path);
+  if (tree_view->priv->drag_dest_row)
+    gtk_tree_row_reference_free (tree_view->priv->drag_dest_row);
+
+  tree_view->priv->drag_dest_pos = pos;
+
+  if (path)
+    {
+      tree_view->priv->drag_dest_row =
+        gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view), tree_view->priv->model, path);
+      gtk_tree_view_queue_draw_path (tree_view, path, NULL);
     }
+  else
+    tree_view->priv->drag_dest_row = NULL;
 }
 
-/**
- * gtk_tree_view_collapse_all:
- * @tree_view: A #GtkTreeView.
- * 
- * Recursively collapses all visible, expanded nodes in @tree_view.
- **/
 void
-gtk_tree_view_collapse_all (GtkTreeView *tree_view)
+gtk_tree_view_get_drag_dest_row (GtkTreeView              *tree_view,
+                                 GtkTreePath             **path,
+                                 GtkTreeViewDropPosition  *pos)
 {
-  g_return_if_fail (tree_view != NULL);
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-  g_return_if_fail (tree_view->priv->tree != NULL);
 
-  _gtk_rbtree_traverse (tree_view->priv->tree,
-                       tree_view->priv->tree->root,
-                       G_PRE_ORDER,
-                       gtk_tree_view_collapse_all_helper,
-                       tree_view);
+  if (path)
+    {
+      if (tree_view->priv->drag_dest_row)
+        *path = gtk_tree_row_reference_get_path (tree_view->priv->drag_dest_row);
+      else
+        *path = NULL;
+    }
 
-  if (GTK_WIDGET_REALIZED (tree_view))
-    gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+  if (pos)
+    *pos = tree_view->priv->drag_dest_pos;
 }
 
 gboolean
-gtk_tree_view_expand_row (GtkTreeView *tree_view,
-                         GtkTreePath *path,
-                         gboolean     open_all)
+gtk_tree_view_get_dest_row_at_pos (GtkTreeView             *tree_view,
+                                   gint                     drag_x,
+                                   gint                     drag_y,
+                                   GtkTreePath            **path,
+                                   GtkTreeViewDropPosition *pos)
 {
-  GtkTreeIter iter;
-  GtkTreeIter child;
-  GtkRBTree *tree;
-  GtkRBNode *node;
+  gint cell_y;
+  gdouble offset_into_row;
+  gdouble quarter;
+  gint x, y;
+  GdkRectangle cell;
+  GtkTreeViewColumn *column = NULL;
+  GtkTreePath *tmp_path = NULL;
+
+  /* Note; this function is exported to allow a custom DND
+   * implementation, so it can't touch TreeViewDragInfo
+   */
 
   g_return_val_if_fail (tree_view != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
-  g_return_val_if_fail (tree_view->priv->model != NULL, FALSE);
-  g_return_val_if_fail (path != NULL, FALSE);
+  g_return_val_if_fail (drag_x >= 0, FALSE);
+  g_return_val_if_fail (drag_y >= 0, FALSE);
+  g_return_val_if_fail (tree_view->priv->bin_window != NULL, FALSE);
 
-  if (_gtk_tree_view_find_node (tree_view,
-                               path,
-                               &tree,
-                               &node))
+
+  if (path)
+    *path = NULL;
+
+  if (tree_view->priv->tree == NULL)
     return FALSE;
 
-  gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
-  if (! gtk_tree_model_iter_has_child (tree_view->priv->model, &iter))
+  /* remember that drag_x and drag_y are in widget coords, convert to tree window */
+
+  gtk_tree_view_widget_to_tree_coords (tree_view, drag_x, drag_y,
+                                       &x, &y);
+
+  /* If in the top quarter of a row, we drop before that row; if
+   * in the bottom quarter, drop after that row; if in the middle,
+   * and the row has children, drop into the row.
+   */
+
+  if (!gtk_tree_view_get_path_at_pos (tree_view,
+                                      tree_view->priv->bin_window,
+                                      x, y,
+                                      &tmp_path,
+                                      &column,
+                                      NULL,
+                                      &cell_y))
     return FALSE;
 
-  node->children = _gtk_rbtree_new ();
-  node->children->parent_tree = tree;
-  node->children->parent_node = node;
+  gtk_tree_view_get_background_area (tree_view, tmp_path, column,
+                                     &cell);
 
-  gtk_tree_model_iter_children (tree_view->priv->model, &child, &iter);
-  gtk_tree_view_build_tree (tree_view,
-                           node->children,
-                           &child,
-                           gtk_tree_path_get_depth (path) + 1,
-                           open_all,
-                           GTK_WIDGET_REALIZED (tree_view));
+  offset_into_row = cell_y;
 
-  if (GTK_WIDGET_REALIZED (tree_view))
-    gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+  if (path)
+    *path = tmp_path;
+  else
+    gtk_tree_path_free (tmp_path);
+
+  tmp_path = NULL;
+
+  quarter = cell.height / 4.0;
+
+  if (pos)
+    {
+      if (offset_into_row < quarter)
+        {
+          *pos = GTK_TREE_VIEW_DROP_BEFORE;
+        }
+      else if (offset_into_row < quarter * 2)
+        {
+          *pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
+        }
+      else if (offset_into_row < quarter * 3)
+        {
+          *pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER;
+        }
+      else
+        {
+          *pos = GTK_TREE_VIEW_DROP_AFTER;
+        }
+    }
 
   return TRUE;
 }
 
-gboolean
-gtk_tree_view_collapse_row (GtkTreeView *tree_view,
-                           GtkTreePath *path)
+
+
+/* KEEP IN SYNC WITH GTK_TREE_VIEW_BIN_EXPOSE */
+/**
+ * gtk_tree_view_create_row_drag_icon:
+ * @tree_view: a #GtkTreeView
+ * @path: a #GtkTreePath in @tree_view
+ *
+ * Creates a GdkPixmap representation of the row at @path.  This image is used
+ * for a drag icon.
+ *
+ * Return value: a newly allocatdd pixmap of the drag icon.
+ **/
+GdkPixmap *
+gtk_tree_view_create_row_drag_icon (GtkTreeView  *tree_view,
+                                    GtkTreePath  *path)
 {
-  GtkRBTree *tree;
-  GtkRBNode *node;
-  GtkTreeIter iter;
+  GtkTreeIter   iter;
+  GtkRBTree    *tree;
+  GtkRBNode    *node;
+  GtkCellRenderer *cell;
+  gint i;
+  gint cell_offset;
+  GList *list;
+  GdkRectangle background_area;
+  GtkWidget *widget;
+  gint depth;
+  /* start drawing inside the black outline */
+  gint x = 1, y = 1;
+  GdkDrawable *drawable;
+  gint bin_window_width;
 
-  g_return_val_if_fail (tree_view != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
-  g_return_val_if_fail (tree_view->priv->tree != NULL, FALSE);
-  g_return_val_if_fail (path != NULL, FALSE);
+  widget = GTK_WIDGET (tree_view);
 
-  if (_gtk_tree_view_find_node (tree_view,
-                               path,
-                               &tree,
-                               &node))
-    return FALSE;
+  depth = gtk_tree_path_get_depth (path);
 
-  if (node->children == NULL)
-    return FALSE;
+  _gtk_tree_view_find_node (tree_view,
+                            path,
+                            &tree,
+                            &node);
 
-  gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
-  gtk_tree_view_discover_dirty (tree_view,
-                               node->children,
-                               &iter,
-                               gtk_tree_path_get_depth (path));
-  _gtk_rbtree_remove (node->children);
+  if (tree == NULL)
+    return NULL;
 
-  if (GTK_WIDGET_REALIZED (tree_view))
-    gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+  if (!gtk_tree_model_get_iter (tree_view->priv->model,
+                                &iter,
+                                path))
+    return NULL;
 
-  return TRUE;
+  cell_offset = x;
+
+  background_area.y = y;
+  background_area.height = BACKGROUND_HEIGHT (node);
+
+  gdk_drawable_get_size (tree_view->priv->bin_window,
+                         &bin_window_width, NULL);
+
+  drawable = gdk_pixmap_new (tree_view->priv->bin_window,
+                             bin_window_width + 2,
+                             background_area.height + 2,
+                             -1);
+
+  gdk_draw_rectangle (drawable,
+                      widget->style->base_gc[GTK_WIDGET_STATE (widget)],
+                      TRUE,
+                      0, 0,
+                      bin_window_width + 2,
+                      background_area.height + 2);
+
+  gdk_draw_rectangle (drawable,
+                      widget->style->black_gc,
+                      FALSE,
+                      0, 0,
+                      bin_window_width + 1,
+                      background_area.height + 1);
+
+  for (i = 0, list = tree_view->priv->columns; i < tree_view->priv->n_columns; i++, list = list->next)
+    {
+      GtkTreeViewColumn *column = list->data;
+      GdkRectangle cell_area;
+      gboolean visible;
+      gint vertical_separator;
+
+      if (!column->visible)
+        continue;
+
+      cell = column->cell;
+      gtk_tree_view_column_cell_set_cell_data (column,
+                                              tree_view->priv->model,
+                                              &iter);
+
+      background_area.x = cell_offset;
+      background_area.width = column->displayed_width;
+
+      cell_area = background_area;
+
+      gtk_widget_style_get (widget, "vertical_separator", &vertical_separator, NULL);
+      cell_area.y += vertical_separator / 2;
+      cell_area.height -= vertical_separator;
+
+      if (i == tree_view->priv->expander_column &&
+          TREE_VIEW_DRAW_EXPANDERS(tree_view))
+        {
+          cell_area.x += depth * tree_view->priv->tab_offset;
+          cell_area.width -= depth * tree_view->priv->tab_offset;
+        }
+
+      g_object_get (G_OBJECT (cell), "visible", &visible, NULL);
+      if (visible)
+       gtk_cell_renderer_render (cell,
+                                 drawable,
+                                 widget,
+                                 &background_area,
+                                 &cell_area,
+                                 NULL,
+                                 0);
+
+      cell_offset += column->displayed_width;
+    }
+
+  return drawable;
 }