Updated fix for #356515, merged from trunk:

2007-03-10  Kristian Rietveld  <kris@gtk.org>

	Updated fix for #356515, merged from trunk:

	* gtk/gtktreeview.c (gtk_tree_view_search_dialog_hide): send
	a focus-in event to the tree view after hiding the search dialog;
	only hide the search dialog and send the focus events when the
	dialog is currently visible.


svn path=/branches/gtk-2-10/; revision=17465
This commit is contained in:
Kristian Rietveld
2007-03-10 22:47:38 +00:00
committed by Kristian Rietveld
parent 5806be0247
commit e46cc9a2a8
2 changed files with 17 additions and 4 deletions

View File

@@ -1,3 +1,12 @@
2007-03-10 Kristian Rietveld <kris@gtk.org>
Updated fix for #356515, merged from trunk:
* gtk/gtktreeview.c (gtk_tree_view_search_dialog_hide): send
a focus-in event to the tree view after hiding the search dialog;
only hide the search dialog and send the focus events when the
dialog is currently visible.
2007-03-10 Kristian Rietveld <kris@gtk.org>
Merge from trunk:

View File

@@ -13682,10 +13682,14 @@ gtk_tree_view_search_dialog_hide (GtkWidget *search_dialog,
tree_view->priv->typeselect_flush_timeout = 0;
}
/* send focus-in event */
send_focus_change (GTK_WIDGET (tree_view->priv->search_entry), FALSE);
gtk_widget_hide (search_dialog);
gtk_entry_set_text (GTK_ENTRY (tree_view->priv->search_entry), "");
if (GTK_WIDGET_VISIBLE (search_dialog))
{
/* send focus-in event */
send_focus_change (GTK_WIDGET (tree_view->priv->search_entry), FALSE);
gtk_widget_hide (search_dialog);
gtk_entry_set_text (GTK_ENTRY (tree_view->priv->search_entry), "");
send_focus_change (GTK_WIDGET (tree_view), TRUE);
}
}
static void