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

compilation fix after recent changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-03-30 21:08:58 +00:00
parent 8d2d37d268
commit d19fe998c8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
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
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
#error "unsupported unicode representation"
#error "unsupported Unicode representation"
#endif
reset( CFStringCreateWithBytes( kCFAllocatorDefault,
(const UInt8*)data, size, kCFStringEncodingUTF8, false /* no BOM */ ) );
#else // not wxUSE_UNICODE
reset( CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
wxMacGetSystemEncFromFontEnc( encoding ) ) );