summaryrefslogtreecommitdiff
path: root/gtk/gtkmain.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2009-12-20 18:20:42 -0500
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2010-04-03 20:53:36 -0400
commit779d3d58ea760751cef92a7809fd4cf5feeb962e (patch)
tree2761a0694e8ebfa33d3a6a99e8e4b91005eafa83 /gtk/gtkmain.c
parent9de876c222e2f30c62444d1c90d4ac8251c2e7e4 (diff)
downloadgtk+-779d3d58ea760751cef92a7809fd4cf5feeb962e.tar.gz
Some improvements to the auto-mnemonics code
Diffstat (limited to 'gtk/gtkmain.c')
-rw-r--r--gtk/gtkmain.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index af03f3578e..dfd517ac92 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1615,8 +1615,11 @@ gtk_main_do_event (GdkEvent *event)
if (gtk_invoke_key_snoopers (grab_widget, event))
break;
}
- /* catch alt press to enable auto-mnemonics */
- if (event->key.keyval == GDK_Alt_L || event->key.keyval == GDK_Alt_R)
+ /* Catch alt press to enable auto-mnemonics;
+ * menus are handled elsewhere
+ */
+ if ((event->key.keyval == GDK_Alt_L || event->key.keyval == GDK_Alt_R) &&
+ !GTK_IS_MENU_SHELL (grab_widget))
{
gboolean auto_mnemonics;