X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dddb8a2dde675b85bbe28399b921648a22e6be1..0ecd03525b34edba886ca83ff724265cd912dbbd:/include/wx/msw/icon.h?ds=sidebyside diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index f7e3f41ad1..21f8abd6b4 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -12,10 +12,6 @@ #ifndef _WX_ICON_H_ #define _WX_ICON_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "icon.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -28,7 +24,7 @@ // notice that although wxIconRefData inherits from wxBitmapRefData, it is not // a valid wxBitmapRefData -class WXDLLEXPORT wxIconRefData : public wxGDIImageRefData +class WXDLLIMPEXP_CORE wxIconRefData : public wxGDIImageRefData { public: wxIconRefData() { } @@ -41,27 +37,24 @@ public: // Icon // --------------------------------------------------------------------------- -class WXDLLEXPORT wxIcon : public wxGDIImage +class WXDLLIMPEXP_CORE wxIcon : public wxGDIImage { public: // ctors // default wxIcon() { } - // copy - wxIcon(const wxIcon& icon) : wxGDIImage(icon) { Ref(icon); } - // from raw data wxIcon(const char bits[], int width, int height); // from XPM data - wxIcon(const char **data) { CreateIconFromXpm(data); } - - wxIcon(char **data) { CreateIconFromXpm((const char **)data); } - + wxIcon(const char* const* data) { CreateIconFromXpm(data); } +#ifdef wxNEEDS_CHARPP + wxIcon(char **data) { CreateIconFromXpm(const_cast(data)); } +#endif // from resource/file wxIcon(const wxString& name, - long type = wxBITMAP_TYPE_ICO_RESOURCE, + wxBitmapType type = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1); wxIcon(const wxIconLocation& loc); @@ -69,16 +62,9 @@ public: virtual ~wxIcon(); virtual bool LoadFile(const wxString& name, - long type = wxBITMAP_TYPE_ICO_RESOURCE, + wxBitmapType type = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1); - wxIcon& operator = (const wxIcon& icon) - { if ( *this != icon ) Ref(icon); return *this; } - bool operator == (const wxIcon& icon) const - { return m_refData == icon.m_refData; } - bool operator != (const wxIcon& icon) const - { return m_refData != icon.m_refData; } - // implementation only from now on wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; } @@ -99,7 +85,7 @@ protected: virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; // create from XPM data - void CreateIconFromXpm(const char **data); + void CreateIconFromXpm(const char* const* data); private: DECLARE_DYNAMIC_CLASS(wxIcon)