diff --git a/ChangeLog b/ChangeLog index 41b4f1c66a..54d394fc89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Jun 12 17:31:15 2002 Owen Taylor + + * 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 * gtk/gtkwindow.c (gtk_window_move_resize): Fix bug diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 41b4f1c66a..54d394fc89 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Wed Jun 12 17:31:15 2002 Owen Taylor + + * 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 * gtk/gtkwindow.c (gtk_window_move_resize): Fix bug diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 41b4f1c66a..54d394fc89 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Wed Jun 12 17:31:15 2002 Owen Taylor + + * 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 * gtk/gtkwindow.c (gtk_window_move_resize): Fix bug diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 41b4f1c66a..54d394fc89 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Wed Jun 12 17:31:15 2002 Owen Taylor + + * 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 * gtk/gtkwindow.c (gtk_window_move_resize): Fix bug diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 41b4f1c66a..54d394fc89 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Wed Jun 12 17:31:15 2002 Owen Taylor + + * 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 * gtk/gtkwindow.c (gtk_window_move_resize): Fix bug diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 41b4f1c66a..54d394fc89 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Wed Jun 12 17:31:15 2002 Owen Taylor + + * 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 * gtk/gtkwindow.c (gtk_window_move_resize): Fix bug diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index f90f56fbf7..bb5d4b42bd 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -872,6 +872,9 @@ gtk_menu_shell_real_select_item (GtkMenuShell *menu_shell, { gtk_menu_shell_deselect (menu_shell); + if (!_gtk_menu_item_is_selectable (menu_item)) + return; + menu_shell->active_menu_item = menu_item; _gtk_menu_item_set_placement (GTK_MENU_ITEM (menu_shell->active_menu_item), GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement);