X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..7722d490f224d8f292f27fd90b1f42a00e20da8b:/include/wx/iconbndl.h?ds=sidebyside diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index 8f04625360..46bb7171f5 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -12,7 +12,7 @@ #ifndef _WX_ICONBNDL_H_ #define _WX_ICONBNDL_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "iconbndl.h" #endif @@ -20,8 +20,8 @@ // for wxSize #include "wx/gdicmn.h" -class WXDLLEXPORT wxIcon; -class WXDLLEXPORT wxString; +class WXDLLIMPEXP_CORE wxIcon; +class WXDLLIMPEXP_BASE wxString; WX_DECLARE_EXPORTED_OBJARRAY( wxIcon, wxIconArray ); @@ -60,7 +60,7 @@ public: // returns the first icon in the bundle const wxIcon& GetIcon( const wxSize& size ) const; // equivalent to GetIcon( wxSize( size, size ) ) - const wxIcon& GetIcon( wxCoord size = -1 ) const + const wxIcon& GetIcon( wxCoord size = wxDefaultCoord ) const { return GetIcon( wxSize( size, size ) ); } private: // delete all icons