corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disabling ability to specify a parent for a top-level window (until all platforms agree on what this means). fix refcount when registering windows with the window list.

Browse Source
This commit is contained in:
danm@netscape.com
1999-03-14 08:24:21 +00:00
parent e3db75d3a6
commit 4e06109057
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xpfe/appshell/src/nsAppShellService.cpp
View File

@@ -228,7 +228,9 @@ nsAppShellService::CreateTopLevelWindow(nsIWidget *aParent,
if (nsnull == window) {
rv = NS_ERROR_OUT_OF_MEMORY;
} else {
rv = window->Initialize(aParent, mAppShell, aUrl, aControllerIID,
// temporarily disabling parentage because non-Windows platforms
// seem to be interpreting it in unexpected ways.
rv = window->Initialize((nsIWidget *) nsnull, mAppShell, aUrl, aControllerIID,
anObserver, aCallbacks,
aInitialWidth, aInitialHeight);
if (NS_SUCCEEDED(rv)) {
@@ -275,7 +277,9 @@ nsAppShellService::CreateDialogWindow(nsIWidget * aParent,
if (nsnull == window) {
rv = NS_ERROR_OUT_OF_MEMORY;
} else {
rv = window->Initialize(aParent, mAppShell, aUrl, aControllerIID,
// temporarily disabling parentage because non-Windows platforms
// seem to be interpreting it in unexpected ways.
rv = window->Initialize((nsIWidget *) nsnull, mAppShell, aUrl, aControllerIID,
anObserver, aCallbacks,
aInitialWidth, aInitialHeight);
if (NS_SUCCEEDED(rv)) {
@@ -306,8 +310,10 @@ nsAppShellService::RegisterTopLevelWindow(nsIWidget* aWindow)
nsWebShellWindow* window = (nsWebShellWindow *) data;
nsIWebShellContainer* wsc;
rv = window->QueryInterface(kIWebShellContainerIID, (void **) &wsc);
if (NS_SUCCEEDED(rv))
if (NS_SUCCEEDED(rv)) {
mWindowList->AppendElement(wsc);
NS_RELEASE(wsc);
}
}
return rv;
}
@@ -326,8 +332,10 @@ nsAppShellService::UnregisterTopLevelWindow(nsIWidget* aWindow)
nsWebShellWindow* window = (nsWebShellWindow *) data;
nsIWebShellContainer* wsc;
rv = window->QueryInterface(kIWebShellContainerIID, (void **) &wsc);
if (NS_SUCCEEDED(rv))
if (NS_SUCCEEDED(rv)) {
mWindowList->RemoveElement(wsc);
NS_RELEASE(wsc);
}
}
return rv;
}