From 9f822a37cb1663f4cde5f5050d175fa976cee727 Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Fri, 11 Feb 2000 04:22:45 +0000 Subject: [PATCH] Fix for PDT+ bug #9333. r=saari git-svn-id: svn://10.0.0.236/trunk@60430 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/xul/base/src/nsMenuBarListener.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp index ab9cb760edd..f913ce15cb1 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp @@ -107,8 +107,18 @@ nsMenuBarListener::KeyDown(nsIDOMEvent* aKeyEvent) PRUint32 theChar; keyEvent->GetKeyCode(&theChar); if (theChar == NS_VK_ALT) { - // The ALT key just went down. Track this. - mAltKeyDown = PR_TRUE; + // No other modifiers can be down. + // Especially CTRL. CTRL+ALT == AltGR, and + // we'll fuck up on non-US enhanced 102-key + // keyboards if we don't check this. + PRBool ctrl,shift,meta; + keyEvent->GetCtrlKey(&ctrl); + keyEvent->GetShiftKey(&shift); + keyEvent->GetMetaKey(&meta); + if (!(ctrl || shift || meta)) { + // The ALT key just went down by itself. Track this. + mAltKeyDown = PR_TRUE; + } return NS_OK; }