From: David Webster <Dave.Webster@bhmi.com>
Date: Mon, 6 May 2002 21:47:16 +0000 (+0000)
Subject: OS/2 Image processing updates
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/79c093419e9f7e15ac1293ef0c35eaf35ee2345a?ds=sidebyside

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 1260879e6b..72f44788e6 100644
--- 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 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;
 
@@ -237,6 +239,8 @@ protected:
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
 
+    bool                            m_bIsMono;
+
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 }; // end of CLASS wxBitmap
 
diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index 22160f236a..035506f8c7 100644
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -22,8 +22,8 @@
     #define wxICON_IS_BITMAP 1
 #endif
 
+#include "wx/bitmap.h"
 #if wxICON_IS_BITMAP
-    #include "wx/bitmap.h"
 
     #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 bool    IsXpm(void) const { return m_bIsXpm; };
+    inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; }
 
     void CopyFromBitmap(const wxBitmap& rBmp);
 protected:
@@ -95,6 +97,9 @@ protected:
     void    CreateIconFromXpm(const char **ppData);
 
 private:
+    bool                            m_bIsXpm;
+    wxBitmap                        m_vXpmSrc;
+
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };