From 288909d466b72f39906599e39fe92c1f8721cec7 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 20 Mar 2002 17:04:32 +0000 Subject: Improve test to prevent infinite loop. (#74952, Thomas Leonard) Wed Mar 20 11:32:07 2002 Owen Taylor * gtk/gtkentry.c: Improve test to prevent infinite loop. (#74952, Thomas Leonard) * gtk/gtkmenushell.c (gtk_real_menu_shell_cycle_focus): Fix warning when toplevel menu shell isn't a menu bar. (Thomas Leonard, #75602) --- gtk/gtkentry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gtk/gtkentry.c') diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 00d67cbdd9..c9d6d18fc2 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -2214,7 +2214,8 @@ gtk_entry_real_activate (GtkEntry *entry) if (window && widget != window->default_widget && - !(!window->default_widget && widget == window->focus_widget)) + !(widget == window->focus_widget && + (!window->default_widget || !GTK_WIDGET_SENSITIVE (window->default_widget)))) gtk_window_activate_default (window); } } -- cgit v1.2.1