--- a/layout/xul/nsMenuBarFrame.cpp
+++ b/layout/xul/nsMenuBarFrame.cpp
@@ -72,24 +72,24 @@ nsMenuBarFrame::Init(nsIContent* a
// Hook up the menu bar as a key listener on the whole document. It will see every
// key press that occurs, but after everyone else does.
mTarget = aContent->GetComposedDoc();
// Also hook up the listener to the window listening for focus events. This is so we can keep proper
// state as the user alt-tabs through processes.
- mTarget->AddEventListener(NS_LITERAL_STRING("keypress"), mMenuBarListener, false);
- mTarget->AddEventListener(NS_LITERAL_STRING("keydown"), mMenuBarListener, false);
- mTarget->AddEventListener(NS_LITERAL_STRING("keyup"), mMenuBarListener, false);
+ mTarget->AddSystemEventListener(NS_LITERAL_STRING("keypress"), mMenuBarListener, false);
+ mTarget->AddSystemEventListener(NS_LITERAL_STRING("keydown"), mMenuBarListener, false);
+ mTarget->AddSystemEventListener(NS_LITERAL_STRING("keyup"), mMenuBarListener, false);
// mousedown event should be handled in all phase
- mTarget->AddEventListener(NS_LITERAL_STRING("mousedown"), mMenuBarListener, true);
- mTarget->AddEventListener(NS_LITERAL_STRING("mousedown"), mMenuBarListener, false);
- mTarget->AddEventListener(NS_LITERAL_STRING("blur"), mMenuBarListener, true);
+ mTarget->AddSystemEventListener(NS_LITERAL_STRING("mousedown"), mMenuBarListener, true);
+ mTarget->AddSystemEventListener(NS_LITERAL_STRING("mousedown"), mMenuBarListener, false);
+ mTarget->AddSystemEventListener(NS_LITERAL_STRING("blur"), mMenuBarListener, true);
}
NS_IMETHODIMP
nsMenuBarFrame::SetActive(bool aActiveFlag)
{
// If the activity is not changed, there is nothing to do.
if (mIsActive == aActiveFlag)
return NS_OK;
@@ -406,20 +406,20 @@ nsMenuBarFrame::RemoveKeyboardNavigator(
void
nsMenuBarFrame::DestroyFrom(nsIFrame* aDestructRoot)
{
nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
if (pm)
pm->SetActiveMenuBar(this, false);
- mTarget->RemoveEventListener(NS_LITERAL_STRING("keypress"), mMenuBarListener, false);
- mTarget->RemoveEventListener(NS_LITERAL_STRING("keydown"), mMenuBarListener, false);
- mTarget->RemoveEventListener(NS_LITERAL_STRING("keyup"), mMenuBarListener, false);
+ mTarget->RemoveSystemEventListener(NS_LITERAL_STRING("keypress"), mMenuBarListener, false);
+ mTarget->RemoveSystemEventListener(NS_LITERAL_STRING("keydown"), mMenuBarListener, false);
+ mTarget->RemoveSystemEventListener(NS_LITERAL_STRING("keyup"), mMenuBarListener, false);
- mTarget->RemoveEventListener(NS_LITERAL_STRING("mousedown"), mMenuBarListener, true);
- mTarget->RemoveEventListener(NS_LITERAL_STRING("mousedown"), mMenuBarListener, false);
- mTarget->RemoveEventListener(NS_LITERAL_STRING("blur"), mMenuBarListener, true);
+ mTarget->RemoveSystemEventListener(NS_LITERAL_STRING("mousedown"), mMenuBarListener, true);
+ mTarget->RemoveSystemEventListener(NS_LITERAL_STRING("mousedown"), mMenuBarListener, false);
+ mTarget->RemoveSystemEventListener(NS_LITERAL_STRING("blur"), mMenuBarListener, true);
NS_IF_RELEASE(mMenuBarListener);
nsBoxFrame::DestroyFrom(aDestructRoot);
}