From ae89375b9e37819371606fafca1e54eaed3d12d4 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Fri, 19 Apr 2002 19:26:16 +0000 Subject: [PATCH] cancel editing if tree_view->priv->edited_column != NULL (fixes #76066) Fri Apr 19 21:31:04 2002 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_row_changed): cancel editing if tree_view->priv->edited_column != NULL (fixes #76066) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 3 +++ 7 files changed, 33 insertions(+) diff --git a/ChangeLog b/ChangeLog index e59fbf8a83..771542fd86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 19 21:31:04 2002 Kristian Rietveld + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e59fbf8a83..771542fd86 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Apr 19 21:31:04 2002 Kristian Rietveld + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e59fbf8a83..771542fd86 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Fri Apr 19 21:31:04 2002 Kristian Rietveld + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e59fbf8a83..771542fd86 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Apr 19 21:31:04 2002 Kristian Rietveld + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e59fbf8a83..771542fd86 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Apr 19 21:31:04 2002 Kristian Rietveld + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e59fbf8a83..771542fd86 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Apr 19 21:31:04 2002 Kristian Rietveld + + * 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 * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index b22a434bc2..dd40c95160 100644 --- 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)