Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing utf32 native conversion

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-02-01 09:08:02 +00:00
parent 6cab4fcac7
commit f5f172485b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/osx/core/cfstring.h
View File

@@ -19,6 +19,12 @@
#include "wx/fontenc.h" #include "wx/fontenc.h"
#include "wx/osx/core/cfref.h" #include "wx/osx/core/cfref.h"
#if WORDS_BIGENDIAN
#define kCFStringEncodingUTF32Native kCFStringEncodingUTF32BE
#else
#define kCFStringEncodingUTF32Native kCFStringEncodingUTF32LE
#endif
class WXDLLIMPEXP_FWD_BASE wxString; class WXDLLIMPEXP_FWD_BASE wxString;
WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( wxString *data ) ; WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( wxString *data ) ;

5
src/osx/core/cfstring.cpp
View File

@@ -24,6 +24,7 @@
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
void wxMacConvertNewlines13To10( char * data ) void wxMacConvertNewlines13To10( char * data )
{ {
char * buf = data ; char * buf = data ;
@@ -611,7 +612,7 @@ wxCFStringRef::wxCFStringRef( const wxString &st , wxFontEncoding WXUNUSED_IN_UN
#if wxUSE_UNICODE_WCHAR #if wxUSE_UNICODE_WCHAR
// native = wchar_t 4 bytes for us // native = wchar_t 4 bytes for us
reset( CFStringCreateWithBytes( kCFAllocatorDefault, 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 #elif wxUSE_UNICODE_UTF8
// native = utf8 // native = utf8
reset( CFStringCreateWithBytes( kCFAllocatorDefault, reset( CFStringCreateWithBytes( kCFAllocatorDefault,
@@ -638,7 +639,7 @@ wxString wxCFStringRef::AsString(wxFontEncoding WXUNUSED_IN_UNICODE(encoding))
wxString result; wxString result;
#if wxUSE_UNICODE #if wxUSE_UNICODE
#if wxUSE_UNICODE_WCHAR #if wxUSE_UNICODE_WCHAR
cfencoding = kCFStringEncodingUTF32; cfencoding = kCFStringEncodingUTF32Native;
#elif wxUSE_UNICODE_UTF8 #elif wxUSE_UNICODE_UTF8
cfencoding = kCFStringEncodingUTF8; cfencoding = kCFStringEncodingUTF8;
#else #else