From 407f571e1bc46ffc10280cae0907c9709e20fd0a Mon Sep 17 00:00:00 2001 From: "bryner%netscape.com" Date: Tue, 5 Apr 2005 22:27:39 +0000 Subject: [PATCH] Make --disable-xul work (bug 69995). We build enough XUL to support scrollbars unconditionally, but can now leave out heavyweight widgets like grid, listbox, and tree. r=bzbarsky, sr=alecf. git-svn-id: svn://10.0.0.236/trunk@171724 18797224-902f-48f8-a5cc-f745e15eee43 --- .../components/build/nsEmbeddingModule.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/mozilla/embedding/components/build/nsEmbeddingModule.cpp b/mozilla/embedding/components/build/nsEmbeddingModule.cpp index 8658d0abc60..5fba2c0ac32 100644 --- a/mozilla/embedding/components/build/nsEmbeddingModule.cpp +++ b/mozilla/embedding/components/build/nsEmbeddingModule.cpp @@ -52,11 +52,8 @@ #include "nsPrintingPromptService.h" #include "nsBaseCommandController.h" -NS_GENERIC_FACTORY_CONSTRUCTOR(nsDialogParamBlock) -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPromptService, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowWatcher, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppStartupNotifier) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsJSConsoleService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsFind) NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserFind) NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserPersist) @@ -64,14 +61,23 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsControllerCommandTable) NS_GENERIC_FACTORY_CONSTRUCTOR(nsCommandManager) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCommandParams, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(nsControllerCommandGroup) -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintingPromptService, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBaseCommandController) + +#ifdef MOZ_XUL +NS_GENERIC_FACTORY_CONSTRUCTOR(nsDialogParamBlock) +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPromptService, Init) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsJSConsoleService) +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintingPromptService, Init) +#endif static const nsModuleComponentInfo gComponents[] = { +#ifdef MOZ_XUL { "Dialog ParamBlock", NS_DIALOGPARAMBLOCK_CID, NS_DIALOGPARAMBLOCK_CONTRACTID, nsDialogParamBlockConstructor }, { "Prompt Service", NS_PROMPTSERVICE_CID, NS_PROMPTSERVICE_CONTRACTID, nsPromptServiceConstructor }, { "JS Console Service", NS_JSCONSOLESERVICE_CID, NS_JSCONSOLESERVICE_CONTRACTID, nsJSConsoleServiceConstructor }, + { "Printing Prompt Service", NS_PRINTINGPROMPTSERVICE_CID, NS_PRINTINGPROMPTSERVICE_CONTRACTID, nsPrintingPromptServiceConstructor }, +#endif { "Window Watcher", NS_WINDOWWATCHER_CID, NS_WINDOWWATCHER_CONTRACTID, nsWindowWatcherConstructor }, { "Find", NS_FIND_CID, NS_FIND_CONTRACTID, nsFindConstructor }, { "WebBrowserFind", NS_WEB_BROWSER_FIND_CID, NS_WEB_BROWSER_FIND_CONTRACTID, nsWebBrowserFindConstructor }, @@ -81,8 +87,7 @@ static const nsModuleComponentInfo gComponents[] = { { "Command Manager", NS_COMMAND_MANAGER_CID, NS_COMMAND_MANAGER_CONTRACTID, nsCommandManagerConstructor }, { "Command Params", NS_COMMAND_PARAMS_CID, NS_COMMAND_PARAMS_CONTRACTID, nsCommandParamsConstructor }, { "Command Group", NS_CONTROLLER_COMMAND_GROUP_CID, NS_CONTROLLER_COMMAND_GROUP_CONTRACTID, nsControllerCommandGroupConstructor }, - { "Base Command Controller", NS_BASECOMMANDCONTROLLER_CID, NS_BASECOMMANDCONTROLLER_CONTRACTID, nsBaseCommandControllerConstructor }, - { "Printing Prompt Service", NS_PRINTINGPROMPTSERVICE_CID, NS_PRINTINGPROMPTSERVICE_CONTRACTID, nsPrintingPromptServiceConstructor } + { "Base Command Controller", NS_BASECOMMANDCONTROLLER_CID, NS_BASECOMMANDCONTROLLER_CONTRACTID, nsBaseCommandControllerConstructor } }; NS_IMPL_NSGETMODULE(embedcomponents, gComponents)