From f1f54e0cdd88678ab083ee129ec37fe9509490e5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 5 Nov 2007 12:11:08 +0000 Subject: ** Fix for bug #255051 2007-11-05 Milan Crha ** Fix for bug #255051 * e-cell-combo.c: (e_cell_combo_key_press): * e-cell-text.c: (ect_event): Pass Escape event to parent, if there is no action to do with it. * e-table-click-to-add.c: (etcta_event): Drop changes when pressed Escape and go back to default line with text "Click to add...". svn path=/trunk/; revision=34507 --- widgets/table/e-cell-combo.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'widgets/table/e-cell-combo.c') diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index bd13848148..764a2c2031 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -628,6 +628,9 @@ e_cell_combo_key_press (GtkWidget *popup_window, && event->keyval != GDK_3270_Enter) return FALSE; + if (event->keyval == GDK_Escape && (!ecc->popup_window||!GTK_WIDGET_VISIBLE (ecc->popup_window))) + return FALSE; + gtk_grab_remove (ecc->popup_window); gdk_pointer_ungrab (event->time); gdk_keyboard_ungrab (event->time); -- cgit