diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 3 |
6 files changed, 38 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Thu Jul 17 16:11:21 2003 Kristian Rietveld <kris@gtk.org> + + Merged from stable. + + * gtk/gtktreeview.c (gtk_tree_view_rows_reordered): stop editing + if needed. (Fixes #115869, reported by Michael Natterer). + 2003-07-15 Matthias Clasen <maclas@gmx.de> * gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a3b1ac76bf..1b2ecdec72 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Thu Jul 17 16:11:21 2003 Kristian Rietveld <kris@gtk.org> + + Merged from stable. + + * gtk/gtktreeview.c (gtk_tree_view_rows_reordered): stop editing + if needed. (Fixes #115869, reported by Michael Natterer). + 2003-07-15 Matthias Clasen <maclas@gmx.de> * gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a3b1ac76bf..1b2ecdec72 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Thu Jul 17 16:11:21 2003 Kristian Rietveld <kris@gtk.org> + + Merged from stable. + + * gtk/gtktreeview.c (gtk_tree_view_rows_reordered): stop editing + if needed. (Fixes #115869, reported by Michael Natterer). + 2003-07-15 Matthias Clasen <maclas@gmx.de> * gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a3b1ac76bf..1b2ecdec72 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Thu Jul 17 16:11:21 2003 Kristian Rietveld <kris@gtk.org> + + Merged from stable. + + * gtk/gtktreeview.c (gtk_tree_view_rows_reordered): stop editing + if needed. (Fixes #115869, reported by Michael Natterer). + 2003-07-15 Matthias Clasen <maclas@gmx.de> * gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a3b1ac76bf..1b2ecdec72 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Thu Jul 17 16:11:21 2003 Kristian Rietveld <kris@gtk.org> + + Merged from stable. + + * gtk/gtktreeview.c (gtk_tree_view_rows_reordered): stop editing + if needed. (Fixes #115869, reported by Michael Natterer). + 2003-07-15 Matthias Clasen <maclas@gmx.de> * gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity. diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 4878ac744e..d3d949184c 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -6529,6 +6529,9 @@ gtk_tree_view_rows_reordered (GtkTreeModel *model, if (tree == NULL) return; + if (tree_view->priv->edited_column) + gtk_tree_view_stop_editing (tree_view, TRUE); + /* we need to be unprelighted */ ensure_unprelighted (tree_view); |