handle correctly never/always shown scrollbars in GetClientSize()

[wxWidgets.git] / src / common / iconbndl.cpp

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 60e92d558d7079918d48a8766465de38c8059b81..ff0f8275732de22ca31575a9156476b902631087 100644 (file)
--- 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<const wxIconBundleRefData *>(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;