Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug # 125158: force focus on Mac OS X sheets. code from saari, r=bryner sr=hyatt

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@115049 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rjc%netscape.com
2002-02-20 05:42:24 +00:00
parent 5b4ec5ba97
commit 8934664f7b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/widget/src/mac/nsMacWindow.cpp
View File

@@ -817,6 +817,8 @@ NS_IMETHODIMP nsMacWindow::Show(PRBool bState)
WindowPtr top = GetWindowTop(parentWindowRef);
::ShowSheetWindow(mWindowPtr, top);
UpdateWindowMenubar(parentWindowRef, PR_FALSE);
gEventDispatchHandler.DispatchGuiEvent(this, NS_GOTFOCUS);
gEventDispatchHandler.DispatchGuiEvent(this, NS_ACTIVATE);
}
else
#endif
@@ -848,6 +850,8 @@ NS_IMETHODIMP nsMacWindow::Show(PRBool bState)
if (mIsSheet) {
::HideSheetWindow(mWindowPtr);
gEventDispatchHandler.DispatchGuiEvent(this, NS_DEACTIVATE);
// if we had several sheets open, when the last one goes away
// we need to ensure that the top app window is active
WindowPtr top = GetWindowTop(parentWindowRef);

4
mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
View File

@@ -491,9 +491,6 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
#ifdef DEBUG_saari
printf("nsWebShellWindow::NS_ACTIVATE\n");
#endif
// Sucky platform specific code to get around event dispatch ordering
#if defined(WIN32) || defined(XP_OS2) || defined (MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_XLIB)
nsCOMPtr<nsIDOMWindowInternal> domWindow;
eventWindow->ConvertWebShellToDOMWindow(webShell, getter_AddRefs(domWindow));
/*
@@ -516,7 +513,6 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
if(privateDOMWindow)
privateDOMWindow->Activate();
}
#endif /* defined(WIN32) || defined(XP_OS2) || defined (MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_XLIB) */
break;
}