Add support for specifying child process cwd and env to wxExecute().

[wxWidgets.git] / src / cocoa / icon.mm

diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm
index cfc23d3cd7379737c3d647786d3f4b88f72d5e55..77a622e4f7590cf7349b71298c99e331d5d2db1b 100644 (file)
--- a/src/cocoa/icon.mm
+++ b/src/cocoa/icon.mm
@@ -6,7 +6,7 @@
 // Created:     2003/08/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -107,10 +107,10 @@ wxGDIRefData *wxIcon::CreateGDIRefData() const
 
 wxGDIRefData *wxIcon::CloneGDIRefData(const wxGDIRefData *data) const
 {
-    return new wxIconRefData(*wx_static_cast(const wxIconRefData *, data));
+    return new wxIconRefData(*static_cast<const wxIconRefData *>(data));
 }
 
-bool wxIcon::CreateFromXpm(const char **xpm)
+bool wxIcon::CreateFromXpm(const char* const* xpm)
 {
     wxBitmap bitmap(xpm);
     CopyFromBitmap(bitmap);