added clientcontext variable to Open Transport initialisation

[wxWidgets.git] / src / mac / carbon / icon.cpp

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 4ec1f1b5e95bc4dc2386b4965e9b28ac87ec1c84..7f666da534c9e6552d39e87f86e912075f8d24c4 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -102,8 +102,13 @@ bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
        Str255 theName ;
        short theId ;
        OSType theType ;
-       strcpy( (char*) theName , name ) ;
-       c2pstr( (char*) theName ) ;
+
+#if TARGET_CARBON
+       c2pstrcpy( (StringPtr) theName , name ) ;
+#else
+       strcpy( (char *) theName , name ) ;
+       c2pstr( (char *) theName ) ;
+#endif
        
        Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
        if ( resHandle != 0L )
@@ -125,4 +130,4 @@ bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
                }
        }
        return FALSE ;
-}
\ No newline at end of file
+}