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

changed call for editor to include a call for the classid editor as well

Browse Source
This commit is contained in:
mjudge%netscape.com 1998-12-03 21:47:22 +00:00
parent 0495ee6cc6
commit afbfa1f451
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xpfe/xpviewer/src/nsBrowserWindow.cpp
View File

@ -97,6 +97,7 @@
#endif
#include "nsIEditor.h"
#include "nsEditorCID.h"
// XXX For font setting below
#include "nsFont.h"
@ -179,6 +180,7 @@ static NS_DEFINE_IID(kIXPBaseWindowIID, NS_IXPBASE_WINDOW_IID);
static NS_DEFINE_IID(kINetSupportIID, NS_INETSUPPORT_IID);
static NS_DEFINE_IID(kIEditFactoryIID, NS_IEDITORFACTORY_IID);
static NS_DEFINE_IID(kIEditorIID, NS_IEDITOR_IID);
static NS_DEFINE_IID(kIEditorCID, NS_EDITOR_CID);
static const char* gsAOLFormat = "AOLMAIL";
static const char* gsHTMLFormat = "text/html";
@ -2845,7 +2847,7 @@ nsBrowserWindow::DoEditorMode(nsIWebShell *aWebShell)
if (NS_SUCCEEDED(doc->QueryInterface(kIDOMDocumentIID, (void **)&domDoc)))
{ //returns an addreffed domdocument
nsIEditor *editor;
if (NS_SUCCEEDED(nsRepository::CreateInstance(kIEditFactoryIID, nsnull, kIEditorIID, (void **)&editor)))
if (NS_SUCCEEDED(nsRepository::CreateInstance(kIEditorCID, nsnull, kIEditorIID, (void **)&editor)))
{
editor->Init(domDoc);
AddEditor(editor); //new call to set the editor interface this will addref

9
xpfe/xpviewer/src/nsSetupRegistry.cpp
View File

@ -34,7 +34,7 @@
#include "nsLayoutCID.h"
#include "nsINetService.h"
#include "nsIEditor.h"
#include "nsEditorCID.h"
#ifdef XP_PC
@ -128,6 +128,7 @@ static NS_DEFINE_IID(kCDOMNativeObjectRegistry, NS_DOM_NATIVE_OBJECT_REGISTRY_CI
static NS_DEFINE_IID(kCHTMLDocument, NS_HTMLDOCUMENT_CID);
static NS_DEFINE_IID(kCXMLDocument, NS_XMLDOCUMENT_CID);
static NS_DEFINE_IID(kCImageDocument, NS_IMAGEDOCUMENT_CID);
static NS_DEFINE_IID(kCRangeListCID, NS_RANGELIST_CID);
static NS_DEFINE_IID(kCHTMLImageElementFactory, NS_HTMLIMAGEELEMENTFACTORY_CID);
static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID);
@ -140,7 +141,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);
static NS_DEFINE_IID(kIEditFactoryIID, NS_IEDITORFACTORY_IID);
static NS_DEFINE_IID(kCEditorCID, NS_EDITOR_CID);
extern "C" void
NS_SetupRegistry()
@ -184,6 +185,7 @@ NS_SetupRegistry()
nsRepository::RegisterFactory(kCHTMLDocument, LAYOUT_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXMLDocument, LAYOUT_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCImageDocument, LAYOUT_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCRangeListCID, LAYOUT_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCHTMLImageElementFactory, LAYOUT_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kNetServiceCID, NETLIB_DLL, PR_FALSE, PR_FALSE);
@ -196,8 +198,7 @@ NS_SetupRegistry()
nsRepository::RegisterFactory(kCMenuBarCID, WIDGET_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCMenuCID, WIDGET_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCMenuItemCID, WIDGET_DLL, PR_FALSE, PR_FALSE);
#ifndef XP_MAC // temporary
nsRepository::RegisterFactory(kIEditFactoryIID, EDITOR_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCEditorCID, EDITOR_DLL, PR_FALSE, PR_FALSE);
#endif // XP_MAC
}