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

Remove dependency on nsIBrowserWindow.

Browse Source
This commit is contained in:
tbogard@aol.net
2000-03-11 00:21:27 +00:00
parent 9ad4e0c041
commit d97302225f
6 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,6 @@
#include "nsIAppShell.h"
#include "nsIWidget.h"
#include "nsIDOMWindow.h"
#include "nsIBrowserWindow.h"
#include "nsIWebShellWindow.h"
#include "nsWebShellWindow.h"
@@ -211,7 +210,7 @@ nsAppShellService::CreateHiddenWindow()
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIXULWindow> newWindow;
rv = JustCreateTopWindow(nsnull, url, PR_FALSE, PR_FALSE,
NS_CHROME_ALL_CHROME, 100, 100,
nsIWebBrowserChrome::allChrome, 100, 100,
getter_AddRefs(newWindow));
#endif
if (NS_SUCCEEDED(rv)) {
@@ -552,24 +551,24 @@ nsAppShellService::JustCreateTopWindow(nsIXULWindow *aParent,
else {
nsWidgetInitData widgetInitData;
widgetInitData.mWindowType = aChromeMask & NS_CHROME_OPEN_AS_DIALOG ?
widgetInitData.mWindowType = aChromeMask & nsIWebBrowserChrome::openAsDialog ?
eWindowType_dialog : eWindowType_toplevel;
// note default chrome overrides other OS chrome settings, but
// not internal chrome
if (aChromeMask & NS_CHROME_DEFAULT_CHROME)
if (aChromeMask & nsIWebBrowserChrome::defaultChrome)
widgetInitData.mBorderStyle = eBorderStyle_default;
else if ((aChromeMask & NS_CHROME_ALL_CHROME) == NS_CHROME_ALL_CHROME)
else if ((aChromeMask & nsIWebBrowserChrome::allChrome) == nsIWebBrowserChrome::allChrome)
widgetInitData.mBorderStyle = eBorderStyle_all;
else {
widgetInitData.mBorderStyle = eBorderStyle_none; // assumes none == 0x00
if (aChromeMask & NS_CHROME_WINDOW_BORDERS_ON)
if (aChromeMask & nsIWebBrowserChrome::windowBordersOn)
widgetInitData.mBorderStyle = NS_STATIC_CAST(enum nsBorderStyle, widgetInitData.mBorderStyle | eBorderStyle_border);
if (aChromeMask & NS_CHROME_TITLEBAR_ON)
if (aChromeMask & nsIWebBrowserChrome::titlebarOn)
widgetInitData.mBorderStyle = NS_STATIC_CAST(enum nsBorderStyle, widgetInitData.mBorderStyle | eBorderStyle_title);
if (aChromeMask & NS_CHROME_WINDOW_CLOSE_ON)
if (aChromeMask & nsIWebBrowserChrome::windowCloseOn)
widgetInitData.mBorderStyle = NS_STATIC_CAST(enum nsBorderStyle, widgetInitData.mBorderStyle | eBorderStyle_close);
if (aChromeMask & NS_CHROME_WINDOW_RESIZE_ON)
if (aChromeMask & nsIWebBrowserChrome::windowResizeOn)
widgetInitData.mBorderStyle = NS_STATIC_CAST(enum nsBorderStyle, widgetInitData.mBorderStyle | eBorderStyle_resizeh | eBorderStyle_minimize | eBorderStyle_maximize | eBorderStyle_menu);
}