From 73c8a41d02cce252e0934ff8ec67f6c4bb2100e7 Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Tue, 15 Feb 2000 08:51:31 +0000 Subject: [PATCH] Add nsControllerCommandManager.cpp to build, as part of work for bug 18395. r=hyatt, pinkerton git-svn-id: svn://10.0.0.236/trunk@60850 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/rdf/build/nsRDFCID.h | 6 ++++++ mozilla/rdf/build/nsRDFModule.cpp | 8 ++++++++ mozilla/rdf/content/src/Makefile.in | 1 + mozilla/rdf/content/src/makefile.win | 21 +++++++++++---------- mozilla/rdf/macbuild/rdf.mcp | Bin 93358 -> 93358 bytes 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/mozilla/rdf/build/nsRDFCID.h b/mozilla/rdf/build/nsRDFCID.h index 2a5922ea611..fe90c707c53 100644 --- a/mozilla/rdf/build/nsRDFCID.h +++ b/mozilla/rdf/build/nsRDFCID.h @@ -128,4 +128,10 @@ #define NS_XULELEMENTFACTORY_CID \ { 0x76e92881, 0xcddb, 0x11d3, { 0xbf, 0x87, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } } + +// {508f5601-e09b-11d3-9f7e-cf931f9f173c} +#define NS_CONTROLLERCOMMANDMANAGER_CID \ +{ 0x508f5601, 0xe09b, 0x11d3, { 0x9f, 0x7e, 0xcf, 0x93, 0x1f, 0x9f, 0x17, 0x3c } } + + #endif // nsRDFCID_h__ diff --git a/mozilla/rdf/build/nsRDFModule.cpp b/mozilla/rdf/build/nsRDFModule.cpp index 36959a5f83a..ad30b8c0234 100644 --- a/mozilla/rdf/build/nsRDFModule.cpp +++ b/mozilla/rdf/build/nsRDFModule.cpp @@ -48,6 +48,7 @@ #include "nsIXULKeyListener.h" #include "nsIServiceManager.h" #include "nsIElementFactory.h" +#include "nsIControllerCommand.h" extern nsresult NS_NewXULElementFactory(nsIElementFactory** aResult); @@ -107,6 +108,7 @@ MAKE_CTOR(XULContentSink,XULContentSink,XULContentSink) MAKE_CTOR(RDFDefaultResource,DefaultResource,RDFResource) MAKE_CTOR(LocalStore,LocalStore,LocalStore) +MAKE_CTOR(ControllerCommandManager,ControllerCommandManager,ControllerCommandManager) // The list of components we register static nsModuleComponentInfo components[] = @@ -235,6 +237,12 @@ static nsModuleComponentInfo components[] = NS_ELEMENT_FACTORY_PROGID_PREFIX "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", CreateNewXULElementFactory }, + + { "Controller Command Manager", + NS_CONTROLLERCOMMANDMANAGER_CID, + NS_RDF_PROGID "/controller-command-manager", + CreateNewControllerCommandManager + }, }; NS_IMPL_NSGETMODULE("nsRDFModule", components); diff --git a/mozilla/rdf/content/src/Makefile.in b/mozilla/rdf/content/src/Makefile.in index b01ef9b7241..383cffb7c72 100644 --- a/mozilla/rdf/content/src/Makefile.in +++ b/mozilla/rdf/content/src/Makefile.in @@ -33,6 +33,7 @@ REQUIRES = dom js netlib rdf raptor xpcom locale CPPSRCS = \ nsElementMap.cpp \ + nsControllerCommandManager.cpp \ nsJSXULDocument.cpp \ nsJSXULElement.cpp \ nsJSXULCommandDispatcher.cpp \ diff --git a/mozilla/rdf/content/src/makefile.win b/mozilla/rdf/content/src/makefile.win index 3dba419c301..7d3a35700fa 100644 --- a/mozilla/rdf/content/src/makefile.win +++ b/mozilla/rdf/content/src/makefile.win @@ -32,20 +32,21 @@ LCFLAGS = \ CPP_OBJS=\ .\$(OBJDIR)\nsElementMap.obj \ - .\$(OBJDIR)\nsJSXULCommandDispatcher.obj \ - .\$(OBJDIR)\nsRDFGenericBuilder.obj \ - .\$(OBJDIR)\nsXULAttributes.obj \ - .\$(OBJDIR)\nsXULCommandDispatcher.obj \ - .\$(OBJDIR)\nsXULControllers.obj \ - .\$(OBJDIR)\nsXULPopupListener.obj \ + .\$(OBJDIR)\nsControllerCommandManager.obj \ + .\$(OBJDIR)\nsJSXULCommandDispatcher.obj \ + .\$(OBJDIR)\nsRDFGenericBuilder.obj \ + .\$(OBJDIR)\nsXULAttributes.obj \ + .\$(OBJDIR)\nsXULCommandDispatcher.obj \ + .\$(OBJDIR)\nsXULControllers.obj \ + .\$(OBJDIR)\nsXULPopupListener.obj \ .\$(OBJDIR)\nsXULPrototypeDocument.obj \ .\$(OBJDIR)\nsXULPrototypeCache.obj \ .\$(OBJDIR)\nsJSXULDocument.obj \ .\$(OBJDIR)\nsJSXULElement.obj \ - .\$(OBJDIR)\nsJSXULPopupElement.obj \ + .\$(OBJDIR)\nsJSXULPopupElement.obj \ .\$(OBJDIR)\nsJSXULTreeElement.obj \ .\$(OBJDIR)\nsJSXULIFrameElement.obj \ - .\$(OBJDIR)\nsJSXULBrowserElement.obj \ + .\$(OBJDIR)\nsJSXULBrowserElement.obj \ .\$(OBJDIR)\nsJSXULEditorElement.obj \ .\$(OBJDIR)\nsRDFDOMNodeList.obj \ .\$(OBJDIR)\nsXULElement.obj \ @@ -56,9 +57,9 @@ CPP_OBJS=\ .\$(OBJDIR)\nsXULSortService.obj \ .\$(OBJDIR)\nsXULTreeElement.obj \ .\$(OBJDIR)\nsXULIFrameElement.obj \ - .\$(OBJDIR)\nsXULBrowserElement.obj \ + .\$(OBJDIR)\nsXULBrowserElement.obj \ .\$(OBJDIR)\nsXULEditorElement.obj \ - .\$(OBJDIR)\nsXULPopupElement.obj \ + .\$(OBJDIR)\nsXULPopupElement.obj \ $(NULL) # XXX we are including layout\html\base\src to get HTML elements diff --git a/mozilla/rdf/macbuild/rdf.mcp b/mozilla/rdf/macbuild/rdf.mcp index 9ed0c6d566a0212745a8360f0453dbff7ba4ecdc..4b0b87c3ff9a23be57e63a3d2c2f52bd5302637f 100644 GIT binary patch delta 665 zcmZ2?lXcxq)(zTByk-mx3=WJy0*L2K-oPq7Ihe^xa0gJ}00RThIR*v+Ad_LoL`U(- zTbbrSlrsTEfOyg7IOaA+7Ldk?j@p}rS*HjyZr{8_LXm0nNvY|KY{5bQ|F1i-S?91Q z(`K6l1?I`K6+f~CyZ`?`KWOtrx!;VFdsW22{96`4{!hluHiz|DCI;|KzR#`!RI3M~ zH^*qRGO>Uxo1A{mV)IaoYW%c{M_8cycFNWyu|d>qREWg6gCU| z{=hUbKw~mH$Ek?{zLR@(j%?PCyC%WLvmWA+)XfFuVcd!>Zk|4_K!Zb}bTE`|h0<-4 z&o{|)CO~=4llhx9Cr6$Y@|1##Oo7sip!7m0-4CU+q4YE;odc!kLFwMf6Po22=TH97 zEFL%&DwYbRr$gzPP*G5gO=Hx9Z+88VmpZ6?35U+{s?&H8_o+yvdUd&&p~SC0pg@S7qk#8!0!Wq*)~cgFZE{ z#Htu1o|v7QmYI{PSDu--;ahXeLB z<13TbF)fDZWde!=@xsk<%x#R56LoYp3$RWX-n?2uj%i{5%jT0((;3-xfwtsDZ`L_1 z%Cy-gL4kSlY{idkx{Uw-9}(IdnDCo%a<7Uwn7?4z=0=&HjGJu^>$6M@;F)}%T?43A z4@7T{(Pm|uoYms9d97}!_GGqg(why^1ehlVs843+I5jcAcXF@JkdZn$$;mlq{U;wjtH3yK@}08=8g8CGu0ZF`g3`00^n57207@^M%yUk9vRO;R z50mkjBiHx%up>B-@3Y|U0S_2HTiQD