AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Owen Taylor 2002-03-20 17:04:32 +00:00 committed by Owen Taylor
parent 69ad8745d5
commit 288909d466
8 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
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.

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
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.

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
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.

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
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.

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
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.

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
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.

3
gtk/gtkentry.c
View File

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

7
gtk/gtkmenushell.c
View File

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