From 20a4a20d4917222d3e5533a479634e8f015b2f17 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org>
Date: Fri, 10 Aug 2001 20:55:29 +0000
Subject: [PATCH] Remove references to nsImageManager & nsPaletteInfo.  Cleanup
 from the libimg1 removal.

---
 gfx/src/beos/nsDeviceContextBeOS.cpp |  5 -----
 gfx/src/beos/nsDeviceContextBeOS.h   |  1 -
 gfx/src/beos/nsGfxFactoryBeOS.cpp    | 26 --------------------------
 3 files changed, 32 deletions(-)

diff --git a/gfx/src/beos/nsDeviceContextBeOS.cpp b/gfx/src/beos/nsDeviceContextBeOS.cpp
index 09047905d3ba..402dc73affe6 100644
--- a/gfx/src/beos/nsDeviceContextBeOS.cpp
+++ b/gfx/src/beos/nsDeviceContextBeOS.cpp
@@ -26,7 +26,6 @@
 #include "nspr.h"
 #include "nsIPref.h"
 #include "nsIServiceManager.h"
-#include "il_util.h"
 #include "nsCRT.h"
 
 #include "nsDeviceContextBeOS.h"
@@ -53,10 +52,6 @@ nsDeviceContextBeOS::nsDeviceContextBeOS()
   mTwipsToPixels = 1.0;
   mPixelsToTwips = 1.0;
   mDepth = 0 ;
-  mPaletteInfo.isPaletteDevice = PR_FALSE;
-  mPaletteInfo.sizePalette = 0;
-  mPaletteInfo.numReserved = 0;
-  mPaletteInfo.palette = NULL;
   mNumCells = 0;
   
   mWidthFloat = 0.0f; 
diff --git a/gfx/src/beos/nsDeviceContextBeOS.h b/gfx/src/beos/nsDeviceContextBeOS.h
index 2519582df8c4..a50b1565c749 100644
--- a/gfx/src/beos/nsDeviceContextBeOS.h
+++ b/gfx/src/beos/nsDeviceContextBeOS.h
@@ -81,7 +81,6 @@ public:
 private:
   PRUint32      mDepth;
   PRBool        mWriteable;
-  nsPaletteInfo mPaletteInfo;
   PRUint32 mNumCells;
   PRInt16       mScrollbarHeight; 
   PRInt16       mScrollbarWidth; 
diff --git a/gfx/src/beos/nsGfxFactoryBeOS.cpp b/gfx/src/beos/nsGfxFactoryBeOS.cpp
index 6fa9adbab5c3..bb656f23e0bf 100644
--- a/gfx/src/beos/nsGfxFactoryBeOS.cpp
+++ b/gfx/src/beos/nsGfxFactoryBeOS.cpp
@@ -34,7 +34,6 @@
 #include "nsDeviceContextSpecFactoryB.h" 
 #include "nsScreenManagerBeOS.h" 
 #include "nsScriptableRegion.h" 
-#include "nsIImageManager.h" 
 #include "nsDeviceContextBeOS.h" 
 #include "nsImageBeOS.h" 
 #include "nsFontList.h"
@@ -92,26 +91,6 @@ static NS_IMETHODIMP nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID
   return rv; 
 } 
  
-static nsresult nsImageManagerConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) 
-{ 
-    nsresult rv; 
- 
-  if ( !aResult ) 
-  { 
-    rv = NS_ERROR_NULL_POINTER; 
-    return rv; 
-  } 
-  *aResult = nsnull; 
-  if (aOuter) 
-  { 
-    rv = NS_ERROR_NO_AGGREGATION; 
-    return rv; 
-  } 
-  // this will return an image manager with a count of 1 
-  rv = NS_NewImageManager((nsIImageManager **)aResult); 
-  return rv; 
-} 
- 
 static nsModuleComponentInfo components[] = 
 { 
   { "BeOS Font Metrics", 
@@ -158,11 +137,6 @@ static nsModuleComponentInfo components[] =
     //    "@mozilla.org/gfx/device_context_spec_factory/beos;1", 
     "@mozilla.org/gfx/devicecontextspecfactory;1", 
     nsDeviceContextSpecFactoryBeOSConstructor }, 
-  { "Image Manager", 
-    NS_IMAGEMANAGER_CID, 
-    //    "@mozilla.org/gfx/image_manager;1", 
-    "@mozilla.org/gfx/imagemanager;1", 
-    nsImageManagerConstructor }, 
   { "BeOS Font Enumerator", 
     NS_FONT_ENUMERATOR_CID, 
     //    "@mozilla.org/gfx/font_enumerator/beos;1",