cancel editing if tree_view->priv->edited_column != NULL (fixes #76066)

Fri Apr 19 21:31:04 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeview.c (gtk_tree_view_row_changed): cancel editing
        if tree_view->priv->edited_column != NULL (fixes #76066)

diff --git a/ChangeLog b/ChangeLog
index e59fbf8a835f7dce1814c72e5997eb5228d06bde..771542fd8699d1f9d2cb3ef3e2114cd60be15896 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 19 21:31:04 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_row_changed): cancel editing
+       if tree_view->priv->edited_column != NULL (fixes #76066)
+
 Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e59fbf8a835f7dce1814c72e5997eb5228d06bde..771542fd8699d1f9d2cb3ef3e2114cd60be15896 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Apr 19 21:31:04 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_row_changed): cancel editing
+       if tree_view->priv->edited_column != NULL (fixes #76066)
+
 Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e59fbf8a835f7dce1814c72e5997eb5228d06bde..771542fd8699d1f9d2cb3ef3e2114cd60be15896 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Apr 19 21:31:04 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_row_changed): cancel editing
+       if tree_view->priv->edited_column != NULL (fixes #76066)
+
 Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e59fbf8a835f7dce1814c72e5997eb5228d06bde..771542fd8699d1f9d2cb3ef3e2114cd60be15896 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Apr 19 21:31:04 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_row_changed): cancel editing
+       if tree_view->priv->edited_column != NULL (fixes #76066)
+
 Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e59fbf8a835f7dce1814c72e5997eb5228d06bde..771542fd8699d1f9d2cb3ef3e2114cd60be15896 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Apr 19 21:31:04 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_row_changed): cancel editing
+       if tree_view->priv->edited_column != NULL (fixes #76066)
+
 Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e59fbf8a835f7dce1814c72e5997eb5228d06bde..771542fd8699d1f9d2cb3ef3e2114cd60be15896 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Apr 19 21:31:04 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_row_changed): cancel editing
+       if tree_view->priv->edited_column != NULL (fixes #76066)
+
 Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index b22a434bc2e0cec5d9b76a225776475464fe7988..dd40c9516043fe1e8de96e237cd4f36fa7c56a53 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -5655,6 +5655,9 @@ gtk_tree_view_row_changed (GtkTreeModel *model,
      */
     return;
 
+  if (tree_view->priv->edited_column)
+    gtk_tree_view_stop_editing (tree_view, TRUE);
+
   gtk_widget_style_get (GTK_WIDGET (data), "vertical_separator", &vertical_separator, NULL);
 
   if (path == NULL)