callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing GTK_WINDOW cast in _gtk_menu_shell_update_mnemonics

Browse Source
This commit is contained in:
Christian Dywan
2010-01-04 07:29:42 +01:00
parent 8f7c3729ef
commit 3a9633a9de
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkmenushell.c
View File

@ -805,6 +805,8 @@ _gtk_menu_shell_update_mnemonics (GtkMenuShell *menu_shell)
found = FALSE; found = FALSE;
while (target) while (target)
{ {
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (target));
/* The idea with keyboard mode is that once you start using /* The idea with keyboard mode is that once you start using
* the keyboard to navigate the menus, we show mnemonics * the keyboard to navigate the menus, we show mnemonics
* until the menu navigation is over. To that end, we spread * until the menu navigation is over. To that end, we spread
@ -832,14 +834,12 @@ _gtk_menu_shell_update_mnemonics (GtkMenuShell *menu_shell)
*/ */
if (GTK_IS_MENU_BAR (target)) if (GTK_IS_MENU_BAR (target))
{ {
gtk_window_set_mnemonics_visible (GTK_WINDOW (gtk_widget_get_toplevel (target)), gtk_window_set_mnemonics_visible (GTK_WINDOW (toplevel), FALSE);
FALSE);
_gtk_label_mnemonics_visible_apply_recursively (GTK_WIDGET (target), _gtk_label_mnemonics_visible_apply_recursively (GTK_WIDGET (target),
mnemonics_visible); mnemonics_visible);
} }
else else
gtk_window_set_mnemonics_visible (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (target))), gtk_window_set_mnemonics_visible (GTK_WINDOW (toplevel), mnemonics_visible);
mnemonics_visible);
if (target->active_menu_item) if (target->active_menu_item)
found = TRUE; found = TRUE;