moving nsIScreen and implementations to widget. (files copied on cvs …

…server already). bug 322942 r=vlad sr=roc
dothq · Jan 11, 2006 · 6b3bace · 6b3bace
1 parent c9cadb3
commit 6b3bace
Show file tree

Hide file tree

Showing 32 changed files with 40 additions and 1,552 deletions.
diff --git a/gfx/idl/Makefile.in b/gfx/idl/Makefile.in
@@ -50,8 +50,6 @@ XPIDLSRCS	= \
 		nsIFontEnumerator.idl \
 		nsIFontList.idl \
 		nsIScriptableRegion.idl \
-		nsIScreen.idl \
-		nsIScreenManager.idl \
 		nsIPrintOptions.idl \
 		nsIPrintSettings.idl \
 		nsIPrintSettingsService.idl \

diff --git a/gfx/idl/nsIScreen.idl b/gfx/idl/nsIScreen.idl
diff --git a/gfx/idl/nsIScreenManager.idl b/gfx/idl/nsIScreenManager.idl
diff --git a/gfx/public/nsGfxCIID.h b/gfx/public/nsGfxCIID.h
@@ -90,10 +90,6 @@
 { 0x199c7040, 0xcab0, 0x11d2, \
 { 0xa8, 0x49, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
 
-#define NS_SCREENMANAGER_CID \
-{ 0xc401eb80, 0xf9ea, 0x11d3, \
-{ 0xbb, 0x6f, 0xe7, 0x32, 0xb7, 0x3e, 0xbe, 0x7c } }
-
 #define NS_PRINTSETTINGSSERVICE_CID \
 { 0x841387c8, 0x72e6, 0x484b, \
 { 0x92, 0x96, 0xbf, 0x6e, 0xea, 0x80, 0xd5, 0x8a } }

diff --git a/gfx/src/gtk/Makefile.in b/gfx/src/gtk/Makefile.in
@@ -101,8 +101,6 @@ CPPSRCS		= \
 		nsImageGTK.cpp \
 		nsGCCache.cpp \
 		nsRenderingContextGTK.cpp \
-		nsScreenGtk.cpp \
-		nsScreenManagerGtk.cpp \
 		nsPrintOptionsGTK.cpp \
 		nsFontMetricsUtils.cpp \
 		$(NULL)

diff --git a/gfx/src/gtk/nsGfxFactoryGTK.cpp b/gfx/src/gtk/nsGfxFactoryGTK.cpp
@@ -50,7 +50,6 @@
 #include "nsDeviceContextSpecG.h"
 // aka    nsDeviceContextSpecFactoryGTK.h
 #include "nsDeviceContextSpecFactoryG.h"
-#include "nsScreenManagerGtk.h"
 #include "nsScriptableRegion.h"
 #include "nsDeviceContextGTK.h"
 #include "nsImageGTK.h"
@@ -85,7 +84,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegionGTK)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecGTK)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecFactoryGTK)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerGtk)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsGTK, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrinterEnumeratorGTK)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
@@ -291,11 +289,6 @@ static const nsModuleComponentInfo components[] =
     //    "@mozilla.org/gfx/fontlist;1"
     NS_FONTLIST_CONTRACTID,
     nsFontListConstructor },
-  { "Gtk Screen Manager",
-    NS_SCREENMANAGER_CID,
-    //    "@mozilla.org/gfx/screenmanager/gtk;1",
-    "@mozilla.org/gfx/screenmanager;1",
-    nsScreenManagerGtkConstructor },
   { "Gtk Printer Enumerator",
     NS_PRINTER_ENUMERATOR_CID,
     //    "@mozilla.org/gfx/printer_enumerator/gtk;1",

diff --git a/gfx/src/gtk/nsScreenGtk.cpp b/gfx/src/gtk/nsScreenGtk.cpp