зеркало из https://github.com/mozilla/gecko-dev.git
For mjudge: Remove NGEDITOR defines
This commit is contained in:
Родитель
2a5a031f06
Коммит
504987e974
|
@ -35,9 +35,7 @@
|
|||
#include "nsLayoutCID.h"
|
||||
#include "nsINetService.h"
|
||||
|
||||
#ifdef NGEDITOR
|
||||
#include "nsIEditor.h"
|
||||
#endif
|
||||
|
||||
#ifdef XP_PC
|
||||
#define WIDGET_DLL "raptorwidget.dll"
|
||||
|
@ -118,9 +116,7 @@ static NS_DEFINE_IID(kCXMLDocument, NS_XMLDOCUMENT_CID);
|
|||
static NS_DEFINE_IID(kCImageDocument, NS_IMAGEDOCUMENT_CID);
|
||||
static NS_DEFINE_IID(kCHTMLImageElementFactory, NS_HTMLIMAGEELEMENTFACTORY_CID);
|
||||
static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID);
|
||||
#ifdef NGEDITOR
|
||||
static NS_DEFINE_IID(kIEditFactoryIID, NS_IEDITORFACTORY_IID);
|
||||
#endif
|
||||
|
||||
static NS_DEFINE_CID(kRDFMemoryDataSourceCID, NS_RDFMEMORYDATASOURCE_CID);
|
||||
static NS_DEFINE_CID(kRDFResourceManagerCID, NS_RDFRESOURCEMANAGER_CID);
|
||||
|
@ -176,9 +172,7 @@ NS_SetupRegistry()
|
|||
nsRepository::RegisterFactory(kCHTMLImageElementFactory, LAYOUT_DLL, PR_FALSE, PR_FALSE);
|
||||
nsRepository::RegisterFactory(kNetServiceCID, NETLIB_DLL, PR_FALSE, PR_FALSE);
|
||||
#ifndef XP_MAC // temporary
|
||||
#ifdef NGEDITOR
|
||||
nsRepository::RegisterFactory(kIEditFactoryIID, EDITOR_DLL, PR_FALSE, PR_FALSE);
|
||||
#endif
|
||||
#endif //XP_MAC
|
||||
|
||||
#ifndef XP_MAC // temporary
|
||||
|
|
|
@ -96,9 +96,7 @@
|
|||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#ifdef NGEDITOR
|
||||
#include "nsIEditor.h"
|
||||
#endif
|
||||
|
||||
// XXX For font setting below
|
||||
#include "nsFont.h"
|
||||
|
@ -179,10 +177,8 @@ static NS_DEFINE_IID(kIPopUpMenuIID, NS_IPOPUPMENU_IID);
|
|||
static NS_DEFINE_IID(kIMenuButtonIID, NS_IMENUBUTTON_IID);
|
||||
static NS_DEFINE_IID(kIXPBaseWindowIID, NS_IXPBASE_WINDOW_IID);
|
||||
static NS_DEFINE_IID(kINetSupportIID, NS_INETSUPPORT_IID);
|
||||
#ifdef NGEDITOR
|
||||
static NS_DEFINE_IID(kIEditFactoryIID, NS_IEDITORFACTORY_IID);
|
||||
static NS_DEFINE_IID(kIEditorIID, NS_IEDITOR_IID);
|
||||
#endif
|
||||
|
||||
static const char* gsAOLFormat = "AOLMAIL";
|
||||
static const char* gsHTMLFormat = "text/html";
|
||||
|
@ -770,11 +766,9 @@ nsBrowserWindow::DispatchMenuItem(PRInt32 aID)
|
|||
DoJSConsole();
|
||||
break;
|
||||
|
||||
#ifdef NGEDITOR
|
||||
case EDITOR_MODE:
|
||||
DoEditorMode(mWebShell);
|
||||
break;
|
||||
#endif
|
||||
} //switch
|
||||
|
||||
return nsEventStatus_eIgnore;
|
||||
|
@ -2829,7 +2823,6 @@ nsBrowserWindow::DoJSConsole()
|
|||
mApp->CreateJSConsole(this);
|
||||
}
|
||||
|
||||
#ifdef NGEDITOR
|
||||
//----------------------------------------
|
||||
void
|
||||
nsBrowserWindow::DoEditorMode(nsIWebShell *aWebShell)
|
||||
|
@ -2884,7 +2877,6 @@ nsBrowserWindow::AddEditor(nsIEditor *aEditor)
|
|||
if (!mEditor)//THIS FUNCTION REALLY NEEDS HELP
|
||||
mEditor = aEditor;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef NS_DEBUG
|
||||
|
@ -3389,9 +3381,7 @@ void CreateBrowserMenus(nsIMenuBar * aMenuBar)
|
|||
{"Debug Robot", "R", VIEWER_DEBUGROBOT},
|
||||
{"-", NULL, 0},
|
||||
{"Show Content Quality", ".", VIEWER_SHOW_CONTENT_QUALITY},
|
||||
#ifdef NGEDITOR
|
||||
{"Editor", "E", EDITOR_MODE},
|
||||
#endif
|
||||
{NULL, NULL, 0}
|
||||
};
|
||||
|
||||
|
@ -3422,7 +3412,7 @@ void CreateBrowserMenus(nsIMenuBar * aMenuBar)
|
|||
CreateMenuItem(fileMenu, "-", 0);
|
||||
CreateMenuItem(fileMenu, "Exit", VIEWER_EXIT);
|
||||
|
||||
#ifdef NGEDITOR
|
||||
#if EDITOR_NOT_YET
|
||||
nsIMenu * editMenu = CreateMenu(aMenuBar, "Edit", 'E');
|
||||
i = 0;
|
||||
while (editMenus[i].title != nsnull) {
|
||||
|
|
|
@ -34,9 +34,7 @@
|
|||
#include "nsLayoutCID.h"
|
||||
#include "nsINetService.h"
|
||||
|
||||
#ifdef NGEDITOR
|
||||
#include "nsIEditor.h"
|
||||
#endif
|
||||
|
||||
#ifdef XP_PC
|
||||
|
||||
|
@ -132,9 +130,7 @@ static NS_DEFINE_IID(kCMenuButtonCID, NS_MENUBUTTON_CID);
|
|||
static NS_DEFINE_IID(kCMenuBarCID, NS_MENUBAR_CID);
|
||||
static NS_DEFINE_IID(kCMenuCID, NS_MENU_CID);
|
||||
static NS_DEFINE_IID(kCMenuItemCID, NS_MENUITEM_CID);
|
||||
#ifdef NGEDITOR
|
||||
static NS_DEFINE_IID(kIEditFactoryIID, NS_IEDITORFACTORY_IID);
|
||||
#endif
|
||||
|
||||
extern "C" void
|
||||
NS_SetupRegistry()
|
||||
|
@ -192,8 +188,6 @@ NS_SetupRegistry()
|
|||
nsRepository::RegisterFactory(kCMenuItemCID, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
|
||||
#ifndef XP_MAC // temporary
|
||||
#ifdef NGEDITOR
|
||||
nsRepository::RegisterFactory(kIEditFactoryIID, EDITOR_DLL, PR_FALSE, PR_FALSE);
|
||||
#endif
|
||||
#endif // XP_MAC
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче