Merged from stable.

Thu Jul 17 19:12:02 2003  Kristian Rietveld  <kris@gtk.org>

	Merged from stable.

	* gtk/gtktreeview.c (gtk_tree_view_remove_widget): the treeview
	should only grab focus back if the "cell_editable" widget still
	has focus. (Fixes #110104, testcase provided by Marco Pesenti
	Gritti).
This commit is contained in:
Kristian Rietveld 2003-07-17 17:15:48 +00:00 committed by Kristian Rietveld
parent c400b654ca
commit fd9992d8e6
6 changed files with 47 additions and 1 deletions

View File

@ -1,3 +1,12 @@
Thu Jul 17 19:12:02 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeview.c (gtk_tree_view_remove_widget): the treeview
should only grab focus back if the "cell_editable" widget still
has focus. (Fixes #110104, testcase provided by Marco Pesenti
Gritti).
Thu Jul 17 19:06:34 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.

View File

@ -1,3 +1,12 @@
Thu Jul 17 19:12:02 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeview.c (gtk_tree_view_remove_widget): the treeview
should only grab focus back if the "cell_editable" widget still
has focus. (Fixes #110104, testcase provided by Marco Pesenti
Gritti).
Thu Jul 17 19:06:34 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.

View File

@ -1,3 +1,12 @@
Thu Jul 17 19:12:02 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeview.c (gtk_tree_view_remove_widget): the treeview
should only grab focus back if the "cell_editable" widget still
has focus. (Fixes #110104, testcase provided by Marco Pesenti
Gritti).
Thu Jul 17 19:06:34 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.

View File

@ -1,3 +1,12 @@
Thu Jul 17 19:12:02 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeview.c (gtk_tree_view_remove_widget): the treeview
should only grab focus back if the "cell_editable" widget still
has focus. (Fixes #110104, testcase provided by Marco Pesenti
Gritti).
Thu Jul 17 19:06:34 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.

View File

@ -1,3 +1,12 @@
Thu Jul 17 19:12:02 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeview.c (gtk_tree_view_remove_widget): the treeview
should only grab focus back if the "cell_editable" widget still
has focus. (Fixes #110104, testcase provided by Marco Pesenti
Gritti).
Thu Jul 17 19:06:34 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.

View File

@ -11369,7 +11369,8 @@ gtk_tree_view_remove_widget (GtkCellEditable *cell_editable,
_gtk_tree_view_column_stop_editing (tree_view->priv->edited_column);
tree_view->priv->edited_column = NULL;
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
if (GTK_WIDGET_HAS_FOCUS (cell_editable))
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
gtk_container_remove (GTK_CONTAINER (tree_view),
GTK_WIDGET (cell_editable));