From f5f172485bf36ac1025395efc8073c1592c30c08 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 1 Feb 2009 09:08:02 +0000 Subject: [PATCH] fixing utf32 native conversion git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/core/cfstring.h | 6 ++++++ src/osx/core/cfstring.cpp | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h index 2cd04a9d76..1368aeb0b6 100644 --- a/include/wx/osx/core/cfstring.h +++ b/include/wx/osx/core/cfstring.h @@ -19,6 +19,12 @@ #include "wx/fontenc.h" #include "wx/osx/core/cfref.h" +#if WORDS_BIGENDIAN + #define kCFStringEncodingUTF32Native kCFStringEncodingUTF32BE +#else + #define kCFStringEncodingUTF32Native kCFStringEncodingUTF32LE +#endif + class WXDLLIMPEXP_FWD_BASE wxString; WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( wxString *data ) ; diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp index 2b0bfbe82a..a65c5cb361 100644 --- a/src/osx/core/cfstring.cpp +++ b/src/osx/core/cfstring.cpp @@ -24,6 +24,7 @@ #include + void wxMacConvertNewlines13To10( char * data ) { char * buf = data ; @@ -611,7 +612,7 @@ wxCFStringRef::wxCFStringRef( const wxString &st , wxFontEncoding WXUNUSED_IN_UN #if wxUSE_UNICODE_WCHAR // native = wchar_t 4 bytes for us reset( CFStringCreateWithBytes( kCFAllocatorDefault, - (const UInt8*)str.wc_str() , str.length()*4, kCFStringEncodingUTF32, false /* no BOM */ ) ); + (const UInt8*)str.wc_str() , str.length()*4, kCFStringEncodingUTF32Native, false /* no BOM */ ) ); #elif wxUSE_UNICODE_UTF8 // native = utf8 reset( CFStringCreateWithBytes( kCFAllocatorDefault, @@ -638,7 +639,7 @@ wxString wxCFStringRef::AsString(wxFontEncoding WXUNUSED_IN_UNICODE(encoding)) wxString result; #if wxUSE_UNICODE #if wxUSE_UNICODE_WCHAR - cfencoding = kCFStringEncodingUTF32; + cfencoding = kCFStringEncodingUTF32Native; #elif wxUSE_UNICODE_UTF8 cfencoding = kCFStringEncodingUTF8; #else -- 2.47.2