X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e70f525fa60baefd9878758374b2019b804df82..c058cafa56179e79df02ad370bdeafd725ff2478:/include/wx/os2/icon.h

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index ca57b257cc..b86db3388f 100644
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -16,23 +16,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
-// compatible (even if incorrect) behaviour by default: derive wxIcon from
-// wxBitmap
-#ifndef wxICON_IS_BITMAP
-    #define wxICON_IS_BITMAP 1
-#endif
-
 #include "wx/bitmap.h"
-#if wxICON_IS_BITMAP
+#include "wx/os2/gdiimage.h"
 
-    #define wxIconRefDataBase   wxBitmapRefData
-    #define wxIconBase          wxBitmap
-#else
-    #include "wx/os2/gdiimage.h"
-
-    #define wxIconRefDataBase   wxGDIImageRefData
-    #define wxIconBase          wxGDIImage
-#endif
+#define wxIconRefDataBase   wxGDIImageRefData
+#define wxIconBase          wxGDIImage
 
 class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
 {
@@ -52,15 +40,14 @@ class WXDLLEXPORT wxIcon: public wxIconBase
 public:
     wxIcon();
 
-    // Copy constructors
-    inline wxIcon(const wxIcon& icon) { Ref(icon); }
-
     wxIcon( const char bits[]
            ,int        nWidth
            ,int        nHeight
           );
-    inline wxIcon(const char** ppData) { CreateIconFromXpm(ppData); }
-    inline wxIcon(char** ppData) { CreateIconFromXpm((const char**)ppData); }
+    wxIcon(const char* const* ppData) { CreateIconFromXpm(ppData); }
+#ifdef wxNEEDS_CHARPP
+    wxIcon(char** ppData) { CreateIconFromXpm(wx_const_cast(const char* const*, ppData)); }
+#endif
     wxIcon( const wxString& rName
            ,long            lFlags = wxBITMAP_TYPE_ICO_RESOURCE
            ,int             nDesiredWidth = -1
@@ -71,7 +58,7 @@ public:
         LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICO);
     }
 
-    ~wxIcon();
+    virtual ~wxIcon();
 
     bool LoadFile( const wxString& rName
                   ,long            lFlags = wxBITMAP_TYPE_ICO_RESOURCE
@@ -79,13 +66,6 @@ public:
                   ,int             nDesiredHeight = -1
                  );
 
-    inline wxIcon& operator = (const wxIcon& rIcon)
-       { if (*this != rIcon) Ref(rIcon); return *this; }
-    inline bool operator == (const wxIcon& rIcon) const
-       { return m_refData == rIcon.m_refData; }
-    inline bool operator != (const wxIcon& rIcon) const
-       { return m_refData != rIcon.m_refData; }
-
     wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
 
     inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
@@ -99,7 +79,7 @@ protected:
     {
         return new wxIconRefData;
     }
-    void    CreateIconFromXpm(const char **ppData);
+    void    CreateIconFromXpm(const char* const* ppData);
 
 private:
     bool                            m_bIsXpm;