Merged from stable.

Thu May 29 16:14:04 2003  Kristian Rietveld  <kris@gtk.org>

	Merged from stable.

	* gtk/gtktreeview.c (gtk_tree_view_start_editing): correct
	cell_area x/width for the expander if needed. (Fixes #101748,
	reported by Dave Cook and Mariano Suarez-Alvarez).

diff --git a/ChangeLog b/ChangeLog
index c58be12d3e25e9e3138a9b90d114e47d28d7d14b..59857194d3519d8fd72e7c9c63575e1dcb51cc6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
+Thu May 29 16:14:04 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merged from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_start_editing): correct
+       cell_area x/width for the expander if needed. (Fixes #101748,
+       reported by Dave Cook and Mariano Suarez-Alvarez).
+
 Thu May 29 16:01:38 2003  Kristian Rietveld  <kris@gtk.org>
 
+       Merged from stable.
+
        * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): check
        if tree/node are still the same after _internal_select_node.
        (Fixes #92256, reported by edscott).

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c58be12d3e25e9e3138a9b90d114e47d28d7d14b..59857194d3519d8fd72e7c9c63575e1dcb51cc6f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,15 @@
+Thu May 29 16:14:04 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merged from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_start_editing): correct
+       cell_area x/width for the expander if needed. (Fixes #101748,
+       reported by Dave Cook and Mariano Suarez-Alvarez).
+
 Thu May 29 16:01:38 2003  Kristian Rietveld  <kris@gtk.org>
 
+       Merged from stable.
+
        * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): check
        if tree/node are still the same after _internal_select_node.
        (Fixes #92256, reported by edscott).

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c58be12d3e25e9e3138a9b90d114e47d28d7d14b..59857194d3519d8fd72e7c9c63575e1dcb51cc6f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,15 @@
+Thu May 29 16:14:04 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merged from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_start_editing): correct
+       cell_area x/width for the expander if needed. (Fixes #101748,
+       reported by Dave Cook and Mariano Suarez-Alvarez).
+
 Thu May 29 16:01:38 2003  Kristian Rietveld  <kris@gtk.org>
 
+       Merged from stable.
+
        * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): check
        if tree/node are still the same after _internal_select_node.
        (Fixes #92256, reported by edscott).

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c58be12d3e25e9e3138a9b90d114e47d28d7d14b..59857194d3519d8fd72e7c9c63575e1dcb51cc6f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,15 @@
+Thu May 29 16:14:04 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merged from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_start_editing): correct
+       cell_area x/width for the expander if needed. (Fixes #101748,
+       reported by Dave Cook and Mariano Suarez-Alvarez).
+
 Thu May 29 16:01:38 2003  Kristian Rietveld  <kris@gtk.org>
 
+       Merged from stable.
+
        * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): check
        if tree/node are still the same after _internal_select_node.
        (Fixes #92256, reported by edscott).

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c58be12d3e25e9e3138a9b90d114e47d28d7d14b..59857194d3519d8fd72e7c9c63575e1dcb51cc6f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,15 @@
+Thu May 29 16:14:04 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merged from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_start_editing): correct
+       cell_area x/width for the expander if needed. (Fixes #101748,
+       reported by Dave Cook and Mariano Suarez-Alvarez).
+
 Thu May 29 16:01:38 2003  Kristian Rietveld  <kris@gtk.org>
 
+       Merged from stable.
+
        * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): check
        if tree/node are still the same after _internal_select_node.
        (Fixes #92256, reported by edscott).

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 87df9bc61564bf21e09ff7d168fc9a54c7c0ebfd..03fedd92014ebdde002dc0fb7f814de027fecf62 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -11263,6 +11263,12 @@ gtk_tree_view_start_editing (GtkTreeView *tree_view,
                               tree_view->priv->focus_column,
                               &cell_area);
 
+  if (gtk_tree_view_is_expander_column (tree_view, tree_view->priv->focus_column) && TREE_VIEW_DRAW_EXPANDERS (tree_view))
+    {
+      cell_area.x += tree_view->priv->expander_size;
+      cell_area.width -= tree_view->priv->expander_size;
+    }
+
   if (_gtk_tree_view_column_cell_event (tree_view->priv->focus_column,
                                        &editable_widget,
                                        NULL,