X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..9c805dec6caf3c98a3797898cffe795b5b56e606:/include/wx/os2/icon.h?ds=sidebyside diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index b4ecbd07a1..4f2c392e99 100644 --- a/include/wx/os2/icon.h +++ b/include/wx/os2/icon.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: icon.h +// Name: wx/os2/icon.h // Purpose: wxIcon class // Author: David Webster // Modified by: // Created: 10/09/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_ICON_H_ @@ -16,25 +16,13 @@ // 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 +class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase { public: wxIconRefData() { }; @@ -47,22 +35,21 @@ public: // Icon // --------------------------------------------------------------------------- -class WXDLLEXPORT wxIcon: public wxIconBase +class WXDLLIMPEXP_CORE 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(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 ); @@ -71,21 +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 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;