Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 18:26:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

339640 Activate/deactivate events being processed twice. r=josh

Browse Source
This commit is contained in:
mark%moxienet.com 2006-05-30 15:55:25 +00:00
parent c35313a483
commit 79471dcc7a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widget/src/mac/nsMacWindow.cpp
View File

@ -741,7 +741,8 @@ nsMacWindow::WindowEventHandler ( EventHandlerCallRef inHandlerChain, EventRef i
if ( gRollupListener && gRollupWidget )
gRollupListener->Rollup();
gEventDispatchHandler.DispatchGuiEvent(self, NS_DEACTIVATE);
retVal = ::CallNextEventHandler(inHandlerChain, inEvent);
::CallNextEventHandler(inHandlerChain, inEvent);
retVal = noErr; // do default processing, but consume
}
break;
@ -750,21 +751,24 @@ nsMacWindow::WindowEventHandler ( EventHandlerCallRef inHandlerChain, EventRef i
case kEventWindowExpanded:
{
gEventDispatchHandler.DispatchGuiEvent(self, NS_ACTIVATE);
retVal = ::CallNextEventHandler(inHandlerChain, inEvent);
::CallNextEventHandler(inHandlerChain, inEvent);
retVal = noErr; // do default processing, but consume
}
break;
case kEventWindowActivated:
{
self->mMacEventHandler->HandleActivateEvent(PR_TRUE);
retVal = ::CallNextEventHandler(inHandlerChain, inEvent);
::CallNextEventHandler(inHandlerChain, inEvent);
retVal = noErr; // do default processing, but consume
}
break;
case kEventWindowDeactivated:
{
self->mMacEventHandler->HandleActivateEvent(PR_FALSE);
retVal = ::CallNextEventHandler(inHandlerChain, inEvent);
::CallNextEventHandler(inHandlerChain, inEvent);
retVal = noErr; // do default processing, but consume
}
break;