X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24af522c4378db219f13146f8bfe22fe790aad0f..8d3166e8acbbc8d351bdc94e507ef5712ffbfd37:/src/common/iconbndl.cpp diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index 60e92d558d..ff0f827573 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -25,7 +25,6 @@ #include "wx/image.h" #endif -WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray); #include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxIconArray) @@ -74,7 +73,7 @@ wxGDIRefData *wxIconBundle::CreateGDIRefData() const wxGDIRefData *wxIconBundle::CloneGDIRefData(const wxGDIRefData *data) const { - return new wxIconBundleRefData(*wx_static_cast(const wxIconBundleRefData *, data)); + return new wxIconBundleRefData(*static_cast(data)); } void wxIconBundle::DeleteIcons() @@ -162,7 +161,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const } } -#if defined( __WXMAC__ ) && wxOSX_USE_CARRBON +#if defined( __WXMAC__ ) && wxOSX_USE_CARBON return wxIcon(iconBest.GetHICON(), size); #else return iconBest;