X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..da8b1d4b3b535aba94d04494f5b6e2b3e47901ee:/include/wx/os2/icon.h diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index 08f54374f2..d289bc0f4c 100644 --- a/include/wx/os2/icon.h +++ b/include/wx/os2/icon.h @@ -22,7 +22,7 @@ #define wxIconRefDataBase wxGDIImageRefData #define wxIconBase wxGDIImage -class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase +class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase { public: wxIconRefData() { }; @@ -35,7 +35,7 @@ public: // Icon // --------------------------------------------------------------------------- -class WXDLLEXPORT wxIcon: public wxIconBase +class WXDLLIMPEXP_CORE wxIcon: public wxIconBase { public: wxIcon(); @@ -44,10 +44,12 @@ public: ,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(const_cast(ppData)); } +#endif wxIcon( const wxString& rName - ,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE + ,wxBitmapType lFlags = wxICON_DEFAULT_TYPE ,int nDesiredWidth = -1 ,int nDesiredHeight = -1 ); @@ -56,19 +58,14 @@ public: LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICO); } - ~wxIcon(); + virtual ~wxIcon(); bool LoadFile( const wxString& rName - ,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE + ,wxBitmapType lFlags = wxICON_DEFAULT_TYPE ,int nDesiredWidth = -1 ,int nDesiredHeight = -1 ); - 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); } @@ -82,7 +79,7 @@ protected: { return new wxIconRefData; } - void CreateIconFromXpm(const char **ppData); + void CreateIconFromXpm(const char* const* ppData); private: bool m_bIsXpm;