bug 418654 - windows widget honor NS_PRINTING. r=ere, a=beltzner
authordougt@meer.net
Thu, 21 Feb 2008 12:49:24 -0800
changeset 12034 930fe19db9d07d1b2bd7e4b6adccafc567a6cfb3
parent 12033 506b9ff63a1d46ea62f772a760ba62a89905f2b8
child 12035 e647d00934d777e0bc9aaff84329ecc1796754d2
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersere, beltzner
bugs418654
milestone1.9b4pre
bug 418654 - windows widget honor NS_PRINTING. r=ere, a=beltzner
widget/src/build/nsWinWidgetFactory.cpp
widget/src/windows/Makefile.in
--- a/widget/src/build/nsWinWidgetFactory.cpp
+++ b/widget/src/build/nsWinWidgetFactory.cpp
@@ -59,46 +59,49 @@
 #include "nsClipboardHelper.h"
 #include "nsTransferable.h"
 #include "nsHTMLFormatConverter.h"
 #include "nsDragService.h"
 #include "nsNativeThemeWin.h"
 #include "nsScreenManagerWin.h"
 #include "nsIGenericFactory.h"
 
-// printing
+#ifdef NS_PRINTING
 #include "nsDeviceContextSpecWin.h"
 #include "nsPrintOptionsWin.h"
 #include "nsPrintSession.h"
+#endif
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow)
 NS_GENERIC_FACTORY_CONSTRUCTOR(ChildWindow)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsNativeThemeWin)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker)
 
-#ifndef WINCE
+#ifdef NS_PRINTING
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIdleServiceWin)
 #endif
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsToolkit)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerWin)
 
+#ifdef NS_PRINTING
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsWin, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrinterEnumeratorWin)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecWin)
+#endif
 
 static const nsModuleComponentInfo components[] =
 {
   { "nsWindow",
     NS_WINDOW_CID,
     "@mozilla.org/widgets/window/win;1",
     nsWindowConstructor },
   { "Child nsWindow",
@@ -159,28 +162,30 @@ static const nsModuleComponentInfo compo
   { "HTML Format Converter",
     NS_HTMLFORMATCONVERTER_CID,
     "@mozilla.org/widget/htmlformatconverter;1",
     nsHTMLFormatConverterConstructor },
   { "nsScreenManagerWin",
     NS_SCREENMANAGER_CID,
     "@mozilla.org/gfx/screenmanager;1",
     nsScreenManagerWinConstructor },
+#ifdef NS_PRINTING
   { "nsPrintOptionsWin",
     NS_PRINTSETTINGSSERVICE_CID,
     "@mozilla.org/gfx/printsettings-service;1",
     nsPrintOptionsWinConstructor },
   { "Win Printer Enumerator",
     NS_PRINTER_ENUMERATOR_CID,
     "@mozilla.org/gfx/printerenumerator;1",
     nsPrinterEnumeratorWinConstructor },
   { "Print Session",
     NS_PRINTSESSION_CID,
     "@mozilla.org/gfx/printsession;1",
     nsPrintSessionConstructor },
   { "nsDeviceContextSpecWin",
     NS_DEVICE_CONTEXT_SPEC_CID,
     "@mozilla.org/gfx/devicecontextspec;1",
     nsDeviceContextSpecWinConstructor },
+#endif
 };
 
 NS_IMPL_NSGETMODULE_WITH_CTOR_DTOR(nsWidgetModule, components,
                                    nsAppShellInit, nsAppShellShutdown)
--- a/widget/src/windows/Makefile.in
+++ b/widget/src/windows/Makefile.in
@@ -82,20 +82,25 @@ CPPSRCS		= \
 	nsKeyboardLayout.cpp \
 	nsDataObj.cpp  \
 	nsDataObjCollection.cpp  \
 	nsClipboard.cpp      \
 	nsNativeThemeWin.cpp \
 	nsFilePicker.cpp     \
 	nsScreenWin.cpp	\
 	nsScreenManagerWin.cpp \
+	$(NULL)
+
+ifdef NS_PRINTING
+CPPSRCS		+= \
 	nsPrintOptionsWin.cpp \
 	nsPrintSettingsWin.cpp \
 	nsDeviceContextSpecWin.cpp \
 	$(NULL)
+endif
 
 ifneq ($(OS_ARCH), WINCE)
 CPPSRCS += \
 	nsNativeDragTarget.cpp  \
 	nsNativeDragSource.cpp  \
 	nsDragService.cpp  \
 	nsImageClipboard.cpp \
 	nsBidiKeyboard.cpp   \