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)
This commit is contained in:
Owen Taylor 2002-01-21 17:04:47 +00:00 committed by Owen Taylor
parent da117dcdca
commit 382cc81163
8 changed files with 52 additions and 1 deletions

View File

@ -1,3 +1,10 @@
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)
Mon Jan 21 11:46:39 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

View File

@ -1,3 +1,10 @@
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)
Mon Jan 21 11:46:39 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

View File

@ -1,3 +1,10 @@
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)
Mon Jan 21 11:46:39 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

View File

@ -1,3 +1,10 @@
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)
Mon Jan 21 11:46:39 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

View File

@ -1,3 +1,10 @@
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)
Mon Jan 21 11:46:39 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

View File

@ -1,3 +1,10 @@
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)
Mon Jan 21 11:46:39 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

View File

@ -1,3 +1,10 @@
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)
Mon Jan 21 11:46:39 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Set the fallback program class here,

View File

@ -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);
}
}