Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed editor classes to do autoregistration correctly and moved target directory to bin/components

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@23216 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cmanske%netscape.com
1999-03-08 22:46:33 +00:00
parent 1bc5a98e62
commit dea2088bcb
7 changed files with 75 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/editor/base/makefile.win
View File

@@ -122,7 +122,7 @@ LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
include <$(DEPTH)\config\rules.mak>
libs:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
clobber::

33
mozilla/editor/base/nsEditor.cpp
View File

@@ -67,6 +67,8 @@ static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
static NS_DEFINE_IID(kIPresShellIID, NS_IPRESSHELL_IID);
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_IID(kIEditFactoryIID, NS_IEDITORFACTORY_IID);
static NS_DEFINE_IID(kITextEditFactoryIID, NS_ITEXTEDITORFACTORY_IID);
static NS_DEFINE_IID(kIHTMLEditFactoryIID, NS_IHTMLEDITORFACTORY_IID);
static NS_DEFINE_IID(kIEditorIID, NS_IEDITOR_IID);
static NS_DEFINE_IID(kIEditorSupportIID, NS_IEDITORSUPPORT_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
@@ -168,14 +170,39 @@ NSCanUnload(nsISupports* serviceMgr)
extern "C" NS_EXPORT nsresult
NSRegisterSelf(nsISupports* serviceMgr, const char *path)
{
return nsRepository::RegisterComponent(kIEditFactoryIID, NULL, NULL, path,
PR_TRUE, PR_TRUE); //this will register the factory with the xpcom dll.
nsresult result = NS_ERROR_UNEXPECTED;
//this will register the editor classes with the xpcom dll.
result = nsRepository::RegisterComponent(kEditorCID, NULL, NULL, path,
PR_TRUE, PR_TRUE);
if (NS_SUCCEEDED(result))
{
result = nsRepository::RegisterComponent(kTextEditorCID, NULL, NULL, path,
PR_TRUE, PR_TRUE);
if (NS_SUCCEEDED(result))
{
result = nsRepository::RegisterComponent(kHTMLEditorCID, NULL, NULL, path,
PR_TRUE, PR_TRUE);
}
}
return result;
}
extern "C" NS_EXPORT nsresult
NSUnregisterSelf(nsISupports* serviceMgr, const char *path)
{
return nsRepository::UnregisterFactory(kIEditFactoryIID, path);//this will unregister the factory with the xpcom dll.
nsresult result = NS_ERROR_UNEXPECTED;
result = nsRepository::UnregisterFactory(kIEditFactoryIID, path);
if (NS_SUCCEEDED(result))
{
result = nsRepository::UnregisterFactory(kITextEditFactoryIID, path);
if (NS_SUCCEEDED(result))
{
result = nsRepository::UnregisterFactory(kIHTMLEditFactoryIID, path);
}
}
return result;
}
//END EXPORTS

7
mozilla/editor/base/nsTextEditFactory.cpp
View File

@@ -125,10 +125,3 @@ nsTextEditFactory::~nsTextEditFactory()
{
//nsRepository::UnregisterFactory(mCID, (nsIFactory *)this); //we are out of ref counts anyway
}

2
mozilla/editor/guimgr/src/makefile.win
View File

@@ -60,7 +60,7 @@ LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
include <$(DEPTH)\config\rules.mak>
libs:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
clobber::

12
mozilla/editor/guimgr/src/nsGuiManagerFactory.cpp
View File

@@ -121,3 +121,15 @@ nsGuiManagerFactory::~nsGuiManagerFactory()
{
nsRepository::UnregisterFactory(kIGuiManagerFactoryIID, (nsIFactory *)this); //we are out of ref counts anyway
}
extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* serviceMgr, const char *path)
{
return nsRepository::RegisterComponent(kIGuiManagerFactoryIID,
NULL, NULL, path,
PR_TRUE, PR_TRUE);
}
extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* serviceMgr, const char *path)
{
return nsRepository::UnregisterFactory(kIGuiManagerFactoryIID, path);
}

33
mozilla/editor/libeditor/base/nsEditor.cpp
View File

@@ -67,6 +67,8 @@ static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
static NS_DEFINE_IID(kIPresShellIID, NS_IPRESSHELL_IID);
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_IID(kIEditFactoryIID, NS_IEDITORFACTORY_IID);
static NS_DEFINE_IID(kITextEditFactoryIID, NS_ITEXTEDITORFACTORY_IID);
static NS_DEFINE_IID(kIHTMLEditFactoryIID, NS_IHTMLEDITORFACTORY_IID);
static NS_DEFINE_IID(kIEditorIID, NS_IEDITOR_IID);
static NS_DEFINE_IID(kIEditorSupportIID, NS_IEDITORSUPPORT_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
@@ -168,14 +170,39 @@ NSCanUnload(nsISupports* serviceMgr)
extern "C" NS_EXPORT nsresult
NSRegisterSelf(nsISupports* serviceMgr, const char *path)
{
return nsRepository::RegisterComponent(kIEditFactoryIID, NULL, NULL, path,
PR_TRUE, PR_TRUE); //this will register the factory with the xpcom dll.
nsresult result = NS_ERROR_UNEXPECTED;
//this will register the editor classes with the xpcom dll.
result = nsRepository::RegisterComponent(kEditorCID, NULL, NULL, path,
PR_TRUE, PR_TRUE);
if (NS_SUCCEEDED(result))
{
result = nsRepository::RegisterComponent(kTextEditorCID, NULL, NULL, path,
PR_TRUE, PR_TRUE);
if (NS_SUCCEEDED(result))
{
result = nsRepository::RegisterComponent(kHTMLEditorCID, NULL, NULL, path,
PR_TRUE, PR_TRUE);
}
}
return result;
}
extern "C" NS_EXPORT nsresult
NSUnregisterSelf(nsISupports* serviceMgr, const char *path)
{
return nsRepository::UnregisterFactory(kIEditFactoryIID, path);//this will unregister the factory with the xpcom dll.
nsresult result = NS_ERROR_UNEXPECTED;
result = nsRepository::UnregisterFactory(kIEditFactoryIID, path);
if (NS_SUCCEEDED(result))
{
result = nsRepository::UnregisterFactory(kITextEditFactoryIID, path);
if (NS_SUCCEEDED(result))
{
result = nsRepository::UnregisterFactory(kIHTMLEditFactoryIID, path);
}
}
return result;
}
//END EXPORTS

2
mozilla/editor/txmgr/src/makefile.win
View File

@@ -69,7 +69,7 @@ LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
include <$(DEPTH)\config\rules.mak>
libs:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
clobber::