Commit 288909d4 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Improve test to prevent infinite loop. (#74952, Thomas Leonard)

Wed Mar 20 11:32:07 2002  Owen Taylor  <otaylor@redhat.com>

        * 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)
parent 69ad8745
Wed Mar 20 11:32:07 2002 Owen Taylor <otaylor@redhat.com>
* 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)
Wed Mar 20 11:00:59 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Use $PKG_CONFIG, not pkg-config.
......
Wed Mar 20 11:32:07 2002 Owen Taylor <otaylor@redhat.com>
* 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)
Wed Mar 20 11:00:59 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Use $PKG_CONFIG, not pkg-config.
......
Wed Mar 20 11:32:07 2002 Owen Taylor <otaylor@redhat.com>
* 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)
Wed Mar 20 11:00:59 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Use $PKG_CONFIG, not pkg-config.
......
Wed Mar 20 11:32:07 2002 Owen Taylor <otaylor@redhat.com>
* 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)
Wed Mar 20 11:00:59 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Use $PKG_CONFIG, not pkg-config.
......
Wed Mar 20 11:32:07 2002 Owen Taylor <otaylor@redhat.com>
* 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)
Wed Mar 20 11:00:59 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Use $PKG_CONFIG, not pkg-config.
......
Wed Mar 20 11:32:07 2002 Owen Taylor <otaylor@redhat.com>
* 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)
Wed Mar 20 11:00:59 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Use $PKG_CONFIG, not pkg-config.
......
......@@ -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);
}
}
......
......@@ -1128,7 +1128,12 @@ gtk_real_menu_shell_cycle_focus (GtkMenuShell *menu_shell,
GtkDirectionType dir)
{
while (menu_shell && !GTK_IS_MENU_BAR (menu_shell))
menu_shell = GTK_MENU_SHELL (menu_shell->parent_menu_shell);
{
if (menu_shell->parent_menu_shell)
menu_shell = GTK_MENU_SHELL (menu_shell->parent_menu_shell);
else
menu_shell = NULL;
}
if (menu_shell)
_gtk_menu_bar_cycle_focus (GTK_MENU_BAR (menu_shell), dir);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment