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

Rearrange the code so that windows can be closed programmatically, and deregistration etc all happens, in a more foolproof way.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@25259 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mcmullen%netscape.com
1999-03-27 00:09:04 +00:00
parent 85d227f2cc
commit 7ff0de82ed
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,7 +311,16 @@ nsWebShellWindow::Close()
Revisit this later!?
*/
// Release();
return NS_OK;
nsIAppShellService* appShell;
nsresult rv = nsServiceManager::GetService(kAppShellServiceCID,
kIAppShellServiceIID,
(nsISupports**)&appShell);
if (NS_FAILED(rv))
return rv;
rv = appShell->UnregisterTopLevelWindow(this);
nsServiceManager::ReleaseService(kAppShellServiceCID, appShell);
return rv;
}
@@ -324,7 +333,6 @@ nsWebShellWindow::Close()
nsEventStatus PR_CALLBACK
nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
{
nsresult rv;
nsEventStatus result = nsEventStatus_eIgnore;
nsIWebShell* webShell = nsnull;
@@ -354,19 +362,10 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
* Notify the ApplicationShellService that the window is being closed...
*/
case NS_DESTROY: {
nsIAppShellService* appShell;
rv = nsServiceManager::GetService(kAppShellServiceCID,
kIAppShellServiceIID,
(nsISupports**)&appShell);
if (NS_SUCCEEDED(rv)) {
void *data;
aEvent->widget->GetClientData(data);
if (data != nsnull)
appShell->CloseTopLevelWindow((nsWebShellWindow *)data);
nsServiceManager::ReleaseService(kAppShellServiceCID, appShell);
}
void* data;
aEvent->widget->GetClientData(data);
if (data)
((nsWebShellWindow *)data)->Close();
break;
}
}