X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..9c34a216817028bc533e07873d047208a96b05a2:/include/wx/os2/icon.h diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index 9c254a8353..83cef7afa1 100644 --- a/include/wx/os2/icon.h +++ b/include/wx/os2/icon.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: icon.h +// Name: wx/os2/icon.h // Purpose: wxIcon class // Author: David Webster // Modified by: @@ -22,10 +22,10 @@ #define wxIconRefDataBase wxGDIImageRefData #define wxIconBase wxGDIImage -class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase +class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase { public: - wxIconRefData() { }; + wxIconRefData() { } virtual ~wxIconRefData() { Free(); } virtual void Free(); @@ -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 ); @@ -59,21 +61,16 @@ public: 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); } inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); } - inline bool IsXpm(void) const { return m_bIsXpm; }; + inline bool IsXpm(void) const { return m_bIsXpm; } inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; } void CopyFromBitmap(const wxBitmap& rBmp); @@ -82,7 +79,7 @@ protected: { return new wxIconRefData; } - void CreateIconFromXpm(const char **ppData); + void CreateIconFromXpm(const char* const* ppData); private: bool m_bIsXpm;