Also redirect wxEVT_KEY_UP and wxEVT_CHAR from the embedded wxTextCtrl

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

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index a67762962e3a2908475b28de41476562f3d7ea9b..ff0f8275732de22ca31575a9156476b902631087 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -73,7 +73,7 @@ wxGDIRefData *wxIconBundle::CreateGDIRefData() const
 
 wxGDIRefData *wxIconBundle::CloneGDIRefData(const wxGDIRefData *data) 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()
 }
 
 void wxIconBundle::DeleteIcons()


@@ -161,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;
     return wxIcon(iconBest.GetHICON(), size);
 #else
     return iconBest;