added beginnings of toolkit dialog factory

This commit is contained in:
danm@netscape.com
1999-02-15 05:38:15 +00:00
parent e37285e2e2
commit c9b69c66b4
22 changed files with 1125 additions and 56 deletions

View File

@@ -70,6 +70,8 @@ public:
nsString& aControllerIID,
nsIWidget*& aResult, nsIStreamObserver* anObserver);
NS_IMETHOD CloseTopLevelWindow(nsIWidget* aWindow);
NS_IMETHOD RegisterTopLevelWindow(nsIWidget* aWindow);
NS_IMETHOD UnregisterTopLevelWindow(nsIWidget* aWindow);
protected:
@@ -184,14 +186,29 @@ nsAppShellService::CreateTopLevelWindow(nsIURL* aUrl, nsString& aControllerIID,
} else {
rv = window->Initialize(mAppShell, aUrl, aControllerIID, anObserver);
if (NS_SUCCEEDED(rv)) {
mWindowList->AppendElement((nsIWebShellContainer*)window);
aResult = window->GetWidget();
RegisterTopLevelWindow(aResult);
window->Show(PR_TRUE);
}
}
return rv;
}
NS_IMETHODIMP
nsAppShellService::CloseTopLevelWindow(nsIWidget* aWindow)
{
nsresult rv;
rv = UnregisterTopLevelWindow(aWindow);
if (0 == mWindowList->Count()) {
mAppShell->Exit();
}
return rv;
}
/*
* Create a new top level window and display the given URL within it...
*
@@ -222,34 +239,53 @@ nsAppShellService::CreateDialogWindow(nsIWidget * aParent,
return rv;
}
NS_IMETHODIMP
nsAppShellService::CloseTopLevelWindow(nsIWidget* aWindow)
{
nsresult rv = NS_OK;
nsWebShellWindow* window;
/*
* Register a new top level window (created elsewhere)
*/
static NS_DEFINE_IID(kIWebShellContainerIID, NS_IWEB_SHELL_CONTAINER_IID);
NS_IMETHODIMP
nsAppShellService::RegisterTopLevelWindow(nsIWidget* aWindow)
{
nsresult rv;
void* data;
// Get the nsWebShellWindow from the nsIWidget...
aWindow->GetClientData(data);
if (nsnull != data) {
window = (nsWebShellWindow*)data;
if (data == nsnull)
rv = NS_ERROR_NULL_POINTER;
else {
nsWebShellWindow* window = (nsWebShellWindow *) data;
// nsCOMPtr<nsIWebShellContainer> wsc(window); DRaM
nsIWebShellContainer* wsc;
rv = window->QueryInterface(kIWebShellContainerIID, (void **) &wsc);
if (NS_SUCCEEDED(rv))
mWindowList->AppendElement(wsc);
}
if (nsnull != data) {
PRBool bFound;
bFound = mWindowList->RemoveElement((nsIWebShellContainer*)window);
}
if (0 == mWindowList->Count()) {
mAppShell->Exit();
}
return rv;
}
NS_IMETHODIMP
nsAppShellService::UnregisterTopLevelWindow(nsIWidget* aWindow)
{
nsresult rv;
void* data;
aWindow->GetClientData(data);
if (data == nsnull)
rv = NS_ERROR_NULL_POINTER;
else {
nsWebShellWindow* window = (nsWebShellWindow *) data;
// nsCOMPtr<nsIWebShellContainer> wsc(window); DRaM
nsIWebShellContainer* wsc;
rv = window->QueryInterface(kIWebShellContainerIID, (void **) &wsc);
if (NS_SUCCEEDED(rv))
mWindowList->RemoveElement(wsc);
}
return rv;
}
NS_EXPORT nsresult NS_NewAppShellService(nsIAppShellService** aResult)
{
if (nsnull == aResult) {