]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktreeviewcolumn.c
Moved search entries into priv data.
[~andy/gtk] / gtk / gtktreeviewcolumn.c
index 00d5afa193ce14cd59da6cb487e1a840616cb6d8..de3178b3c6a8df03c469e4e43e7b6d657b372f7d 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+#include <string.h>
 #include "gtktreeviewcolumn.h"
 #include "gtktreeview.h"
 #include "gtktreeprivate.h"
-#include "gtksignal.h"
+#include "gtkcelllayout.h"
 #include "gtkbutton.h"
 #include "gtkalignment.h"
 #include "gtklabel.h"
@@ -28,7 +30,6 @@
 #include "gtkmarshalers.h"
 #include "gtkarrow.h"
 #include "gtkintl.h"
-#include <string.h>
 
 enum
 {
@@ -41,6 +42,7 @@ enum
   PROP_MIN_WIDTH,
   PROP_MAX_WIDTH,
   PROP_TITLE,
+  PROP_EXPAND,
   PROP_CLICKABLE,
   PROP_WIDGET,
   PROP_ALIGNMENT,
@@ -64,14 +66,17 @@ struct _GtkTreeViewColumnCellInfo
   gpointer func_data;
   GtkDestroyNotify destroy;
   gint requested_width;
+  gint real_width;
   guint expand : 1;
   guint pack : 1;
   guint has_focus : 1;
+  guint in_editing_mode : 1;
 };
 
 /* Type methods */
 static void gtk_tree_view_column_init                          (GtkTreeViewColumn       *tree_column);
 static void gtk_tree_view_column_class_init                    (GtkTreeViewColumnClass  *klass);
+static void gtk_tree_view_column_cell_layout_init              (GtkCellLayoutIface      *iface);
 
 /* GObject methods */
 static void gtk_tree_view_column_set_property                  (GObject                 *object,
@@ -84,7 +89,30 @@ static void gtk_tree_view_column_get_property                  (GObject
                                                                GParamSpec              *pspec);
 static void gtk_tree_view_column_finalize                      (GObject                 *object);
 
-/* Button handling code */ 
+/* GtkCellLayout implementation */
+static void gtk_tree_view_column_cell_layout_pack_start         (GtkCellLayout         *cell_layout,
+                                                                 GtkCellRenderer       *cell,
+                                                                 gboolean               expand);
+static void gtk_tree_view_column_cell_layout_pack_end           (GtkCellLayout         *cell_layout,
+                                                                 GtkCellRenderer       *cell,
+                                                                 gboolean               expand);
+static void gtk_tree_view_column_cell_layout_clear              (GtkCellLayout         *cell_layout);
+static void gtk_tree_view_column_cell_layout_add_attribute      (GtkCellLayout         *cell_layout,
+                                                                 GtkCellRenderer       *cell,
+                                                                 const gchar           *attribute,
+                                                                 gint                   column);
+static void gtk_tree_view_column_cell_layout_set_cell_data_func (GtkCellLayout         *cell_layout,
+                                                                 GtkCellRenderer       *cell,
+                                                                 GtkCellLayoutDataFunc  func,
+                                                                 gpointer               func_data,
+                                                                 GDestroyNotify         destroy);
+static void gtk_tree_view_column_cell_layout_clear_attributes   (GtkCellLayout         *cell_layout,
+                                                                 GtkCellRenderer       *cell);
+static void gtk_tree_view_column_cell_layout_reorder            (GtkCellLayout         *cell_layout,
+                                                                 GtkCellRenderer       *cell,
+                                                                 gint                   position);
+
+/* Button handling code */
 static void gtk_tree_view_column_create_button                 (GtkTreeViewColumn       *tree_column);
 static void gtk_tree_view_column_update_button                 (GtkTreeViewColumn       *tree_column);
 
@@ -112,16 +140,24 @@ static void gtk_tree_view_column_set_attributesv               (GtkTreeViewColum
 static GtkTreeViewColumnCellInfo *gtk_tree_view_column_get_cell_info (GtkTreeViewColumn *tree_column,
                                                                      GtkCellRenderer   *cell_renderer);
 
-
+/* cell list manipulation */
+static GList *gtk_tree_view_column_cell_first                  (GtkTreeViewColumn      *tree_column);
+static GList *gtk_tree_view_column_cell_last                   (GtkTreeViewColumn      *tree_column);
+static GList *gtk_tree_view_column_cell_next                   (GtkTreeViewColumn      *tree_column,
+                                                               GList                  *current);
+static GList *gtk_tree_view_column_cell_prev                   (GtkTreeViewColumn      *tree_column,
+                                                               GList                  *current);
+static void gtk_tree_view_column_clear_attributes_by_info      (GtkTreeViewColumn      *tree_column,
+                                                               GtkTreeViewColumnCellInfo *info);
 
 static GtkObjectClass *parent_class = NULL;
 static guint tree_column_signals[LAST_SIGNAL] = { 0 };
 
 
-GtkType
+GType
 gtk_tree_view_column_get_type (void)
 {
-  static GtkType tree_column_type = 0;
+  static GType tree_column_type = 0;
 
   if (!tree_column_type)
     {
@@ -135,10 +171,23 @@ gtk_tree_view_column_get_type (void)
        NULL,           /* class_data */
        sizeof (GtkTreeViewColumn),
        0,
-       (GInstanceInitFunc) gtk_tree_view_column_init,
+       (GInstanceInitFunc) gtk_tree_view_column_init
+      };
+
+      static const GInterfaceInfo cell_layout_info =
+      {
+        (GInterfaceInitFunc) gtk_tree_view_column_cell_layout_init,
+        NULL,
+        NULL
       };
 
-      tree_column_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkTreeViewColumn", &tree_column_info, 0);
+      tree_column_type =
+       g_type_register_static (GTK_TYPE_OBJECT, "GtkTreeViewColumn",
+                               &tree_column_info, 0);
+
+      g_type_add_interface_static (tree_column_type,
+                                   GTK_TYPE_CELL_LAYOUT,
+                                   &cell_layout_info);
     }
 
   return tree_column_type;
@@ -161,34 +210,34 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
   
   tree_column_signals[CLICKED] =
     g_signal_new ("clicked",
-                  GTK_CLASS_TYPE (object_class),
+                  G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTreeViewColumnClass, clicked),
                   NULL, NULL,
                   _gtk_marshal_VOID__VOID,
-                  GTK_TYPE_NONE, 0);
+                  G_TYPE_NONE, 0);
 
   g_object_class_install_property (object_class,
                                    PROP_VISIBLE,
                                    g_param_spec_boolean ("visible",
-                                                        _("Visible"),
-                                                        _("Whether to display the column"),
+                                                        P_("Visible"),
+                                                        P_("Whether to display the column"),
                                                          TRUE,
                                                          G_PARAM_READABLE | G_PARAM_WRITABLE));
   
   g_object_class_install_property (object_class,
                                    PROP_RESIZABLE,
                                    g_param_spec_boolean ("resizable",
-                                                        _("Resizable"),
-                                                        _("Column is user-resizable"),
+                                                        P_("Resizable"),
+                                                        P_("Column is user-resizable"),
                                                          FALSE,
                                                          G_PARAM_READABLE | G_PARAM_WRITABLE));
   
   g_object_class_install_property (object_class,
                                    PROP_WIDTH,
                                    g_param_spec_int ("width",
-                                                    _("Width"),
-                                                    _("Current width of the column"),
+                                                    P_("Width"),
+                                                    P_("Current width of the column"),
                                                     0,
                                                     G_MAXINT,
                                                     0,
@@ -196,8 +245,8 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
   g_object_class_install_property (object_class,
                                    PROP_SIZING,
                                    g_param_spec_enum ("sizing",
-                                                      _("Sizing"),
-                                                      _("Resize mode of the column"),
+                                                      P_("Sizing"),
+                                                      P_("Resize mode of the column"),
                                                       GTK_TYPE_TREE_VIEW_COLUMN_SIZING,
                                                       GTK_TREE_VIEW_COLUMN_AUTOSIZE,
                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
@@ -205,8 +254,8 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
   g_object_class_install_property (object_class,
                                    PROP_FIXED_WIDTH,
                                    g_param_spec_int ("fixed_width",
-                                                     _("Fixed Width"),
-                                                     _("Current fixed width of the column"),
+                                                     P_("Fixed Width"),
+                                                     P_("Current fixed width of the column"),
                                                      1,
                                                      G_MAXINT,
                                                      1, /* not useful */
@@ -215,8 +264,8 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
   g_object_class_install_property (object_class,
                                    PROP_MIN_WIDTH,
                                    g_param_spec_int ("min_width",
-                                                     _("Minimum Width"),
-                                                     _("Minimum allowed width of the column"),
+                                                     P_("Minimum Width"),
+                                                     P_("Minimum allowed width of the column"),
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
@@ -225,8 +274,8 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
   g_object_class_install_property (object_class,
                                    PROP_MAX_WIDTH,
                                    g_param_spec_int ("max_width",
-                                                     _("Maximum Width"),
-                                                     _("Maximum allowed width of the column"),
+                                                     P_("Maximum Width"),
+                                                     P_("Maximum allowed width of the column"),
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
@@ -235,16 +284,24 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
   g_object_class_install_property (object_class,
                                    PROP_TITLE,
                                    g_param_spec_string ("title",
-                                                        _("Title"),
-                                                        _("Title to appear in column header"),
+                                                        P_("Title"),
+                                                        P_("Title to appear in column header"),
                                                         "",
                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
   
+  g_object_class_install_property (object_class,
+                                   PROP_EXPAND,
+                                   g_param_spec_boolean ("expand",
+                                                        P_("Expand"),
+                                                        P_("Column gets share of extra width allocated to the widget"),
+                                                        FALSE,
+                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+  
   g_object_class_install_property (object_class,
                                    PROP_CLICKABLE,
                                    g_param_spec_boolean ("clickable",
-                                                        _("Clickable"),
-                                                        _("Whether the header can be clicked"),
+                                                        P_("Clickable"),
+                                                        P_("Whether the header can be clicked"),
                                                          TRUE,
                                                          G_PARAM_READABLE | G_PARAM_WRITABLE));
   
@@ -252,16 +309,16 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
   g_object_class_install_property (object_class,
                                    PROP_WIDGET,
                                    g_param_spec_object ("widget",
-                                                        _("Widget"),
-                                                        _("Widget to put in column header button instead of column title"),
+                                                        P_("Widget"),
+                                                        P_("Widget to put in column header button instead of column title"),
                                                         GTK_TYPE_WIDGET,
                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
 
   g_object_class_install_property (object_class,
                                    PROP_ALIGNMENT,
                                    g_param_spec_float ("alignment",
-                                                       _("Alignment"),
-                                                       _("X Alignment of the column header text or widget"),
+                                                       P_("Alignment"),
+                                                       P_("X Alignment of the column header text or widget"),
                                                        0.0,
                                                        1.0,
                                                        0.5,
@@ -270,30 +327,42 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
   g_object_class_install_property (object_class,
                                    PROP_REORDERABLE,
                                    g_param_spec_boolean ("reorderable",
-                                                        _("Reorderable"),
-                                                        _("Whether the column can be reordered around the headers"),
+                                                        P_("Reorderable"),
+                                                        P_("Whether the column can be reordered around the headers"),
                                                         FALSE,
                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
 
   g_object_class_install_property (object_class,
                                    PROP_SORT_INDICATOR,
                                    g_param_spec_boolean ("sort_indicator",
-                                                        _("Sort indicator"),
-                                                        _("Whether to show a sort indicator"),
+                                                        P_("Sort indicator"),
+                                                        P_("Whether to show a sort indicator"),
                                                          FALSE,
                                                          G_PARAM_READABLE | G_PARAM_WRITABLE));
 
   g_object_class_install_property (object_class,
                                    PROP_SORT_ORDER,
                                    g_param_spec_enum ("sort_order",
-                                                      _("Sort order"),
-                                                      _("Sort direction the sort indicator should indicate"),
+                                                      P_("Sort order"),
+                                                      P_("Sort direction the sort indicator should indicate"),
                                                       GTK_TYPE_SORT_TYPE,
                                                       GTK_SORT_ASCENDING,
                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
   
 }
 
+static void
+gtk_tree_view_column_cell_layout_init (GtkCellLayoutIface *iface)
+{
+  iface->pack_start = gtk_tree_view_column_cell_layout_pack_start;
+  iface->pack_end = gtk_tree_view_column_cell_layout_pack_end;
+  iface->clear = gtk_tree_view_column_cell_layout_clear;
+  iface->add_attribute = gtk_tree_view_column_cell_layout_add_attribute;
+  iface->set_cell_data_func = gtk_tree_view_column_cell_layout_set_cell_data_func;
+  iface->clear_attributes = gtk_tree_view_column_cell_layout_clear_attributes;
+  iface->reorder = gtk_tree_view_column_cell_layout_reorder;
+}
+
 static void
 gtk_tree_view_column_init (GtkTreeViewColumn *tree_column)
 {
@@ -329,14 +398,24 @@ gtk_tree_view_column_finalize (GObject *object)
   for (list = tree_column->cell_list; list; list = list->next)
     {
       GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) list->data;
-      if (info->func_data && info->destroy)
-       (info->destroy) (info->func_data);
-      gtk_tree_view_column_clear_attributes (tree_column, info->cell);
-      g_object_unref (G_OBJECT (info->cell));
+
+      if (info->destroy)
+       {
+         GtkDestroyNotify d = info->destroy;
+
+         info->destroy = NULL;
+         d (info->func_data);
+       }
+      gtk_tree_view_column_clear_attributes_by_info (tree_column, info);
+      g_object_unref (info->cell);
       g_free (info);
     }
 
   g_free (tree_column->title);
+  g_list_free (tree_column->cell_list);
+
+  if (tree_column->child)
+    g_object_unref (tree_column->child);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -388,6 +467,11 @@ gtk_tree_view_column_set_property (GObject         *object,
                                       g_value_get_string (value));
       break;
 
+    case PROP_EXPAND:
+      gtk_tree_view_column_set_expand (tree_column,
+                                      g_value_get_boolean (value));
+      break;
+
     case PROP_CLICKABLE:
       gtk_tree_view_column_set_clickable (tree_column,
                                           g_value_get_boolean (value));
@@ -476,6 +560,11 @@ gtk_tree_view_column_get_property (GObject         *object,
                           gtk_tree_view_column_get_title (tree_column));
       break;
 
+    case PROP_EXPAND:
+      g_value_set_boolean (value,
+                          gtk_tree_view_column_get_expand (tree_column));
+      break;
+
     case PROP_CLICKABLE:
       g_value_set_boolean (value,
                            gtk_tree_view_column_get_clickable (tree_column));
@@ -512,6 +601,194 @@ gtk_tree_view_column_get_property (GObject         *object,
     }
 }
 
+/* Implementation of GtkCellLayout interface
+ */
+
+static void
+gtk_tree_view_column_cell_layout_pack_start (GtkCellLayout   *cell_layout,
+                                             GtkCellRenderer *cell,
+                                             gboolean         expand)
+{
+  GtkTreeViewColumn *column;
+  GtkTreeViewColumnCellInfo *cell_info;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
+  column = GTK_TREE_VIEW_COLUMN (cell_layout);
+  g_return_if_fail (! gtk_tree_view_column_get_cell_info (column, cell));
+
+  g_object_ref (cell);
+  gtk_object_sink (GTK_OBJECT (cell));
+
+  cell_info = g_new0 (GtkTreeViewColumnCellInfo, 1);
+  cell_info->cell = cell;
+  cell_info->expand = expand ? TRUE : FALSE;
+  cell_info->pack = GTK_PACK_START;
+  cell_info->has_focus = 0;
+  cell_info->attributes = NULL;
+
+  column->cell_list = g_list_append (column->cell_list, cell_info);
+}
+
+static void
+gtk_tree_view_column_cell_layout_pack_end (GtkCellLayout   *cell_layout,
+                                           GtkCellRenderer *cell,
+                                           gboolean         expand)
+{
+  GtkTreeViewColumn *column;
+  GtkTreeViewColumnCellInfo *cell_info;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
+  column = GTK_TREE_VIEW_COLUMN (cell_layout);
+  g_return_if_fail (! gtk_tree_view_column_get_cell_info (column, cell));
+
+  g_object_ref (cell);
+  gtk_object_sink (GTK_OBJECT (cell));
+
+  cell_info = g_new0 (GtkTreeViewColumnCellInfo, 1);
+  cell_info->cell = cell;
+  cell_info->expand = expand ? TRUE : FALSE;
+  cell_info->pack = GTK_PACK_END;
+  cell_info->has_focus = 0;
+  cell_info->attributes = NULL;
+
+  column->cell_list = g_list_append (column->cell_list, cell_info);
+}
+
+static void
+gtk_tree_view_column_cell_layout_clear (GtkCellLayout *cell_layout)
+{
+  GtkTreeViewColumn *column;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
+  column = GTK_TREE_VIEW_COLUMN (cell_layout);
+
+  while (column->cell_list)
+    {
+      GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)column->cell_list->data;
+
+      gtk_tree_view_column_cell_layout_clear_attributes (cell_layout, info->cell);
+      g_object_unref (G_OBJECT (info->cell));
+      g_free (info);
+      column->cell_list = g_list_delete_link (column->cell_list, 
+                                             column->cell_list);
+    }
+}
+
+static void
+gtk_tree_view_column_cell_layout_add_attribute (GtkCellLayout   *cell_layout,
+                                                GtkCellRenderer *cell,
+                                                const gchar     *attribute,
+                                                gint             column)
+{
+  GtkTreeViewColumn *tree_column;
+  GtkTreeViewColumnCellInfo *info;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
+  tree_column = GTK_TREE_VIEW_COLUMN (cell_layout);
+
+  info = gtk_tree_view_column_get_cell_info (tree_column, cell);
+  g_return_if_fail (info != NULL);
+
+  info->attributes = g_slist_prepend (info->attributes, GINT_TO_POINTER (column));
+  info->attributes = g_slist_prepend (info->attributes, g_strdup (attribute));
+
+  if (tree_column->tree_view)
+    _gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
+}
+
+static void
+gtk_tree_view_column_cell_layout_set_cell_data_func (GtkCellLayout         *cell_layout,
+                                                     GtkCellRenderer       *cell,
+                                                     GtkCellLayoutDataFunc  func,
+                                                     gpointer               func_data,
+                                                     GDestroyNotify         destroy)
+{
+  GtkTreeViewColumn *column;
+  GtkTreeViewColumnCellInfo *info;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
+  column = GTK_TREE_VIEW_COLUMN (cell_layout);
+
+  info = gtk_tree_view_column_get_cell_info (column, cell);
+  g_return_if_fail (info != NULL);
+
+  if (info->destroy)
+    {
+      GDestroyNotify d = info->destroy;
+
+      info->destroy = NULL;
+      d (info->func_data);
+    }
+
+  info->func = (GtkTreeCellDataFunc)func;
+  info->func_data = func_data;
+  info->destroy = destroy;
+
+  if (column->tree_view)
+    _gtk_tree_view_column_cell_set_dirty (column, TRUE);
+}
+
+static void
+gtk_tree_view_column_cell_layout_clear_attributes (GtkCellLayout    *cell_layout,
+                                                   GtkCellRenderer  *cell_renderer)
+{
+  GtkTreeViewColumn *column;
+  GtkTreeViewColumnCellInfo *info;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
+  column = GTK_TREE_VIEW_COLUMN (cell_layout);
+
+  info = gtk_tree_view_column_get_cell_info (column, cell_renderer);
+  gtk_tree_view_column_clear_attributes_by_info (column, info);
+}
+
+static void
+gtk_tree_view_column_cell_layout_reorder (GtkCellLayout   *cell_layout,
+                                          GtkCellRenderer *cell,
+                                          gint             position)
+{
+  GList *link;
+  GtkTreeViewColumn *column;
+  GtkTreeViewColumnCellInfo *info;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (cell_layout));
+  column = GTK_TREE_VIEW_COLUMN (cell_layout);
+
+  info = gtk_tree_view_column_get_cell_info (column, cell);
+
+  g_return_if_fail (info != NULL);
+  g_return_if_fail (position >= 0);
+
+  link = g_list_find (column->cell_list, info);
+
+  g_return_if_fail (link != NULL);
+
+  column->cell_list = g_list_remove_link (column->cell_list, link);
+  column->cell_list = g_list_insert (column->cell_list, info, position);
+
+  gtk_widget_queue_draw (column->tree_view);
+}
+
+static void
+gtk_tree_view_column_clear_attributes_by_info (GtkTreeViewColumn *tree_column,
+                                              GtkTreeViewColumnCellInfo *info)
+{
+  GSList *list;
+
+  list = info->attributes;
+
+  while (list && list->next)
+    {
+      g_free (list->data);
+      list = list->next->next;
+    }
+  g_slist_free (info->attributes);
+  info->attributes = NULL;
+
+  if (tree_column->tree_view)
+    _gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
+}
+
 /* Helper functions
  */
 
@@ -539,13 +816,12 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
     gtk_widget_set_parent_window (tree_column->button, tree_view->priv->header_window);
   gtk_widget_set_parent (tree_column->button, GTK_WIDGET (tree_view));
 
-  g_signal_connect (G_OBJECT (tree_column->button), "event",
+  g_signal_connect (tree_column->button, "event",
                    G_CALLBACK (gtk_tree_view_column_button_event),
-                   (gpointer) tree_column);
-
-  g_signal_connect (G_OBJECT (tree_column->button), "clicked",
-                   (GtkSignalFunc) gtk_tree_view_column_button_clicked,
-                   (gpointer) tree_column);
+                   tree_column);
+  g_signal_connect (tree_column->button, "clicked",
+                   G_CALLBACK (gtk_tree_view_column_button_clicked),
+                   tree_column);
 
   tree_column->alignment = gtk_alignment_new (tree_column->xalign, 0.5, 0.0, 0.0);
 
@@ -560,9 +836,9 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
       gtk_widget_show (child);
     }
 
-  g_signal_connect (G_OBJECT (child), "mnemonic_activate",
+  g_signal_connect (child, "mnemonic_activate",
                    G_CALLBACK (gtk_tree_view_column_mnemonic_activate),
-                   (gpointer) tree_column);
+                   tree_column);
 
   if (tree_column->xalign <= 0.5)
     gtk_box_pack_end (GTK_BOX (hbox), tree_column->arrow, FALSE, FALSE, 0);
@@ -655,11 +931,11 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
       break;
     }
 
-  /* Put arrow on the right if the text is left-or-center justified,
-       * and on the left otherwise; do this by packing boxes, so flipping
-       * text direction will reverse things
-       */
-  gtk_widget_ref (arrow);
+  /* Put arrow on the right if the text is left-or-center justified, and on the
+   * left otherwise; do this by packing boxes, so flipping text direction will
+   * reverse things
+   */
+  g_object_ref (arrow);
   gtk_container_remove (GTK_CONTAINER (hbox), arrow);
 
   if (tree_column->xalign <= 0.5)
@@ -672,15 +948,15 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
       /* move it to the front */
       gtk_box_reorder_child (GTK_BOX (hbox), arrow, 0);
     }
-  gtk_widget_unref (arrow);
+  g_object_unref (arrow);
 
   if (tree_column->show_sort_indicator)
     gtk_widget_show (arrow);
   else
     gtk_widget_hide (arrow);
 
-  /* It's always safe to hide the button.  It isn't always safe to show it, as if you show it
-   * before it's realized, it'll get the wrong window. */
+  /* It's always safe to hide the button.  It isn't always safe to show it, as
+   * if you show it before it's realized, it'll get the wrong window. */
   if (tree_column->button &&
       tree_column->tree_view != NULL &&
       GTK_WIDGET_REALIZED (tree_column->tree_view))
@@ -799,7 +1075,7 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
 static void
 gtk_tree_view_column_button_clicked (GtkWidget *widget, gpointer data)
 {
-  g_signal_emit_by_name (G_OBJECT (data), "clicked");
+  g_signal_emit_by_name (data, "clicked");
 }
 
 static gboolean
@@ -811,17 +1087,13 @@ gtk_tree_view_column_mnemonic_activate (GtkWidget *widget,
 
   g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (column), FALSE);
 
+  GTK_TREE_VIEW (column->tree_view)->priv->focus_column = column;
   if (column->clickable)
     gtk_button_clicked (GTK_BUTTON (column->button));
   else if (GTK_WIDGET_CAN_FOCUS (column->button))
     gtk_widget_grab_focus (column->button);
   else
-    {
-      GTK_TREE_VIEW (column->tree_view)->priv->focus_column = column;
-      GTK_TREE_VIEW_SET_FLAG (GTK_TREE_VIEW (column->tree_view),
-                             GTK_TREE_VIEW_DRAW_KEYFOCUS);
-      gtk_widget_grab_focus (column->tree_view);
-    }
+    gtk_widget_grab_focus (column->tree_view);
 
   return TRUE;
 }
@@ -916,10 +1188,10 @@ gtk_tree_view_column_setup_sort_column_id_callback (GtkTreeViewColumn *tree_colu
       GtkSortType real_order;
 
       if (tree_column->sort_column_changed_signal == 0)
-       tree_column->sort_column_changed_signal =
-         g_signal_connect (G_OBJECT (model), "sort_column_changed",
-                            GTK_SIGNAL_FUNC (gtk_tree_view_model_sort_column_changed),
-                            tree_column);
+        tree_column->sort_column_changed_signal =
+         g_signal_connect (model, "sort_column_changed",
+                           G_CALLBACK (gtk_tree_view_model_sort_column_changed),
+                           tree_column);
       
       if (gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model),
                                                &real_sort_column_id,
@@ -945,8 +1217,10 @@ _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column)
   GtkTreeView *tree_view;
   GdkWindowAttr attr;
   guint attributes_mask;
+  gboolean rtl;
 
   tree_view = (GtkTreeView *)column->tree_view;
+  rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
 
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
   g_return_if_fail (GTK_WIDGET_REALIZED (tree_view));
@@ -962,21 +1236,20 @@ _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column)
   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 |
+  attr.event_mask = gtk_widget_get_events (GTK_WIDGET (tree_view)) |
+                    (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);
-
+  attr.cursor = gdk_cursor_new_for_display (gdk_drawable_get_display (tree_view->priv->header_window),
+                                           GDK_SB_H_DOUBLE_ARROW);
   attr.y = 0;
   attr.width = TREE_VIEW_DRAG_WIDTH;
   attr.height = tree_view->priv->header_height;
 
-  attr.x = (column->button->allocation.x + column->button->allocation.width) - 3;
-          
+  attr.x = (column->button->allocation.x + (rtl ? 0 : column->button->allocation.width)) - 3;
   column->window = gdk_window_new (tree_view->priv->header_window,
                                   &attr, attributes_mask);
   gdk_window_set_user_data (column->window, tree_view);
@@ -997,6 +1270,18 @@ _gtk_tree_view_column_unrealize_button (GtkTreeViewColumn *column)
   column->window = NULL;
 }
 
+void
+_gtk_tree_view_column_unset_model (GtkTreeViewColumn *column,
+                                  GtkTreeModel      *old_model)
+{
+  if (column->sort_column_changed_signal)
+    {
+      g_signal_handler_disconnect (old_model,
+                                  column->sort_column_changed_signal);
+      column->sort_column_changed_signal = 0;
+    }
+}
+
 void
 _gtk_tree_view_column_set_tree_view (GtkTreeViewColumn *column,
                                     GtkTreeView       *tree_view)
@@ -1007,9 +1292,9 @@ _gtk_tree_view_column_set_tree_view (GtkTreeViewColumn *column,
   gtk_tree_view_column_create_button (column);
 
   column->property_changed_signal =
-         g_signal_connect_swapped (GTK_OBJECT (tree_view),
+         g_signal_connect_swapped (tree_view,
                                    "notify::model",
-                                   GTK_SIGNAL_FUNC (gtk_tree_view_column_setup_sort_column_id_callback),
+                                   G_CALLBACK (gtk_tree_view_column_setup_sort_column_id_callback),
                                    column);
 
   gtk_tree_view_column_setup_sort_column_id_callback (column);
@@ -1024,13 +1309,13 @@ _gtk_tree_view_column_unset_tree_view (GtkTreeViewColumn *column)
     }
   if (column->property_changed_signal)
     {
-      g_signal_handler_disconnect (G_OBJECT (column->tree_view), column->property_changed_signal);
+      g_signal_handler_disconnect (column->tree_view, column->property_changed_signal);
       column->property_changed_signal = 0;
     }
 
   if (column->sort_column_changed_signal)
     {
-      g_signal_handler_disconnect (G_OBJECT (gtk_tree_view_get_model (GTK_TREE_VIEW (column->tree_view))),
+      g_signal_handler_disconnect (gtk_tree_view_get_model (GTK_TREE_VIEW (column->tree_view)),
                                   column->sort_column_changed_signal);
       column->sort_column_changed_signal = 0;
     }
@@ -1039,6 +1324,70 @@ _gtk_tree_view_column_unset_tree_view (GtkTreeViewColumn *column)
   column->button = NULL;
 }
 
+gboolean
+_gtk_tree_view_column_has_editable_cell (GtkTreeViewColumn *column)
+{
+  GList *list;
+
+  for (list = column->cell_list; list; list = list->next)
+    if (((GtkTreeViewColumnCellInfo *)list->data)->cell->mode ==
+       GTK_CELL_RENDERER_MODE_EDITABLE)
+      return TRUE;
+
+  return FALSE;
+}
+
+/* gets cell being edited */
+GtkCellRenderer *
+_gtk_tree_view_column_get_edited_cell (GtkTreeViewColumn *column)
+{
+  GList *list;
+
+  for (list = column->cell_list; list; list = list->next)
+    if (((GtkTreeViewColumnCellInfo *)list->data)->in_editing_mode)
+      return ((GtkTreeViewColumnCellInfo *)list->data)->cell;
+
+  return NULL;
+}
+
+gint
+_gtk_tree_view_column_count_special_cells (GtkTreeViewColumn *column)
+{
+  gint i = 0;
+  GList *list;
+
+  for (list = column->cell_list; list; list = list->next)
+    {
+      GtkTreeViewColumnCellInfo *cellinfo = list->data;
+
+      if ((cellinfo->cell->mode == GTK_CELL_RENDERER_MODE_EDITABLE ||
+         cellinfo->cell->mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE) &&
+         cellinfo->cell->visible)
+       i++;
+    }
+
+  return i;
+}
+
+GtkCellRenderer *
+_gtk_tree_view_column_get_cell_at_pos (GtkTreeViewColumn *column,
+                                      gint               x)
+{
+  GList *list;
+  gint current_x = 0;
+
+  list = gtk_tree_view_column_cell_first (column);
+  for (; list; list = gtk_tree_view_column_cell_next (column, list))
+   {
+     GtkTreeViewColumnCellInfo *cellinfo = list->data;
+     if (current_x <= x && x <= current_x + cellinfo->real_width)
+       return cellinfo->cell;
+     current_x += cellinfo->real_width;
+   }
+
+  return NULL;
+}
+
 /* Public Functions */
 
 
@@ -1054,7 +1403,7 @@ gtk_tree_view_column_new (void)
 {
   GtkTreeViewColumn *tree_column;
 
-  tree_column = GTK_TREE_VIEW_COLUMN (gtk_type_new (GTK_TYPE_TREE_VIEW_COLUMN));
+  tree_column = g_object_new (GTK_TYPE_TREE_VIEW_COLUMN, NULL);
 
   return tree_column;
 }
@@ -1069,6 +1418,22 @@ gtk_tree_view_column_new (void)
  * equivalent to calling gtk_tree_view_column_set_title(),
  * gtk_tree_view_column_pack_start(), and
  * gtk_tree_view_column_set_attributes() on the newly created #GtkTreeViewColumn.
+ *
+ * Here's a simple example:
+ * <informalexample><programlisting>
+ *  enum { TEXT_COLUMN, COLOR_COLUMN, N_COLUMNS };
+ *  ...
+ *  {
+ *    GtkTreeViewColumn *column;
+ *    GtkCellRenderer   *renderer = gtk_cell_renderer_text_new (<!-- -->);
+ *  
+ *    column = gtk_tree_view_column_new_with_attributes ("Title",
+ *                                                       renderer,
+ *                                                       "text", TEXT_COLUMN,
+ *                                                       "foreground", COLOR_COLUMN,
+ *                                                       NULL);
+ *  }
+ * </programlisting></informalexample>
  * 
  * Return value: A newly created #GtkTreeViewColumn.
  **/
@@ -1108,69 +1473,38 @@ gtk_tree_view_column_get_cell_info (GtkTreeViewColumn *tree_column,
  * gtk_tree_view_column_pack_start:
  * @tree_column: A #GtkTreeViewColumn.
  * @cell: The #GtkCellRenderer. 
- * @expand: %TRUE if @cell is to be given extra space allocated to box.
+ * @expand: %TRUE if @cell is to be given extra space allocated to @tree_column.
  *
- * Packs the @cell into the beginning column.  If @expand is %TRUE, then the
- * @cell is allocated a share of all available space that the @tree_column has.
+ * Packs the @cell into the beginning of the column. If @expand is %FALSE, then
+ * the @cell is allocated no more space than it needs. Any unused space is divided
+ * evenly between cells for which @expand is %TRUE.
  **/
 void
 gtk_tree_view_column_pack_start (GtkTreeViewColumn *tree_column,
                                 GtkCellRenderer   *cell,
                                 gboolean           expand)
 {
-  GtkTreeViewColumnCellInfo *cell_info;
-
-  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-  g_return_if_fail (! gtk_tree_view_column_get_cell_info (tree_column, cell));
-
-  g_object_ref (G_OBJECT (cell));
-  gtk_object_sink (GTK_OBJECT (cell));
-
-  cell_info = g_new0 (GtkTreeViewColumnCellInfo, 1);
-  cell_info->cell = cell;
-  cell_info->expand = expand ? TRUE : FALSE;
-  cell_info->pack = GTK_PACK_START;
-  cell_info->has_focus = 0;
-  cell_info->attributes = NULL;
-
-  tree_column->cell_list = g_list_append (tree_column->cell_list, cell_info);
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (tree_column), cell, expand);
 }
 
 /**
  * gtk_tree_view_column_pack_end:
  * @tree_column: A #GtkTreeViewColumn.
  * @cell: The #GtkCellRenderer. 
- * @expand: %TRUE if @cell is to be given extra space allocated to box.
+ * @expand: %TRUE if @cell is to be given extra space allocated to @tree_column.
  *
- * Packs the @cell into the column.  If @expand is %TRUE, then the @cell is
- * allocated a share of all available space that the @tree_column has.
+ * Adds the @cell to end of the column. If @expand is %FALSE, then the @cell
+ * is allocated no more space than it needs. Any unused space is divided
+ * evenly between cells for which @expand is %TRUE.
  **/
 void
 gtk_tree_view_column_pack_end (GtkTreeViewColumn  *tree_column,
                               GtkCellRenderer    *cell,
                               gboolean            expand)
 {
-  GtkTreeViewColumnCellInfo *cell_info;
-
-  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-  g_return_if_fail (! gtk_tree_view_column_get_cell_info (tree_column, cell));
-
-  g_object_ref (G_OBJECT (cell));
-  gtk_object_sink (GTK_OBJECT (cell));
-
-  cell_info = g_new (GtkTreeViewColumnCellInfo, 1);
-  cell_info->cell = cell;
-  cell_info->expand = expand ? TRUE : FALSE;
-  cell_info->pack = GTK_PACK_END;
-  cell_info->has_focus = 0;
-  cell_info->attributes = NULL;
-
-  tree_column->cell_list = g_list_append (tree_column->cell_list, cell_info);
+  gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (tree_column), cell, expand);
 }
 
-
 /**
  * gtk_tree_view_column_clear:
  * @tree_column: A #GtkTreeViewColumn
@@ -1180,20 +1514,7 @@ gtk_tree_view_column_pack_end (GtkTreeViewColumn  *tree_column,
 void
 gtk_tree_view_column_clear (GtkTreeViewColumn *tree_column)
 {
-  GList *list;
-  g_return_if_fail (tree_column != NULL);
-
-  for (list = tree_column->cell_list; list; list = list->next)
-    {
-      GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)list->data;
-
-      g_object_unref (G_OBJECT (info->cell));
-      gtk_tree_view_column_clear_attributes (tree_column, info->cell);
-      g_free (info);
-    }
-
-  g_list_free (tree_column->cell_list);
-  tree_column->cell_list = NULL;
+  gtk_cell_layout_clear (GTK_CELL_LAYOUT (tree_column));
 }
 
 /**
@@ -1242,18 +1563,8 @@ gtk_tree_view_column_add_attribute (GtkTreeViewColumn *tree_column,
                                    const gchar       *attribute,
                                    gint               column)
 {
-  GtkTreeViewColumnCellInfo *info;
-
-  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
-  info = gtk_tree_view_column_get_cell_info (tree_column, cell_renderer);
-  g_return_if_fail (info != NULL);
-
-  info->attributes = g_slist_prepend (info->attributes, GINT_TO_POINTER (column));
-  info->attributes = g_slist_prepend (info->attributes, g_strdup (attribute));
-
-  if (tree_column->tree_view)
-    _gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
-
+  gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (tree_column),
+                                 cell_renderer, attribute, column);
 }
 
 static void
@@ -1325,29 +1636,11 @@ gtk_tree_view_column_set_cell_data_func (GtkTreeViewColumn   *tree_column,
                                         gpointer             func_data,
                                         GtkDestroyNotify     destroy)
 {
-  GtkTreeViewColumnCellInfo *info;
-
-  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell_renderer));
-  info = gtk_tree_view_column_get_cell_info (tree_column, cell_renderer);
-
-  g_return_if_fail (info != NULL);
-
-  if (func == info->func &&
-      func_data == info->func_data &&
-      destroy == info->destroy)
-    return;
-
-  if (info->func_data && info->destroy)
-    (info->destroy) (info->func_data);
-
-  info->func = func;
-  info->func_data = func_data;
-  info->destroy = destroy;
-
-  if (tree_column->tree_view)
-    _gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
-}
+  gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (tree_column),
+                                      cell_renderer,
+                                      (GtkCellLayoutDataFunc)func,
+                                      func_data, destroy);
+}
 
 
 /**
@@ -1362,28 +1655,10 @@ void
 gtk_tree_view_column_clear_attributes (GtkTreeViewColumn *tree_column,
                                       GtkCellRenderer   *cell_renderer)
 {
-  GtkTreeViewColumnCellInfo *info;
-  GSList *list;
-
-  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell_renderer));
-  info = gtk_tree_view_column_get_cell_info (tree_column, cell_renderer);
-
-  list = info->attributes;
-
-  while (list && list->next)
-    {
-      g_free (list->data);
-      list = list->next->next;
-    }
-  g_slist_free (info->attributes);
-  info->attributes = NULL;
-
-  if (tree_column->tree_view)
-    _gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
+  gtk_cell_layout_clear_attributes (GTK_CELL_LAYOUT (tree_column),
+                                    cell_renderer);
 }
 
-
 /**
  * gtk_tree_view_column_set_spacing:
  * @tree_column: A #GtkTreeViewColumn.
@@ -1475,9 +1750,9 @@ gtk_tree_view_column_get_visible (GtkTreeViewColumn *tree_column)
  * @resizable: %TRUE, if the column can be resized
  * 
  * If @resizable is %TRUE, then the user can explicitly resize the column by
- * grabbing the outer edge of the column button.  If the sizing mode of the
- * column is #GTK_TREE_VIEW_COLUMN_AUTOSIZE, then it is changed to
- * #GTK_TREE_VIEW_COLUMN_GROW_ONLY.
+ * grabbing the outer edge of the column button.  If resizable is %TRUE and
+ * sizing mode of the column is #GTK_TREE_VIEW_COLUMN_AUTOSIZE, then the sizing
+ * mode is changed to #GTK_TREE_VIEW_COLUMN_GROW_ONLY.
  **/
 void
 gtk_tree_view_column_set_resizable (GtkTreeViewColumn *tree_column,
@@ -1504,9 +1779,9 @@ gtk_tree_view_column_set_resizable (GtkTreeViewColumn *tree_column,
  * gtk_tree_view_column_get_resizable:
  * @tree_column: A #GtkTreeViewColumn
  * 
- * Returns #TRUE if the @tree_column can be resized by the end user.
+ * Returns %TRUE if the @tree_column can be resized by the end user.
  * 
- * Return value: #TRUE, if the @tree_column can be resized.
+ * Return value: %TRUE, if the @tree_column can be resized.
  **/
 gboolean
 gtk_tree_view_column_get_resizable (GtkTreeViewColumn *tree_column)
@@ -1591,9 +1866,10 @@ gtk_tree_view_column_get_width (GtkTreeViewColumn *tree_column)
  * @fixed_width: The size to set @tree_column to. Must be greater than 0.
  * 
  * Sets the size of the column in pixels.  This is meaningful only if the sizing
- * type is #GTK_TREE_VIEW_COLUMN_FIXED.  In this case, the value is discarded
- * as the size of the column is based on the calculated width of the column. The
- * width is clamped to the min/max width for the column.
+ * type is #GTK_TREE_VIEW_COLUMN_FIXED.  The size of the column is clamped to
+ * the min/max width for the column.  Please note that the min/max width of the
+ * column doesn't actually affect the "fixed_width" property of the widget, just
+ * the actual size when displayed.
  **/
 void
 gtk_tree_view_column_set_fixed_width (GtkTreeViewColumn *tree_column,
@@ -1602,10 +1878,8 @@ gtk_tree_view_column_set_fixed_width (GtkTreeViewColumn *tree_column,
   g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
   g_return_if_fail (fixed_width > 0);
 
-  if (tree_column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
-    return;
-
   tree_column->fixed_width = fixed_width;
+  tree_column->use_resized_width = FALSE;
 
   if (tree_column->tree_view &&
       GTK_WIDGET_REALIZED (tree_column->tree_view) &&
@@ -1669,6 +1943,10 @@ gtk_tree_view_column_set_min_width (GtkTreeViewColumn *tree_column,
     }
   g_object_notify (G_OBJECT (tree_column), "min_width");
   g_object_thaw_notify (G_OBJECT (tree_column));
+
+  if (tree_column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
+    _gtk_tree_view_column_autosize (GTK_TREE_VIEW (tree_column->tree_view),
+                                   tree_column);
 }
 
 /**
@@ -1725,6 +2003,10 @@ gtk_tree_view_column_set_max_width (GtkTreeViewColumn *tree_column,
     }
   g_object_notify (G_OBJECT (tree_column), "max_width");
   g_object_thaw_notify (G_OBJECT (tree_column));
+
+  if (tree_column->column_type == GTK_TREE_VIEW_COLUMN_AUTOSIZE)
+    _gtk_tree_view_column_autosize (GTK_TREE_VIEW (tree_column->tree_view),
+                                   tree_column);
 }
 
 /**
@@ -1774,13 +2056,13 @@ void
 gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column,
                                const gchar       *title)
 {
+  gchar *new_title;
+  
   g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
 
+  new_title = g_strdup (title);
   g_free (tree_column->title);
-  if (title)
-    tree_column->title = g_strdup (title);
-  else
-    tree_column->title = NULL;
+  tree_column->title = new_title;
 
   gtk_tree_view_column_update_button (tree_column);
   g_object_notify (G_OBJECT (tree_column), "title");
@@ -1790,9 +2072,10 @@ gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column,
  * gtk_tree_view_column_get_title:
  * @tree_column: A #GtkTreeViewColumn.
  * 
- * Returns the title of the widget.  This value should not be modified.
+ * Returns the title of the widget.
  * 
- * Return value: the title of the column.
+ * Return value: the title of the column. This string should not be
+ * modified or freed.
  **/
 G_CONST_RETURN gchar *
 gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column)
@@ -1802,6 +2085,57 @@ gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column)
   return tree_column->title;
 }
 
+/**
+ * gtk_tree_view_column_set_expand:
+ * @tree_column: A #GtkTreeViewColumn
+ * @expand: 
+ * 
+ * Sets the column to take available extra space.  This space is shared equally
+ * amongst all columns that have the expand set to %TRUE.  If no column has this
+ * option set, then the last column gets all extra space.  By default, every
+ * column is created with this %FALSE.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_tree_view_column_set_expand (GtkTreeViewColumn *tree_column,
+                                gboolean           expand)
+{
+  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
+
+  expand = expand?TRUE:FALSE;
+  if (tree_column->expand == expand)
+    return;
+  tree_column->expand = expand;
+
+  if (tree_column->visible &&
+      tree_column->tree_view != NULL &&
+      GTK_WIDGET_REALIZED (tree_column->tree_view))
+    {
+      gtk_widget_queue_resize (tree_column->tree_view);
+    }
+
+  g_object_notify (G_OBJECT (tree_column), "expand");
+}
+
+/**
+ * gtk_tree_view_column_get_expand:
+ * @tree_column: 
+ * 
+ * Return %TRUE if the column expands to take any available space.
+ * 
+ * Return value: %TRUE, if the column expands
+ *
+ * Since: 2.4
+ **/
+gboolean
+gtk_tree_view_column_get_expand (GtkTreeViewColumn *tree_column)
+{
+  g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
+
+  return tree_column->expand;
+}
+
 /**
  * gtk_tree_view_column_set_clickable:
  * @tree_column: A #GtkTreeViewColumn.
@@ -1858,12 +2192,12 @@ gtk_tree_view_column_set_widget (GtkTreeViewColumn *tree_column,
 
   if (widget)
     {
-      gtk_object_ref (GTK_OBJECT (widget));
+      g_object_ref (widget);
       gtk_object_sink (GTK_OBJECT (widget));
     }
 
   if (tree_column->child)      
-    gtk_object_unref (GTK_OBJECT (tree_column->child));
+    g_object_unref (tree_column->child);
 
   tree_column->child = widget;
   gtk_tree_view_column_update_button (tree_column);
@@ -1874,11 +2208,10 @@ gtk_tree_view_column_set_widget (GtkTreeViewColumn *tree_column,
  * gtk_tree_view_column_get_widget:
  * @tree_column: A #GtkTreeViewColumn.
  * 
- * Returns the #GtkWidget in the button in the column header.  If a custom
- * widget has not been set, then this will be a #GtkAlignment with a #GtkLabel
- * in it.
+ * Returns the #GtkWidget in the button on the column header.  If a custom
+ * widget has not been set then %NULL is returned.
  * 
- * Return value: The #GtkWidget in the column header.
+ * Return value: The #GtkWidget in the column header, or %NULL
  **/
 GtkWidget *
 gtk_tree_view_column_get_widget (GtkTreeViewColumn *tree_column)
@@ -1933,9 +2266,9 @@ gtk_tree_view_column_get_alignment (GtkTreeViewColumn *tree_column)
 /**
  * gtk_tree_view_column_set_reorderable:
  * @tree_column: A #GtkTreeViewColumn
- * @reorderable: #TRUE, if the column can be reordered.
+ * @reorderable: %TRUE, if the column can be reordered.
  * 
- * If @reorderable is #TRUE, then the column can be reordered by the end user
+ * If @reorderable is %TRUE, then the column can be reordered by the end user
  * dragging the header.
  **/
 void
@@ -1959,9 +2292,9 @@ gtk_tree_view_column_set_reorderable (GtkTreeViewColumn *tree_column,
  * gtk_tree_view_column_get_reorderable:
  * @tree_column: A #GtkTreeViewColumn
  * 
- * Returns #TRUE if the @tree_column can be reordered by the user.
+ * Returns %TRUE if the @tree_column can be reordered by the user.
  * 
- * Return value: #TRUE if the @tree_column can be reordered by the user.
+ * Return value: %TRUE if the @tree_column can be reordered by the user.
  **/
 gboolean
 gtk_tree_view_column_get_reorderable (GtkTreeViewColumn *tree_column)
@@ -1976,7 +2309,7 @@ gtk_tree_view_column_get_reorderable (GtkTreeViewColumn *tree_column)
  * gtk_tree_view_column_set_sort_column_id:
  * @tree_column: a #GtkTreeViewColumn
  * @sort_column_id: The @sort_column_id of the model to sort on.
- * 
+ *
  * Sets the logical @sort_column_id that this column sorts on when this column 
  * is selected for sorting.  Doing so makes the column header clickable.
  **/
@@ -1985,7 +2318,7 @@ gtk_tree_view_column_set_sort_column_id (GtkTreeViewColumn *tree_column,
                                         gint               sort_column_id)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
-  g_return_if_fail (sort_column_id >= 0);
+  g_return_if_fail (sort_column_id >= -1);
 
   if (tree_column->sort_column_id == sort_column_id)
     return;
@@ -1995,27 +2328,30 @@ gtk_tree_view_column_set_sort_column_id (GtkTreeViewColumn *tree_column,
   /* Handle unsetting the id */
   if (sort_column_id == -1)
     {
+      GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_column->tree_view));
+
       if (tree_column->sort_clicked_signal)
        {
-         g_signal_handler_disconnect (G_OBJECT (tree_column), tree_column->sort_clicked_signal);
+         g_signal_handler_disconnect (tree_column, tree_column->sort_clicked_signal);
          tree_column->sort_clicked_signal = 0;
        }
 
       if (tree_column->sort_column_changed_signal)
        {
-         g_signal_handler_disconnect (G_OBJECT (tree_column), tree_column->sort_column_changed_signal);
+         g_signal_handler_disconnect (model, tree_column->sort_column_changed_signal);
          tree_column->sort_column_changed_signal = 0;
        }
 
       gtk_tree_view_column_set_sort_order (tree_column, GTK_SORT_ASCENDING);
       gtk_tree_view_column_set_sort_indicator (tree_column, FALSE);
+      gtk_tree_view_column_set_clickable (tree_column, FALSE);
       return;
     }
 
   gtk_tree_view_column_set_clickable (tree_column, TRUE);
 
   if (! tree_column->sort_clicked_signal)
-    tree_column->sort_clicked_signal = g_signal_connect (G_OBJECT (tree_column),
+    tree_column->sort_clicked_signal = g_signal_connect (tree_column,
                                                          "clicked",
                                                          G_CALLBACK (gtk_tree_view_column_sort),
                                                          NULL);
@@ -2028,7 +2364,8 @@ gtk_tree_view_column_set_sort_column_id (GtkTreeViewColumn *tree_column,
  * @tree_column: a #GtkTreeViewColumn
  *
  * Gets the logical @sort_column_id that the model sorts on when this
- * column is selected for sorting. See gtk_tree_view_column_set_sort_column_id().
+ * column is selected for sorting.
+ * See gtk_tree_view_column_set_sort_column_id().
  *
  * Return value: the current @sort_column_id for this column, or -1 if
  *               this column can't be used for sorting.
@@ -2139,9 +2476,9 @@ gtk_tree_view_column_get_sort_order      (GtkTreeViewColumn     *tree_column)
  * @is_expander: %TRUE, if the row has children
  * @is_expanded: %TRUE, if the row has visible children
  * 
- * Sets the cell renderer based on the @tree_model and @tree_node.  That is, for
+ * Sets the cell renderer based on the @tree_model and @iter.  That is, for
  * every attribute mapping in @tree_column, it will get a value from the set
- * column on the @tree_node, and use that value to set the attribute on the cell
+ * column on the @iter, and use that value to set the attribute on the cell
  * renderer.  This is used primarily by the #GtkTreeView.
  **/
 void
@@ -2169,7 +2506,12 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
       list = info->attributes;
 
       g_object_freeze_notify (cell);
-      g_object_set (cell, "is_expander", is_expander, "is_expanded", is_expanded, NULL);
+
+      if (info->cell->is_expander != is_expander)
+       g_object_set (cell, "is_expander", is_expander, NULL);
+
+      if (info->cell->is_expanded != is_expanded)
+       g_object_set (cell, "is_expanded", is_expanded, NULL);
 
       while (list && list->next)
        {
@@ -2191,9 +2533,9 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
 /**
  * gtk_tree_view_column_cell_get_size:
  * @tree_column: A #GtkTreeViewColumn.
- * @cell_area: The area a the column will be allocated, or %NULL
- * @x_offset: location to return x offset of cell relative to @cell_area, or %NULL
- * @y_offset: location to return y offset of cell relative to @cell_area, or %NULL
+ * @cell_area: The area a cell in the column will be allocated, or %NULL
+ * @x_offset: location to return x offset of cell relative to @cell_area, or %NULL
+ * @y_offset: location to return y offset of cell relative to @cell_area, or %NULL
  * @width: location to return width needed to render a cell, or %NULL
  * @height: location to return height needed to render a cell, or %NULL
  * 
@@ -2232,7 +2574,7 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
       if (visible == FALSE)
        continue;
 
-      if (first_cell == FALSE && *width)
+      if (first_cell == FALSE && width)
        *width += tree_column->spacing;
 
       gtk_cell_renderer_get_size (info->cell,
@@ -2248,45 +2590,98 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
       info->requested_width = MAX (info->requested_width, new_width + focus_line_width * 2);
       if (width)
        * width += info->requested_width;
-      first_cell = TRUE;
+      first_cell = FALSE;
     }
 }
 
-/* both rendering and rendering focus are somewhat complicated, and a bit of
- * code.  Rather than duplicate them, we put them together to keep the code in
- * one place
+/* rendering, event handling and rendering focus are somewhat complicated, and
+ * quite a bit of code.  Rather than duplicate them, we put them together to
+ * keep the code in one place.
  */
-static void
-gtk_tree_view_column_cell_render_or_focus (GtkTreeViewColumn *tree_column,
-                                          GdkWindow         *window,
-                                          GdkRectangle      *background_area,
-                                          GdkRectangle      *cell_area,
-                                          GdkRectangle      *expose_area,
-                                          guint              flags,
-                                          gboolean           render,
-                                          GdkRectangle      *focus_rectangle)
+enum {
+  CELL_ACTION_RENDER,
+  CELL_ACTION_FOCUS,
+  CELL_ACTION_EVENT
+};
+
+static gboolean
+gtk_tree_view_column_cell_process_action (GtkTreeViewColumn  *tree_column,
+                                         GdkWindow          *window,
+                                         GdkRectangle       *background_area,
+                                         GdkRectangle       *cell_area,
+                                         guint               flags,
+                                         gint                action,
+                                         GdkRectangle       *expose_area,     /* RENDER */
+                                         GdkRectangle       *focus_rectangle, /* FOCUS  */
+                                         GtkCellEditable   **editable_widget, /* EVENT  */
+                                         GdkEvent           *event,           /* EVENT  */
+                                         gchar              *path_string)     /* EVENT  */
 {
   GList *list;
   GdkRectangle real_cell_area;
+  GdkRectangle real_background_area;
+  GdkRectangle real_expose_area = *cell_area;
   gint expand_cell_count = 0;
   gint full_requested_width = 0;
   gint extra_space;
   gint min_x, min_y, max_x, max_y;
   gint focus_line_width;
+  gint special_cells;
+  gint horizontal_separator;
+  gboolean cursor_row = FALSE;
+  gboolean rtl;
+  /* If we have rtl text, we need to transform our areas */
+  GdkRectangle rtl_cell_area;
+  GdkRectangle rtl_background_area;
 
   min_x = G_MAXINT;
   min_y = G_MAXINT;
   max_x = 0;
   max_y = 0;
 
-  real_cell_area = *cell_area;
+  rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_column->tree_view)) == GTK_TEXT_DIR_RTL);
+  special_cells = _gtk_tree_view_column_count_special_cells (tree_column);
+
+  if (special_cells > 1 && action == CELL_ACTION_FOCUS)
+    {
+      GtkTreeViewColumnCellInfo *info = NULL;
+      gboolean found_has_focus = FALSE;
+
+      /* one should have focus */
+      for (list = tree_column->cell_list; list; list = list->next)
+        {
+         info = list->data;
+         if (info && info->has_focus)
+           {
+             found_has_focus = TRUE;
+             break;
+           }
+       }
+
+      if (!found_has_focus)
+        {
+         /* give the first one focus */
+         info = gtk_tree_view_column_cell_first (tree_column)->data;
+         info->has_focus = TRUE;
+       }
+    }
+
+  cursor_row = flags & GTK_CELL_RENDERER_FOCUSED;
 
   gtk_widget_style_get (GTK_WIDGET (tree_column->tree_view),
-                       "focus-line-width", &focus_line_width, NULL);
-  /* Find out how my extra space we have to allocate */
+                       "focus-line-width", &focus_line_width,
+                       "horizontal-separator", &horizontal_separator,
+                       NULL);
+
+  real_cell_area = *cell_area;
+  real_background_area = *background_area;
+
+  real_cell_area.x += focus_line_width;
+
+  /* Find out how many extra space we have to allocate */
   for (list = tree_column->cell_list; list; list = list->next)
     {
-      GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) list->data;
+      GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)list->data;
 
       if (! info->cell->visible)
        continue;
@@ -2296,10 +2691,14 @@ gtk_tree_view_column_cell_render_or_focus (GtkTreeViewColumn *tree_column,
       full_requested_width += info->requested_width;
     }
 
-  extra_space = cell_area->width - full_requested_width;
+  extra_space = cell_area->width + horizontal_separator - full_requested_width;
+
   if (extra_space < 0)
     extra_space = 0;
+  else if (extra_space > 0 && expand_cell_count > 0)
+    extra_space /= expand_cell_count;
 
+  /* iterate list for GTK_PACK_START cells */
   for (list = tree_column->cell_list; list; list = list->next)
     {
       GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) list->data;
@@ -2310,40 +2709,151 @@ gtk_tree_view_column_cell_render_or_focus (GtkTreeViewColumn *tree_column,
       if (! info->cell->visible)
        continue;
 
-      real_cell_area.width = info->requested_width +
-       (info->expand?extra_space:0);
-      real_cell_area.x += focus_line_width;
-      if (render)
+      if ((info->has_focus || special_cells == 1) && cursor_row)
+       flags |= GTK_CELL_RENDERER_FOCUSED;
+      else
+        flags &= ~GTK_CELL_RENDERER_FOCUSED;
+
+      info->real_width = info->requested_width + (info->expand?extra_space:0);
+
+      real_cell_area.width = info->real_width;
+      real_background_area.width=
+        real_cell_area.x + real_cell_area.width - real_background_area.x;
+      real_cell_area.width -= 2 * focus_line_width;
+
+      rtl_cell_area = real_cell_area;
+      rtl_background_area = real_background_area;
+      if (rtl)
+       {
+         rtl_cell_area.x = cell_area->x + cell_area->width - (real_cell_area.x - cell_area->x) - real_cell_area.width;
+         rtl_background_area.x = background_area->x + background_area->width - (real_background_area.x - background_area->x) - real_background_area.width;
+       }
+
+      /* RENDER */
+      if (action == CELL_ACTION_RENDER)
        {
          gtk_cell_renderer_render (info->cell,
                                    window,
                                    tree_column->tree_view,
-                                   background_area,
-                                   &real_cell_area,
-                                   expose_area,
+                                   &rtl_background_area,
+                                   &rtl_cell_area,
+                                   &real_expose_area, 
                                    flags);
        }
-      else
+
+      /* FOCUS */
+      else if (action == CELL_ACTION_FOCUS)
        {
          gint x_offset, y_offset, width, height;
 
          gtk_cell_renderer_get_size (info->cell,
                                      tree_column->tree_view,
-                                     &real_cell_area,
+                                     &rtl_cell_area,
                                      &x_offset, &y_offset,
                                      &width, &height);
 
-         if (min_x > (real_cell_area.x + x_offset))
-           min_x = real_cell_area.x + x_offset;
-         if (max_x < real_cell_area.x + x_offset + width)
-           max_x = real_cell_area.x + x_offset + width;
-         if (min_y > (real_cell_area.y + y_offset))
-           min_y = real_cell_area.y + y_offset;
-         if (max_y < real_cell_area.y + y_offset + height)
-           max_y = real_cell_area.y + y_offset + height;
+         if (special_cells > 1)
+           {
+             if (info->has_focus)
+               {
+                 min_x = rtl_cell_area.x + x_offset;
+                 max_x = min_x + width;
+                 min_y = rtl_cell_area.y + y_offset;
+                 max_y = min_y + height;
+               }
+           }
+         else
+           {
+             if (min_x > (rtl_cell_area.x + x_offset))
+               min_x = rtl_cell_area.x + x_offset;
+             if (max_x < rtl_cell_area.x + x_offset + width)
+               max_x = rtl_cell_area.x + x_offset + width;
+             if (min_y > (rtl_cell_area.y + y_offset))
+               min_y = rtl_cell_area.y + y_offset;
+             if (max_y < rtl_cell_area.y + y_offset + height)
+               max_y = rtl_cell_area.y + y_offset + height;
+           }
+       }
+      /* EVENT */
+      else if (action == CELL_ACTION_EVENT)
+       {
+         gboolean try_event = FALSE;
+
+         if (event)
+           {
+             if (special_cells == 1)
+               {
+                 /* only 1 activatable cell -> whole column can activate */
+                 if (cell_area->x <= ((GdkEventButton *)event)->x &&
+                     cell_area->x + cell_area->width > ((GdkEventButton *)event)->x)
+                   try_event = TRUE;
+               }
+             else if (rtl_cell_area.x <= ((GdkEventButton *)event)->x &&
+                 rtl_cell_area.x + rtl_cell_area.width > ((GdkEventButton *)event)->x)
+                 /* only activate cell if the user clicked on an individual
+                  * cell
+                  */
+               try_event = TRUE;
+           }
+         else if (special_cells > 1 && info->has_focus)
+           try_event = TRUE;
+         else if (special_cells == 1)
+           try_event = TRUE;
+
+         if (try_event)
+           {
+             gboolean visible, mode;
+
+             g_object_get (info->cell,
+                           "visible", &visible,
+                           "mode", &mode,
+                           NULL);
+             if (visible && mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE)
+               {
+                 if (gtk_cell_renderer_activate (info->cell,
+                                                 event,
+                                                 tree_column->tree_view,
+                                                 path_string,
+                                                 background_area,
+                                                 cell_area,
+                                                 flags))
+                   {
+                      flags &= ~GTK_CELL_RENDERER_FOCUSED;
+                     return TRUE;
+                   }
+               }
+             else if (visible && mode == GTK_CELL_RENDERER_MODE_EDITABLE)
+               {
+                 *editable_widget =
+                   gtk_cell_renderer_start_editing (info->cell,
+                                                    event,
+                                                    tree_column->tree_view,
+                                                    path_string,
+                                                    background_area,
+                                                    cell_area,
+                                                    flags);
+
+                 if (*editable_widget != NULL)
+                   {
+                     g_return_val_if_fail (GTK_IS_CELL_EDITABLE (*editable_widget), FALSE);
+                     info->in_editing_mode = TRUE;
+                     gtk_tree_view_column_focus_cell (tree_column, info->cell);
+                     
+                      flags &= ~GTK_CELL_RENDERER_FOCUSED;
+
+                     return TRUE;
+                   }
+               }
+           }
        }
-      real_cell_area.x += (info->requested_width + tree_column->spacing);
+
+      flags &= ~GTK_CELL_RENDERER_FOCUSED;
+
+      real_cell_area.x += (real_cell_area.width + tree_column->spacing);
+      real_background_area.x += (real_background_area.width + tree_column->spacing);
     }
+
+  /* iterate list for PACK_END cells */
   for (list = g_list_last (tree_column->cell_list); list; list = list->prev)
     {
       GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) list->data;
@@ -2354,26 +2864,156 @@ gtk_tree_view_column_cell_render_or_focus (GtkTreeViewColumn *tree_column,
       if (! info->cell->visible)
        continue;
 
-      real_cell_area.width = info->requested_width +
-       (info->expand?extra_space:0);
-      gtk_cell_renderer_render (info->cell,
-                               window,
-                               tree_column->tree_view,
-                               background_area,
-                               &real_cell_area,
-                               expose_area,
-                               flags);
-      real_cell_area.x += (info->requested_width + tree_column->spacing);
+      if ((info->has_focus || special_cells == 1) && cursor_row)
+       flags |= GTK_CELL_RENDERER_FOCUSED;
+      else
+        flags &= ~GTK_CELL_RENDERER_FOCUSED;
+
+      info->real_width = info->requested_width + (info->expand?extra_space:0);
+
+      real_cell_area.width = info->real_width;
+      real_background_area.width =
+        real_cell_area.x + real_cell_area.width - real_background_area.x;
+      real_cell_area.width -= 2 * focus_line_width;
+
+      rtl_cell_area = real_cell_area;
+      rtl_background_area = real_background_area;
+      if (rtl)
+       {
+         rtl_cell_area.x = cell_area->x + cell_area->width - (real_cell_area.x - cell_area->x) - real_cell_area.width;
+         rtl_background_area.x = background_area->x + background_area->width - (real_background_area.x - background_area->x) - real_background_area.width;
+       }
+
+      /* RENDER */
+      if (action == CELL_ACTION_RENDER)
+       {
+         gtk_cell_renderer_render (info->cell,
+                                   window,
+                                   tree_column->tree_view,
+                                   &rtl_background_area,
+                                   &rtl_cell_area,
+                                   &real_expose_area,
+                                   flags);
+       }
+      /* FOCUS */
+      else if (action == CELL_ACTION_FOCUS)
+       {
+         gint x_offset, y_offset, width, height;
+
+         gtk_cell_renderer_get_size (info->cell,
+                                     tree_column->tree_view,
+                                     &rtl_cell_area,
+                                     &x_offset, &y_offset,
+                                     &width, &height);
+
+         if (special_cells > 1)
+           {
+             if (info->has_focus)
+               {
+                 min_x = rtl_cell_area.x + x_offset;
+                 max_x = min_x + width;
+                 min_y = rtl_cell_area.y + y_offset;
+                 max_y = min_y + height;
+               }
+           }
+         else
+           {
+             if (min_x > (rtl_cell_area.x + x_offset))
+               min_x = rtl_cell_area.x + x_offset;
+             if (max_x < rtl_cell_area.x + x_offset + width)
+               max_x = rtl_cell_area.x + x_offset + width;
+             if (min_y > (rtl_cell_area.y + y_offset))
+               min_y = rtl_cell_area.y + y_offset;
+             if (max_y < rtl_cell_area.y + y_offset + height)
+               max_y = rtl_cell_area.y + y_offset + height;
+           }
+       }
+      /* EVENT */
+      else if (action == CELL_ACTION_EVENT)
+        {
+         gboolean try_event = FALSE;
+
+         if (event)
+           {
+             if (special_cells == 1)
+               {
+                 /* only 1 activatable cell -> whole column can activate */
+                 if (cell_area->x <= ((GdkEventButton *)event)->x &&
+                     cell_area->x + cell_area->width > ((GdkEventButton *)event)->x)
+                   try_event = TRUE;
+               }
+             else if (real_cell_area.x <= ((GdkEventButton *)event)->x &&
+                 real_cell_area.x + real_cell_area.width > ((GdkEventButton *)event)->x)
+               /* only activate cell if the user clicked on an individual
+                * cell
+                */
+               try_event = TRUE;
+           }
+         else if (special_cells > 1 && info->has_focus)
+           try_event = TRUE;
+         else if (special_cells == 1)
+           try_event = TRUE;
+
+         if (try_event)
+           {
+             gboolean visible, mode;
+
+             g_object_get (info->cell,
+                           "visible", &visible,
+                           "mode", &mode,
+                           NULL);
+             if (visible && mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE)
+               {
+                 if (gtk_cell_renderer_activate (info->cell,
+                                                 event,
+                                                 tree_column->tree_view,
+                                                 path_string,
+                                                 background_area,
+                                                 cell_area,
+                                                 flags))
+                   {
+                     flags &= ~GTK_CELL_RENDERER_FOCUSED;
+                     return TRUE;
+                   }
+               }
+             else if (visible && mode == GTK_CELL_RENDERER_MODE_EDITABLE)
+               {
+                 *editable_widget =
+                   gtk_cell_renderer_start_editing (info->cell,
+                                                    event,
+                                                    tree_column->tree_view,
+                                                    path_string,
+                                                    background_area,
+                                                    cell_area,
+                                                    flags);
+
+                 if (*editable_widget != NULL)
+                   {
+                     g_return_val_if_fail (GTK_IS_CELL_EDITABLE (*editable_widget), FALSE);
+                     info->in_editing_mode = TRUE;
+                     gtk_tree_view_column_focus_cell (tree_column, info->cell);
+
+                     flags &= ~GTK_CELL_RENDERER_FOCUSED;
+                     return TRUE;
+                   }
+               }
+           }
+       }
+
+      flags &= ~GTK_CELL_RENDERER_FOCUSED;
+
+      real_cell_area.x += (real_cell_area.width + tree_column->spacing);
+      real_background_area.x += (real_background_area.width + tree_column->spacing);
     }
-  if (! render)
+
+  /* fill focus_rectangle when required */
+  if (action == CELL_ACTION_FOCUS)
     {
       if (min_x >= max_x || min_y >= max_y)
        {
          *focus_rectangle = *cell_area;
-         focus_rectangle->x -= focus_line_width;
-         focus_rectangle->y -= focus_line_width;
-         focus_rectangle->width += 2 * focus_line_width;
-         focus_rectangle->height += 2 * focus_line_width;
+         /* don't change the focus_rectangle, just draw it nicely inside
+          * the cell area */
        }
       else
        {
@@ -2383,6 +3023,8 @@ gtk_tree_view_column_cell_render_or_focus (GtkTreeViewColumn *tree_column,
          focus_rectangle->height = (max_y - min_y) + 2 * focus_line_width;
        }
     }
+
+  return FALSE;
 }
 
 /**
@@ -2410,14 +3052,14 @@ _gtk_tree_view_column_cell_render (GtkTreeViewColumn *tree_column,
   g_return_if_fail (cell_area != NULL);
   g_return_if_fail (expose_area != NULL);
 
-  gtk_tree_view_column_cell_render_or_focus (tree_column,
-                                            window,
-                                            background_area,
-                                            cell_area,
-                                            expose_area,
-                                            flags,
-                                            TRUE,
-                                            NULL);
+  gtk_tree_view_column_cell_process_action (tree_column,
+                                           window,
+                                           background_area,
+                                           cell_area,
+                                           flags,
+                                           CELL_ACTION_RENDER,
+                                           expose_area,
+                                           NULL, NULL, NULL, NULL);
 }
 
 gboolean
@@ -2429,52 +3071,232 @@ _gtk_tree_view_column_cell_event (GtkTreeViewColumn  *tree_column,
                                  GdkRectangle       *cell_area,
                                  guint               flags)
 {
-  gboolean visible, mode;
-
   g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
 
-  g_object_get (G_OBJECT (((GtkTreeViewColumnCellInfo *) tree_column->cell_list->data)->cell),
-               "visible", &visible,
-               "mode", &mode,
-               NULL);
-  if (visible && mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE)
+  return gtk_tree_view_column_cell_process_action (tree_column,
+                                                  NULL,
+                                                  background_area,
+                                                  cell_area,
+                                                  flags,
+                                                  CELL_ACTION_EVENT,
+                                                  NULL, NULL,
+                                                  editable_widget,
+                                                  event,
+                                                  path_string);
+}
+
+/* cell list manipulation */
+static GList *
+gtk_tree_view_column_cell_first (GtkTreeViewColumn *tree_column)
+{
+  GList *list = tree_column->cell_list;
+
+  /* first GTK_PACK_START cell we find */
+  for ( ; list; list = list->next)
     {
-      if (gtk_cell_renderer_activate (((GtkTreeViewColumnCellInfo *) tree_column->cell_list->data)->cell,
-                                     event,
-                                     tree_column->tree_view,
-                                     path_string,
-                                     background_area,
-                                     cell_area,
-                                     flags))
-       return TRUE;
+      GtkTreeViewColumnCellInfo *info = list->data;
+      if (info->pack == GTK_PACK_START)
+       return list;
     }
-  else if (visible && mode == GTK_CELL_RENDERER_MODE_EDITABLE)
+
+  /* hmm, else the *last* GTK_PACK_END cell */
+  list = g_list_last (tree_column->cell_list);
+
+  for ( ; list; list = list->prev)
     {
-      *editable_widget = gtk_cell_renderer_start_editing (((GtkTreeViewColumnCellInfo *) tree_column->cell_list->data)->cell,
-                                                         event,
-                                                         tree_column->tree_view,
-                                                         path_string,
-                                                         background_area,
-                                                         cell_area,
-                                                         flags);
+      GtkTreeViewColumnCellInfo *info = list->data;
+      if (info->pack == GTK_PACK_END)
+       return list;
+    }
 
-      if (*editable_widget != NULL)
-       {
-         g_return_val_if_fail (GTK_IS_CELL_EDITABLE (*editable_widget), FALSE);
+  return NULL;
+}
 
-         return TRUE;
+static GList *
+gtk_tree_view_column_cell_last (GtkTreeViewColumn *tree_column)
+{
+  GList *list = tree_column->cell_list;
+
+  /* *first* GTK_PACK_END cell we find */
+  for ( ; list ; list = list->next)
+    {
+      GtkTreeViewColumnCellInfo *info = list->data;
+      if (info->pack == GTK_PACK_END)
+       return list;
+    }
+
+  /* hmm, else the last GTK_PACK_START cell */
+  list = g_list_last (tree_column->cell_list);
+
+  for ( ; list; list = list->prev)
+    {
+      GtkTreeViewColumnCellInfo *info = list->data;
+      if (info->pack == GTK_PACK_START)
+       return list;
+    }
+
+  return NULL;
+}
+
+static GList *
+gtk_tree_view_column_cell_next (GtkTreeViewColumn *tree_column,
+                               GList             *current)
+{
+  GList *list;
+  GtkTreeViewColumnCellInfo *info = current->data;
+
+  if (info->pack == GTK_PACK_START)
+    {
+      for (list = current->next; list; list = list->next)
+        {
+         GtkTreeViewColumnCellInfo *inf = list->data;
+         if (inf->pack == GTK_PACK_START)
+           return list;
+       }
+
+      /* out of GTK_PACK_START cells, get *last* GTK_PACK_END one */
+      list = g_list_last (tree_column->cell_list);
+      for (; list; list = list->prev)
+        {
+         GtkTreeViewColumnCellInfo *inf = list->data;
+         if (inf->pack == GTK_PACK_END)
+           return list;
        }
     }
-  return FALSE;
+
+  for (list = current->prev; list; list = list->prev)
+    {
+      GtkTreeViewColumnCellInfo *inf = list->data;
+      if (inf->pack == GTK_PACK_END)
+       return list;
+    }
+
+  return NULL;
 }
 
+static GList *
+gtk_tree_view_column_cell_prev (GtkTreeViewColumn *tree_column,
+                               GList             *current)
+{
+  GList *list;
+  GtkTreeViewColumnCellInfo *info = current->data;
+
+  if (info->pack == GTK_PACK_END)
+    {
+      for (list = current->next; list; list = list->next)
+        {
+         GtkTreeViewColumnCellInfo *inf = list->data;
+         if (inf->pack == GTK_PACK_END)
+           return list;
+       }
+
+      /* out of GTK_PACK_END, get last GTK_PACK_START one */
+      list = g_list_last (tree_column->cell_list);
+      for ( ; list; list = list->prev)
+        {
+         GtkTreeViewColumnCellInfo *inf = list->data;
+         if (inf->pack == GTK_PACK_START)
+           return list;
+       }
+    }
+
+  for (list = current->prev; list; list = list->prev)
+    {
+      GtkTreeViewColumnCellInfo *inf = list->data;
+      if (inf->pack == GTK_PACK_START)
+       return list;
+    }
+
+  return NULL;
+}
 
 gboolean
 _gtk_tree_view_column_cell_focus (GtkTreeViewColumn *tree_column,
-                                 gint               direction)
+                                 gint               direction,
+                                 gboolean           left,
+                                 gboolean           right)
 {
+  gint count;
+
+  count = _gtk_tree_view_column_count_special_cells (tree_column);
+
+  /* if we are the current focus column and have multiple editable cells,
+   * try to select the next one, else move the focus to the next column
+   */
   if (GTK_TREE_VIEW (tree_column->tree_view)->priv->focus_column == tree_column)
-    return FALSE;
+    {
+      if (count > 1)
+        {
+          GList *next, *prev;
+         GList *list = tree_column->cell_list;
+         GtkTreeViewColumnCellInfo *info = NULL;
+
+         /* find current focussed cell */
+         for ( ; list; list = list->next)
+           {
+             info = list->data;
+             if (info->has_focus)
+               break;
+           }
+
+         /* not a focussed cell in the focus column? */
+         if (!list || !info || !info->has_focus)
+           return FALSE;
+
+         next = gtk_tree_view_column_cell_next (tree_column, list);
+         prev = gtk_tree_view_column_cell_prev (tree_column, list);
+
+         info->has_focus = FALSE;
+         if (direction > 0 && next)
+           {
+             info = next->data;
+             info->has_focus = TRUE;
+             return TRUE;
+           }
+         else if (direction > 0 && !next && !right)
+           {
+             /* keep focus on latest cell */
+             info = gtk_tree_view_column_cell_last (tree_column)->data;
+             info->has_focus = TRUE;
+             return TRUE;
+           }
+         else if (direction < 0 && prev)
+           {
+             info = prev->data;
+             info->has_focus = TRUE;
+             return TRUE;
+           }
+         else if (direction < 0 && !prev && !left)
+           {
+             /* keep focus on first cell */
+             info = gtk_tree_view_column_cell_first (tree_column)->data;
+             info->has_focus = TRUE;
+             return TRUE;
+           }
+       }
+      return FALSE;
+    }
+
+  /* we get focus, if we have multiple editable cells, give the correct one
+   * focus
+   */
+  if (count > 1)
+    {
+      GList *list = tree_column->cell_list;
+
+      /* clear focus first */
+      for ( ; list ; list = list->next)
+        {
+         GtkTreeViewColumnCellInfo *info = list->data;
+         if (info->has_focus)
+           info->has_focus = FALSE;
+       }
+
+      if (direction > 0)
+       ((GtkTreeViewColumnCellInfo *)gtk_tree_view_column_cell_first (tree_column)->data)->has_focus = TRUE;
+      else if (direction < 0)
+       ((GtkTreeViewColumnCellInfo *)gtk_tree_view_column_cell_last (tree_column)->data)->has_focus = TRUE;
+    }
   return TRUE;
 }
 
@@ -2512,14 +3334,15 @@ _gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn       *tree_column,
   else
     {
       GdkRectangle focus_rectangle;
-      gtk_tree_view_column_cell_render_or_focus (tree_column,
-                                                window,
-                                                background_area,
-                                                cell_area,
-                                                expose_area,
-                                                flags,
-                                                FALSE,
-                                                &focus_rectangle);
+      gtk_tree_view_column_cell_process_action (tree_column,
+                                               window,
+                                               background_area,
+                                               cell_area,
+                                               flags,
+                                               CELL_ACTION_FOCUS,
+                                               expose_area,
+                                               &focus_rectangle,
+                                               NULL, NULL, NULL);
 
       cell_state = flags & GTK_CELL_RENDERER_SELECTED ? GTK_STATE_SELECTED :
              (flags & GTK_CELL_RENDERER_PRELIT ? GTK_STATE_PRELIGHT :
@@ -2527,7 +3350,7 @@ _gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn       *tree_column,
       gtk_paint_focus (tree_column->tree_view->style,
                       window,
                       cell_state,
-                      NULL,
+                      cell_area,
                       tree_column->tree_view,
                       "treeview",
                       focus_rectangle.x,
@@ -2541,17 +3364,19 @@ _gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn       *tree_column,
  * gtk_tree_view_column_cell_is_visible:
  * @tree_column: A #GtkTreeViewColumn
  * 
- * Returns #TRUE if any of the cells packed into the @tree_column are visible.
+ * Returns %TRUE if any of the cells packed into the @tree_column are visible.
  * For this to be meaningful, you must first initialize the cells with
  * gtk_tree_view_column_cell_set_cell_data()
  * 
- * Return value: #TRUE, if any of the cells packed into the @tree_column are currently visible
+ * Return value: %TRUE, if any of the cells packed into the @tree_column are currently visible
  **/
 gboolean
 gtk_tree_view_column_cell_is_visible (GtkTreeViewColumn *tree_column)
 {
   GList *list;
 
+  g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
+
   for (list = tree_column->cell_list; list; list = list->next)
     {
       GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *) list->data;
@@ -2563,6 +3388,55 @@ gtk_tree_view_column_cell_is_visible (GtkTreeViewColumn *tree_column)
   return FALSE;
 }
 
+/**
+ * gtk_tree_view_column_focus_cell:
+ * @tree_column: A #GtkTreeViewColumn
+ * @cell: A #GtkCellRenderer
+ *
+ * Sets the current keyboard focus to be at @cell, if the column contains
+ * 2 or more editable and activatable cells.
+ *
+ * Since: 2.2
+ **/
+void
+gtk_tree_view_column_focus_cell (GtkTreeViewColumn *tree_column,
+                                GtkCellRenderer   *cell)
+{
+  GList *list;
+  gboolean found_cell = FALSE;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
+  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
+
+  if (_gtk_tree_view_column_count_special_cells (tree_column) < 2)
+    return;
+
+  for (list = tree_column->cell_list; list; list = list->next)
+    {
+      GtkTreeViewColumnCellInfo *info = list->data;
+
+      if (info->cell == cell)
+        {
+         info->has_focus = TRUE;
+         found_cell = TRUE;
+         break;
+       }
+    }
+
+  if (found_cell)
+    {
+      for (list = tree_column->cell_list; list; list = list->next)
+        {
+         GtkTreeViewColumnCellInfo *info = list->data;
+
+         if (info->cell != cell)
+           info->has_focus = FALSE;
+        }
+
+      /* FIXME: redraw? */
+    }
+}
+
 void
 _gtk_tree_view_column_cell_set_dirty (GtkTreeViewColumn *tree_column,
                                      gboolean           install_handler)
@@ -2603,7 +3477,121 @@ _gtk_tree_view_column_start_editing (GtkTreeViewColumn *tree_column,
 void
 _gtk_tree_view_column_stop_editing (GtkTreeViewColumn *tree_column)
 {
+  GList *list;
+
   g_return_if_fail (tree_column->editable_widget != NULL);
 
   tree_column->editable_widget = NULL;
+  for (list = tree_column->cell_list; list; list = list->next)
+    ((GtkTreeViewColumnCellInfo *)list->data)->in_editing_mode = FALSE;
+}
+
+void
+_gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *column,
+                                         GtkCellRenderer   *cell,
+                                         gint              *left,
+                                         gint              *right)
+{
+  GList *list;
+
+  if (left)
+    {
+      *left = 0;
+      list = gtk_tree_view_column_cell_first (column);
+
+      for (; list; list = gtk_tree_view_column_cell_next (column, list))
+        {
+         GtkTreeViewColumnCellInfo *info =
+           (GtkTreeViewColumnCellInfo *)list->data;
+
+         if (info->cell == cell)
+           break;
+
+         if (info->cell->visible)
+           *left += info->real_width;
+       }
+    }
+
+  if (right)
+    {
+      GList *next;
+
+      *right = 0;
+      list = gtk_tree_view_column_cell_first (column);
+
+      for (; list; list = gtk_tree_view_column_cell_next (column, list))
+        {
+         GtkTreeViewColumnCellInfo *info =
+           (GtkTreeViewColumnCellInfo *)list->data;
+
+         if (info->cell == cell)
+           break;
+       }
+
+      /* skip cell */
+      next = gtk_tree_view_column_cell_next (column, list);
+      if (list && next)
+        {
+         list = next;
+         for ( ; list; list = gtk_tree_view_column_cell_next (column, list))
+           {
+             GtkTreeViewColumnCellInfo *info =
+               (GtkTreeViewColumnCellInfo *)list->data;
+
+             if (info->cell->visible)
+               *right += info->real_width;
+           }
+       }
+    }
+}
+
+/**
+ * gtk_tree_view_column_cell_get_position:
+ * @tree_column: a #GtkTreeViewColumn
+ * @cell_renderer: a #GtkCellRenderer
+ * @start_pos: return location for the horizontal position of @cell within
+ *            @tree_column, may be %NULL
+ * @width: return location for the width of @cell, may be %NULL
+ *
+ * Obtains the horizontal position and size of a cell in a column. If the
+ * cell is not found in the column, @start_pos and @width are not changed and
+ * %FALSE is returned.
+ * 
+ * Return value: %TRUE if @cell belongs to @tree_column.
+ */
+gboolean
+gtk_tree_view_column_cell_get_position (GtkTreeViewColumn *tree_column,
+                                       GtkCellRenderer   *cell_renderer,
+                                       gint              *start_pos,
+                                       gint              *width)
+{
+  GList *list;
+  gint current_x = 0;
+  gboolean found_cell = FALSE;
+  GtkTreeViewColumnCellInfo *cellinfo = NULL;
+
+  list = gtk_tree_view_column_cell_first (tree_column);
+  for (; list; list = gtk_tree_view_column_cell_next (tree_column, list))
+    {
+      cellinfo = list->data;
+      if (cellinfo->cell == cell_renderer)
+        {
+          found_cell = TRUE;
+          break;
+        }
+
+      if (cellinfo->cell->visible)
+        current_x += cellinfo->real_width;
+    }
+
+  if (found_cell)
+    {
+      if (start_pos)
+        *start_pos = current_x;
+      if (width)
+        *width = cellinfo->real_width;
+    }
+
+  return found_cell;
 }
+