diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index 9205f6688f5..9d2249ed85c 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -174,10 +174,12 @@ static NS_DEFINE_IID(kIUrlDispatcherIID, NS_IURLDISPATCHER_IID); #ifdef DEBUG_rods #define DEBUG_MENUSDEL 1 #endif - +#ifndef NECKO static NS_DEFINE_IID(kINetSupportIID, NS_INETSUPPORT_IID); #include "nsINetSupportDialogService.h" static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID); +#endif + #include "nsIWebShell.h" const char * kThrobberOnStr = "resource:/res/throbber/anims07.gif"; @@ -2850,6 +2852,8 @@ nsWebShellWindow::IsIntrinsicallySized(PRBool& aResult) // nsINetSupport +#ifdef NECKO +#else void nsWebShellWindow::Alert(const nsString &aText) { nsresult rv; @@ -2912,3 +2916,4 @@ PRBool nsWebShellWindow::PromptPassword(const nsString &aText, } return result ? PR_TRUE : PR_FALSE; } +#endif \ No newline at end of file diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.h b/mozilla/xpfe/appshell/src/nsWebShellWindow.h index 086b8cc8733..8f745e2ca41 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.h +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.h @@ -30,7 +30,9 @@ #include "nsVoidArray.h" #include "nsIMenu.h" #include "nsIUrlDispatcher.h" +#ifndef NECKO #include "nsINetSupport.h" +#endif // can't use forward class decl's because of template bugs on Solaris #include "nsIDOMDocument.h" #include "nsIDOMNode.h" @@ -59,8 +61,11 @@ class nsWebShellWindow : public nsIWebShellWindow, public nsIBrowserWindow, public nsIDocumentLoaderObserver, public nsIDocumentObserver, - public nsIUrlDispatcher, - public nsINetSupport + public nsIUrlDispatcher + #ifdef NECKO + #else + , public nsINetSupport + #endif { public: nsWebShellWindow(); @@ -250,6 +255,8 @@ public: NS_DECL_IURLDISPATCHER // nsINetSupport + #if NECKO + #else NS_IMETHOD_(void) Alert(const nsString &aText); NS_IMETHOD_(PRBool) Confirm(const nsString &aText); NS_IMETHOD_(PRBool) Prompt(const nsString &aText, @@ -259,7 +266,8 @@ public: nsString &aUser, nsString &aPassword); NS_IMETHOD_(PRBool) PromptPassword(const nsString &aText, - nsString &aPassword); + nsString &aPassword); + #endif protected: void ExecuteJavaScriptString(nsString& aJavaScript);