From 4dfc635844f2326f7b1ac4f13f1c41983cc3d016 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Thu, 29 May 2003 15:14:19 +0000 Subject: [PATCH] cancel the current editing, if it exists. (Fixes #108956, reported by Thu May 29 17:12:19 2003 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_set_cursor_on_cell): cancel the current editing, if it exists. (Fixes #108956, reported by Michael Natterer). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreeview.c | 5 +++++ 6 files changed, 35 insertions(+) diff --git a/ChangeLog b/ChangeLog index d11e9e9aab..d198badf0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu May 29 17:12:19 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_set_cursor_on_cell): cancel + the current editing, if it exists. (Fixes #108956, reported by + Michael Natterer). + Thu May 29 17:06:09 2003 Kristian Rietveld * gtk/gtktreeview.c (check_selection_helper): new function, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d11e9e9aab..d198badf0a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu May 29 17:12:19 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_set_cursor_on_cell): cancel + the current editing, if it exists. (Fixes #108956, reported by + Michael Natterer). + Thu May 29 17:06:09 2003 Kristian Rietveld * gtk/gtktreeview.c (check_selection_helper): new function, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d11e9e9aab..d198badf0a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu May 29 17:12:19 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_set_cursor_on_cell): cancel + the current editing, if it exists. (Fixes #108956, reported by + Michael Natterer). + Thu May 29 17:06:09 2003 Kristian Rietveld * gtk/gtktreeview.c (check_selection_helper): new function, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d11e9e9aab..d198badf0a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu May 29 17:12:19 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_set_cursor_on_cell): cancel + the current editing, if it exists. (Fixes #108956, reported by + Michael Natterer). + Thu May 29 17:06:09 2003 Kristian Rietveld * gtk/gtktreeview.c (check_selection_helper): new function, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d11e9e9aab..d198badf0a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu May 29 17:12:19 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_set_cursor_on_cell): cancel + the current editing, if it exists. (Fixes #108956, reported by + Michael Natterer). + Thu May 29 17:06:09 2003 Kristian Rietveld * gtk/gtktreeview.c (check_selection_helper): new function, diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 2a4a5eea12..5947071562 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -9770,6 +9770,11 @@ gtk_tree_view_set_cursor_on_cell (GtkTreeView *tree_view, g_return_if_fail (GTK_IS_CELL_RENDERER (focus_cell)); } + /* cancel the current editing, if it exists */ + if (tree_view->priv->edited_column && + tree_view->priv->edited_column->editable_widget) + gtk_tree_view_stop_editing (tree_view, TRUE); + gtk_tree_view_real_set_cursor (tree_view, path, TRUE, TRUE); if (focus_column && focus_column->visible)