X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..028285e4af7232447cbb88caec61a3129cde02a7:/include/wx/iconbndl.h diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index f73684f75d..3749467240 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -12,16 +12,12 @@ #ifndef _WX_ICONBNDL_H_ #define _WX_ICONBNDL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "iconbndl.h" -#endif - #include "wx/dynarray.h" // 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 +56,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