X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..916989dfb95b7e4a72234d946b8e078235046e05:/include/wx/mac/carbon/icon.h?ds=sidebyside diff --git a/include/wx/mac/carbon/icon.h b/include/wx/mac/carbon/icon.h index ead16ba56b..754a5344c1 100644 --- a/include/wx/mac/carbon/icon.h +++ b/include/wx/mac/carbon/icon.h @@ -15,13 +15,12 @@ #include "wx/bitmap.h" // Icon -class WXDLLEXPORT wxIcon : public wxGDIObject +class WXDLLIMPEXP_CORE wxIcon : public wxGDIObject { public: wxIcon(); - wxIcon(const char **data); - wxIcon(char **data); + wxIcon(const char* const* data); wxIcon(const char bits[], int width , int height ); wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE, int desiredWidth = -1, int desiredHeight = -1); @@ -64,7 +63,7 @@ private: }; /* -class WXDLLEXPORT wxICONFileHandler: public wxBitmapHandler +class WXDLLIMPEXP_CORE wxICONFileHandler: public wxBitmapHandler { DECLARE_DYNAMIC_CLASS(wxICONFileHandler) public: @@ -80,7 +79,7 @@ public: }; */ -class WXDLLEXPORT wxICONResourceHandler: public wxBitmapHandler +class WXDLLIMPEXP_CORE wxICONResourceHandler: public wxBitmapHandler { DECLARE_DYNAMIC_CLASS(wxICONResourceHandler) public: