summaryrefslogtreecommitdiff
path: root/gtk/gtkentry.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-01-21 17:04:47 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-01-21 17:04:47 +0000
commit382cc81163c5b9fd9e6800a31846810794e451e0 (patch)
tree75ae2b2181f4df2b4f19fb009fc653b8d25a7ec2 /gtk/gtkentry.c
parentda117dcdca99fa8c5550316c7e4ced050d66de31 (diff)
downloadgtk+-382cc81163c5b9fd9e6800a31846810794e451e0.tar.gz
Trap the case where there is no default widget and the entry is the focus
Mon Jan 21 11:56:31 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_real_activate): Trap the case where there is no default widget and the entry is the focus widget, since this also causes infinite recursion. (#69158)
Diffstat (limited to 'gtk/gtkentry.c')
-rw-r--r--gtk/gtkentry.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 77c04a9020..1d1f7d8c35 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2229,7 +2229,9 @@ gtk_entry_real_activate (GtkEntry *entry)
{
window = GTK_WINDOW (toplevel);
- if (window && window->default_widget != widget)
+ if (window &&
+ widget != window->default_widget &&
+ !(!window->default_widget && widget == window->focus_widget))
gtk_window_activate_default (window);
}
}