OS/2 Image processing updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index 1260879e6ba10e17ea0cad109aa698c48c0a2f79..72f44788e6e6077d255dd3c3f650578d88888dd2 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -216,6 +216,8 @@ public:
     inline wxDC* GetSelectedInto() const
       { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); }
 
     inline wxDC* GetSelectedInto() const
       { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); }
 

+    inline bool IsMono(void) const { return m_bIsMono; }
+

     // An OS/2 version that probably doesn't do anything like the msw version
     wxBitmap GetBitmapForDC(wxDC& rDc) const;
 
     // An OS/2 version that probably doesn't do anything like the msw version
     wxBitmap GetBitmapForDC(wxDC& rDc) const;
 


@@ -237,6 +239,8 @@ protected:
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
 
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
 

+    bool                            m_bIsMono;
+

     DECLARE_DYNAMIC_CLASS(wxBitmap)
 }; // end of CLASS wxBitmap
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 }; // end of CLASS wxBitmap
 

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index 22160f236adfb0dd5f5932e2925f1309153baf51..035506f8c7b77b5acf3a0c535dcd317d3da624d4 100644 (file)
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -22,8 +22,8 @@
     #define wxICON_IS_BITMAP 1
 #endif
 
     #define wxICON_IS_BITMAP 1
 #endif
 

+#include "wx/bitmap.h"

 #if wxICON_IS_BITMAP
 #if wxICON_IS_BITMAP

-    #include "wx/bitmap.h"

 
     #define wxIconRefDataBase   wxBitmapRefData
     #define wxIconBase          wxBitmap
 
     #define wxIconRefDataBase   wxBitmapRefData
     #define wxIconBase          wxBitmap


@@ -85,6 +85,8 @@ public:
 
     inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
     inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
 
     inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
     inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); }

+    inline bool    IsXpm(void) const { return m_bIsXpm; };
+    inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; }

 
     void CopyFromBitmap(const wxBitmap& rBmp);
 protected:
 
     void CopyFromBitmap(const wxBitmap& rBmp);
 protected:


@@ -95,6 +97,9 @@ protected:
     void    CreateIconFromXpm(const char **ppData);
 
 private:
     void    CreateIconFromXpm(const char **ppData);
 
 private:

+    bool                            m_bIsXpm;
+    wxBitmap                        m_vXpmSrc;
+

     DECLARE_DYNAMIC_CLASS(wxIcon)
 };
 
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };