X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b9e3455225b670d30ee0fb67f8821ada9640f6d..6ba7c06eeeda47b88783025428ca0f290e3bf236:/include/wx/os2/icon.h

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index c6b46a110f..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
@@ -38,12 +38,10 @@ class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
 {
 public:
     wxIconRefData() { };
-    virtual ~wxIconRefData() { Free(); m_hIcon = NULL; }
+    virtual ~wxIconRefData() { Free(); }
 
     virtual void Free();
-public:
-    WXHICON m_hIcon;
-};
+}; // end of
 
 // ---------------------------------------------------------------------------
 // Icon
@@ -61,6 +59,8 @@ public:
            ,int        nWidth
            ,int        nHeight
           );
+    inline wxIcon(const char** ppData) { CreateIconFromXpm(ppData); }
+    inline wxIcon(char** ppData) { CreateIconFromXpm((const char**)ppData); }
     wxIcon( const wxString& rName
            ,long            lFlags = wxBITMAP_TYPE_ICO_RESOURCE
            ,int             nDesiredWidth = -1
@@ -75,7 +75,7 @@ public:
                  );
 
     inline wxIcon& operator = (const wxIcon& rIcon)
-       { if (*this == rIcon) Ref(rIcon); return *this; }
+       { if (*this != rIcon) Ref(rIcon); return *this; }
     inline bool operator == (const wxIcon& rIcon)
        { return m_refData == rIcon.m_refData; }
     inline bool operator != (const wxIcon& rIcon)
@@ -85,14 +85,21 @@ 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:
     virtual wxGDIImageRefData* CreateData() const
     {
         return new wxIconRefData;
     }
+    void    CreateIconFromXpm(const char **ppData);
 
 private:
+    bool                            m_bIsXpm;
+    wxBitmap                        m_vXpmSrc;
+
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };