Check to see if the menu item is selectable before setting

Wed Jun 12 17:31:15 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmenushell.c (gtk_menu_shell_real_select_item):
        Check to see if the menu item is selectable before
        setting menu_shell->active_menu_item. This hopefully
        will keep gail from getting confused.
        (#84115, Remus Draica)
This commit is contained in:
Owen Taylor 2002-06-12 21:32:25 +00:00 committed by Owen Taylor
parent f67241c53b
commit 789d271164
7 changed files with 51 additions and 0 deletions

View File

@ -1,3 +1,11 @@
Wed Jun 12 17:31:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenushell.c (gtk_menu_shell_real_select_item):
Check to see if the menu item is selectable before
setting menu_shell->active_menu_item. This hopefully
will keep gail from getting confused.
(#84115, Remus Draica)
Wed Jun 12 17:13:13 2002 Owen Taylor <otaylor@redhat.com> Wed Jun 12 17:13:13 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Fix bug * gtk/gtkwindow.c (gtk_window_move_resize): Fix bug

View File

@ -1,3 +1,11 @@
Wed Jun 12 17:31:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenushell.c (gtk_menu_shell_real_select_item):
Check to see if the menu item is selectable before
setting menu_shell->active_menu_item. This hopefully
will keep gail from getting confused.
(#84115, Remus Draica)
Wed Jun 12 17:13:13 2002 Owen Taylor <otaylor@redhat.com> Wed Jun 12 17:13:13 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Fix bug * gtk/gtkwindow.c (gtk_window_move_resize): Fix bug

View File

@ -1,3 +1,11 @@
Wed Jun 12 17:31:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenushell.c (gtk_menu_shell_real_select_item):
Check to see if the menu item is selectable before
setting menu_shell->active_menu_item. This hopefully
will keep gail from getting confused.
(#84115, Remus Draica)
Wed Jun 12 17:13:13 2002 Owen Taylor <otaylor@redhat.com> Wed Jun 12 17:13:13 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Fix bug * gtk/gtkwindow.c (gtk_window_move_resize): Fix bug

View File

@ -1,3 +1,11 @@
Wed Jun 12 17:31:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenushell.c (gtk_menu_shell_real_select_item):
Check to see if the menu item is selectable before
setting menu_shell->active_menu_item. This hopefully
will keep gail from getting confused.
(#84115, Remus Draica)
Wed Jun 12 17:13:13 2002 Owen Taylor <otaylor@redhat.com> Wed Jun 12 17:13:13 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Fix bug * gtk/gtkwindow.c (gtk_window_move_resize): Fix bug

View File

@ -1,3 +1,11 @@
Wed Jun 12 17:31:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenushell.c (gtk_menu_shell_real_select_item):
Check to see if the menu item is selectable before
setting menu_shell->active_menu_item. This hopefully
will keep gail from getting confused.
(#84115, Remus Draica)
Wed Jun 12 17:13:13 2002 Owen Taylor <otaylor@redhat.com> Wed Jun 12 17:13:13 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Fix bug * gtk/gtkwindow.c (gtk_window_move_resize): Fix bug

View File

@ -1,3 +1,11 @@
Wed Jun 12 17:31:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenushell.c (gtk_menu_shell_real_select_item):
Check to see if the menu item is selectable before
setting menu_shell->active_menu_item. This hopefully
will keep gail from getting confused.
(#84115, Remus Draica)
Wed Jun 12 17:13:13 2002 Owen Taylor <otaylor@redhat.com> Wed Jun 12 17:13:13 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Fix bug * gtk/gtkwindow.c (gtk_window_move_resize): Fix bug

View File

@ -874,6 +874,9 @@ gtk_menu_shell_real_select_item (GtkMenuShell *menu_shell,
{ {
gtk_menu_shell_deselect (menu_shell); gtk_menu_shell_deselect (menu_shell);
if (!_gtk_menu_item_is_selectable (menu_item))
return;
menu_shell->active_menu_item = menu_item; menu_shell->active_menu_item = menu_item;
_gtk_menu_item_set_placement (GTK_MENU_ITEM (menu_shell->active_menu_item), _gtk_menu_item_set_placement (GTK_MENU_ITEM (menu_shell->active_menu_item),
GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement); GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement);