Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#if def out the code so NECKO doesn't break

Browse Source
This commit is contained in:
davidm%netscape.com 1999-07-28 03:37:30 +00:00
parent b722635460
commit 4c354b1d55
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xpfe/appshell/src/nsWebShellWindow.cpp
View File

@ -174,10 +174,12 @@ static NS_DEFINE_IID(kIUrlDispatcherIID, NS_IURLDISPATCHER_IID);
#ifdef DEBUG_rods #ifdef DEBUG_rods
#define DEBUG_MENUSDEL 1 #define DEBUG_MENUSDEL 1
#endif #endif
#ifndef NECKO
static NS_DEFINE_IID(kINetSupportIID, NS_INETSUPPORT_IID); static NS_DEFINE_IID(kINetSupportIID, NS_INETSUPPORT_IID);
#include "nsINetSupportDialogService.h" #include "nsINetSupportDialogService.h"
static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID); static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
#endif
#include "nsIWebShell.h" #include "nsIWebShell.h"
const char * kThrobberOnStr = "resource:/res/throbber/anims07.gif"; const char * kThrobberOnStr = "resource:/res/throbber/anims07.gif";
@ -2850,6 +2852,8 @@ nsWebShellWindow::IsIntrinsicallySized(PRBool& aResult)
// nsINetSupport // nsINetSupport
#ifdef NECKO
#else
void nsWebShellWindow::Alert(const nsString &aText) void nsWebShellWindow::Alert(const nsString &aText)
{ {
nsresult rv; nsresult rv;
@ -2912,3 +2916,4 @@ PRBool nsWebShellWindow::PromptPassword(const nsString &aText,
} }
return result ? PR_TRUE : PR_FALSE; return result ? PR_TRUE : PR_FALSE;
} }
#endif

14
xpfe/appshell/src/nsWebShellWindow.h
View File

@ -30,7 +30,9 @@
#include "nsVoidArray.h" #include "nsVoidArray.h"
#include "nsIMenu.h" #include "nsIMenu.h"
#include "nsIUrlDispatcher.h" #include "nsIUrlDispatcher.h"
#ifndef NECKO
#include "nsINetSupport.h" #include "nsINetSupport.h"
#endif
// can't use forward class decl's because of template bugs on Solaris // can't use forward class decl's because of template bugs on Solaris
#include "nsIDOMDocument.h" #include "nsIDOMDocument.h"
#include "nsIDOMNode.h" #include "nsIDOMNode.h"
@ -59,8 +61,11 @@ class nsWebShellWindow : public nsIWebShellWindow,
public nsIBrowserWindow, public nsIBrowserWindow,
public nsIDocumentLoaderObserver, public nsIDocumentLoaderObserver,
public nsIDocumentObserver, public nsIDocumentObserver,
public nsIUrlDispatcher, public nsIUrlDispatcher
public nsINetSupport #ifdef NECKO
#else
, public nsINetSupport
#endif
{ {
public: public:
nsWebShellWindow(); nsWebShellWindow();
@ -250,6 +255,8 @@ public:
NS_DECL_IURLDISPATCHER NS_DECL_IURLDISPATCHER
// nsINetSupport // nsINetSupport
#if NECKO
#else
NS_IMETHOD_(void) Alert(const nsString &aText); NS_IMETHOD_(void) Alert(const nsString &aText);
NS_IMETHOD_(PRBool) Confirm(const nsString &aText); NS_IMETHOD_(PRBool) Confirm(const nsString &aText);
NS_IMETHOD_(PRBool) Prompt(const nsString &aText, NS_IMETHOD_(PRBool) Prompt(const nsString &aText,
@ -259,7 +266,8 @@ public:
nsString &aUser, nsString &aUser,
nsString &aPassword); nsString &aPassword);
NS_IMETHOD_(PRBool) PromptPassword(const nsString &aText, NS_IMETHOD_(PRBool) PromptPassword(const nsString &aText,
nsString &aPassword); nsString &aPassword);
#endif
protected: protected:
void ExecuteJavaScriptString(nsString& aJavaScript); void ExecuteJavaScriptString(nsString& aJavaScript);