From aae1d18e692efeb8ffbd9e164bf64deb841c3ece Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Mon, 19 Jul 1999 08:52:42 +0000 Subject: [PATCH] Making sure I consume events when the menu bar is active. git-svn-id: svn://10.0.0.236/trunk@40092 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/xul/base/src/nsMenuBarListener.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp index ab0deb27ec8..09aa98b3ef7 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp @@ -200,6 +200,9 @@ nsMenuBarListener::KeyUp(nsIDOMEvent* aKeyEvent) mAltKeyDown = PR_FALSE; mMenuBarFrame->ToggleMenuActiveState(); } + + if (mMenuBarFrame->IsActive()) + return NS_ERROR_BASE; // I am consuming event return NS_OK; // means I am NOT consuming event } @@ -222,6 +225,9 @@ nsMenuBarListener::KeyDown(nsIDOMEvent* aKeyEvent) // the menus. mMenuBarFrame->KeyboardNavigation(theChar); } + + if (mMenuBarFrame->IsActive()) + return NS_ERROR_BASE; // I am consuming event return NS_OK; // means I am NOT consuming event } @@ -236,5 +242,8 @@ nsMenuBarListener::KeyPress(nsIDOMEvent* aKeyEvent) // Test Alt attribute PRBool isAlt = PR_FALSE; theEvent->GetAltKey(&isAlt); + + if (mMenuBarFrame->IsActive()) + return NS_ERROR_BASE; // I am consuming event return NS_OK; // means I am NOT consuming event }