Purged BmpColorMode from libs-gui - libs-gui

6 files changed, 16 insertions, 27 deletions

diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 706e831869a1..41d3899366bf 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -87,14 +87,14 @@ public:
     static XubString    GetStandardText( StandardButtonType eButton );
     static XubString    GetStandardHelpText( StandardButtonType eButton );
 
-    BOOL                SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const Image         GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL                SetModeImage( const Image& rImage );
+    const Image         GetModeImage( ) const;
     BOOL                HasImage() const;
     void                SetImageAlign( ImageAlign eAlign );
     ImageAlign          GetImageAlign() const;
 
-    BOOL                SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    BitmapEx            GetModeBitmap( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL                SetModeBitmap( const BitmapEx& rBitmap );
+    BitmapEx            GetModeBitmap( ) const;
 
     void                EnableImageDisplay( BOOL bEnable );
     BOOL                IsImageDisplayEnabled();
@@ -298,7 +298,6 @@ private:
     Rectangle       maStateRect;
     Rectangle       maMouseRect;
     Image           maImage;
-    Image           maImageHC;
     BOOL            mbChecked;
     BOOL            mbSaveValue;
     BOOL            mbRadioCheck;
@@ -374,8 +373,8 @@ public:
     void            EnableRadioCheck( BOOL bRadioCheck = TRUE ) { mbRadioCheck = bRadioCheck; }
     BOOL            IsRadioCheckEnabled() const { return mbRadioCheck; }
 
-    BOOL            SetModeRadioImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const Image&    GetModeRadioImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL            SetModeRadioImage( const Image& rImage );
+    const Image&    GetModeRadioImage( ) const;
 
     void            SetState( BOOL bCheck );
     void            Check( BOOL bCheck = TRUE );
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index d14cc750d6ea..42061cfa09ea 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.hxx
@@ -118,7 +118,6 @@ class VCL_DLLPUBLIC FixedBitmap : public Control
 {
 private:
     Bitmap          maBitmap;
-    Bitmap          maBitmapHC;
 
     using Control::ImplInitSettings;
     using Window::ImplInit;
@@ -145,8 +144,8 @@ public:
     void            SetBitmap( const Bitmap& rBitmap );
     using OutputDevice::GetBitmap;
     const Bitmap&   GetBitmap() const { return maBitmap; }
-    BOOL            SetModeBitmap( const Bitmap& rBitmap, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const Bitmap&   GetModeBitmap( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL            SetModeBitmap( const Bitmap& rBitmap );
+    const Bitmap&   GetModeBitmap( ) const;
 };
 
 // --------------
@@ -157,7 +156,6 @@ class VCL_DLLPUBLIC FixedImage : public Control
 {
 private:
     Image           maImage;
-    Image           maImageHC;
     BOOL            mbInUserDraw;
 
 private:
@@ -188,8 +186,8 @@ public:
     void            SetImage( const Image& rImage );
     const Image&    GetImage() const { return maImage; }
 
-    BOOL            SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const Image&    GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL            SetModeImage( const Image& rImage );
+    const Image&    GetModeImage( ) const;
 
     Point           CalcImagePos( const Point& rPos,
                                   const Size& rObjSize, const Size& rWinSize );
diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/vcl/ilstbox.hxx
index 110e57233550..f00f20062204 100644
--- a/vcl/inc/vcl/ilstbox.hxx
+++ b/vcl/inc/vcl/ilstbox.hxx
@@ -559,7 +559,6 @@ private:
     USHORT          mnItemPos;  // wegen UserDraw muss ich wissen, welches Item ich darstelle.
     XubString       maString;
     Image           maImage;
-    Image           maImageHC;
 
     Rectangle       maFocusRect;
     Size            maUserItemSize;
@@ -595,8 +594,8 @@ public:
     const Image&    GetImage() const { return maImage; }
     void            SetImage( const Image& rImg ) { maImage = rImg; }
 
-    BOOL            SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const Image&    GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL            SetModeImage( const Image& rImage );
+    const Image&    GetModeImage( ) const;
 
 
     virtual void    MBDown();
diff --git a/vcl/inc/vcl/imgctrl.hxx b/vcl/inc/vcl/imgctrl.hxx
index 4b68d89130b4..5867a6ff16d0 100644
--- a/vcl/inc/vcl/imgctrl.hxx
+++ b/vcl/inc/vcl/imgctrl.hxx
@@ -42,7 +42,6 @@ class VCL_DLLPUBLIC ImageControl : public FixedImage
 {
 private:
     BitmapEx        maBmp;
-    BitmapEx        maBmpHC;
     ::sal_Int16     mnScaleMode;
 
 public:
@@ -61,8 +60,8 @@ public:
     void            SetBitmap( const BitmapEx& rBmp );
     using OutputDevice::GetBitmap;
     const BitmapEx& GetBitmap() const { return maBmp; }
-    BOOL            SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const BitmapEx& GetModeBitmap( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL            SetModeBitmap( const BitmapEx& rBitmap );
+    const BitmapEx& GetModeBitmap( ) const;
 };
 
 #endif  // _SV_IMGCTRL_HXX
diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index 7b02444ed4d7..42eaeef2a7e4 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -71,7 +71,6 @@ protected:
     FixedImage*         mpFixedImage;
     XubString           maMessText;
     Image               maImage;
-    Image               maImageHC;
     USHORT              mnSoundType;
     BOOL                mbHelpBtn;
     BOOL                mbSound;
@@ -101,8 +100,8 @@ public:
     void                SetImage( const Image& rImage ) { maImage = rImage; }
     const Image&        GetImage() const { return maImage; }
 
-    BOOL                SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const Image&        GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL                SetModeImage( const Image& rImage );
+    const Image&        GetModeImage( ) const;
 
     void                SetDefaultCheckBoxText();
     void                SetCheckBoxText( const XubString& rText ) { maCheckBoxText = rText;}
@@ -127,7 +126,6 @@ public:
                         InfoBox( Window* pParent, const ResId & rResId );
 
     static Image        GetStandardImage();
-    static Image        GetStandardImageHC();
 };
 
 // --------------
@@ -147,7 +145,6 @@ public:
     void                SetDefaultCheckBoxText();
 
     static Image        GetStandardImage();
-    static Image        GetStandardImageHC();
 };
 
 // ------------
@@ -165,7 +162,6 @@ public:
                         ErrorBox( Window* pParent, const ResId& rResId );
 
     static Image        GetStandardImage();
-    static Image        GetStandardImageHC();
 };
 
 // ------------
@@ -185,7 +181,6 @@ public:
     void                SetDefaultCheckBoxText();
 
     static Image        GetStandardImage();
-    static Image        GetStandardImageHC();
 };
 
 #endif  // _SV_MSGBOX_HXX
diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/vcl/svids.hrc
index 059ed1524b7c..4581167636df 100644
--- a/vcl/inc/vcl/svids.hrc
+++ b/vcl/inc/vcl/svids.hrc
@@ -43,7 +43,6 @@
 #define SV_RESID_BITMAP_RADIO               1010
 
 #define SV_RESID_BITMAP_MSGBOX              1020
-#define SV_RESID_BITMAP_MSGBOX_HC           1021
 
 #define SV_RESID_BITMAP_PIN                 1030