compilation fix after recent changes

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

diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp
index a65c5cb361ad16c385ff0f9f34f01783bb353225..dff2ab6d9ed8fe91fb7c83b4fdc55a5dfecb5cb5 100644 (file)
--- a/src/osx/core/cfstring.cpp
+++ b/src/osx/core/cfstring.cpp
@@ -611,15 +611,18 @@ wxCFStringRef::wxCFStringRef( const wxString &st , wxFontEncoding WXUNUSED_IN_UN
 #if wxUSE_UNICODE
 #if wxUSE_UNICODE_WCHAR
         // native = wchar_t 4 bytes for us
 #if wxUSE_UNICODE
 #if wxUSE_UNICODE_WCHAR
         // native = wchar_t 4 bytes for us

-        reset( CFStringCreateWithBytes( kCFAllocatorDefault,
-            (const UInt8*)str.wc_str() , str.length()*4, kCFStringEncodingUTF32Native, false /* no BOM */ ) );
+        const wchar_t * const data = str.wc_str();
+        const size_t size = str.length()*sizeof(wchar_t);

 #elif wxUSE_UNICODE_UTF8
         // native = utf8
 #elif wxUSE_UNICODE_UTF8
         // native = utf8

-        reset( CFStringCreateWithBytes( kCFAllocatorDefault,
-            (const UInt8*) str.utf8_str() , str.utf8_length() , kCFStringEncodingUTF8, false /* no BOM */ ) );
+        const char * const data = str.utf8_str();
+        const size_t size = str.utf8_length();

 #else
 #else

-    #error "unsupported unicode representation"
+    #error "unsupported Unicode representation"

 #endif
 #endif

+
+        reset( CFStringCreateWithBytes( kCFAllocatorDefault,
+            (const UInt8*)data, size, kCFStringEncodingUTF8, false /* no BOM */ ) );

 #else // not wxUSE_UNICODE
         reset( CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
             wxMacGetSystemEncFromFontEnc( encoding ) ) );
 #else // not wxUSE_UNICODE
         reset( CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
             wxMacGetSystemEncFromFontEnc( encoding ) ) );