unicode wxMac CW fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index da93fba63548e035da236f4047145b8197c2446a..c7e7a28ed9d4b2539d479a52b75ece9d9e622e2c 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -331,9 +331,9 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
     CFragSymbolClass    symClass;
     Str255              symName;
 #if TARGET_CARBON
     CFragSymbolClass    symClass;
     Str255              symName;
 #if TARGET_CARBON

-    c2pstrcpy( (StringPtr) symName, name );
+    c2pstrcpy( (StringPtr) symName, name.fn_str() );

 #else
 #else

-    strcpy( (char *)symName, name );
+    strcpy( (char *)symName, name.fn_str() );

     c2pstr( (char *)symName );
 #endif
     if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
     c2pstr( (char *)symName );
 #endif
     if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 991467af3c9d1b2cf6572dea75279d6b7fc2e855..80c870d8b8094adaf0b2b48edc73fa954b16cc70 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -196,7 +196,7 @@ const off_t wxInvalidOffset = (off_t)-1;
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-#if defined(__WXMAC__) && !defined(__DARWIN__)
+#if defined(__WXMAC__) && !defined(__DARWIN__) && !defined(wxUSE_UNICODE)

 
 WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
 {
 
 WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
 {

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index a0fead86baa42fadd64754886e889c9d9a5c7ee7..d8772fce24a26304167775661e0c82f7f72c6f49 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -1205,7 +1205,7 @@ WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base)
 }
 #endif // wxNEED_WX_STRING_H
 
 }
 #endif // wxNEED_WX_STRING_H
 

-#if defined(__WXMAC__) && !defined(__DARWIN__)
+#if defined(__WXMAC__) && !defined(__DARWIN__) && !defined(wxUSE_UNICODE)

 WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode)
 {
     return fopen( wxMacStringToCString(path), mode );
 WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode)
 {
     return fopen( wxMacStringToCString(path), mode );