Slight modification to my fix for bug 38725 to make it more robust in the case of a popup bringing up a popup. Just in case.

git-svn-id: svn://10.0.0.236/trunk@69023 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
saari%netscape.com 2000-05-10 07:32:14 +00:00
parent 21fca137ef
commit 4721e131f2

View File

@ -175,22 +175,25 @@ PRBool gPopupJustDeactivated = PR_FALSE;
void nsMacEventDispatchHandler::SetActivated(nsWindow *aActivatedWidget)
{
//printf("nsMacEventDispatcher::SetActivated \n");
if (aActivatedWidget == mActiveWidget)
return;
if(aActivatedWidget) {
if ( eWindowType_popup == aActivatedWidget->GetWindowType() ) {
//printf("nsMacEventDispatcher::SetActivated type popup, bail\n");
return;
}
}
//printf("nsMacEventDispatcher::SetActivated \n");
if(gPopupJustDeactivated) {
gPopupJustDeactivated = PR_FALSE;
return;
}
gPopupJustDeactivated = PR_FALSE;
if (aActivatedWidget == mActiveWidget)
return;
if(aActivatedWidget) {
if ( eWindowType_popup == aActivatedWidget->GetWindowType() ) {
//printf("nsMacEventDispatcher::SetActivated type popup, bail\n");
return;
}
}
// tell the old widget it is not focused
if (mActiveWidget)
{