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

minor cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-12-05 19:57:58 +00:00
parent 00491f99f4
commit 65391c8ffc
25 changed files with 67 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,8 +186,8 @@ wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
#if 0
case wxFONTENCODING_UTF7 :
enc = CreateTextEncoding(kCFStringEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
#endif
break ;
#endif
case wxFONTENCODING_UTF8 :
enc = kCFStringEncodingUTF8;
break ;
@@ -638,9 +638,8 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UN
return wxEmptyString ;
Size cflen = CFStringGetLength( ref ) ;
char* buf = NULL ;
CFStringEncoding cfencoding = 0;
CFStringEncoding cfencoding;
wxString result;
#if wxUSE_UNICODE
#if wxUSE_UNICODE_WCHAR
@@ -657,7 +656,7 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UN
CFIndex cStrLen ;
CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding ,
'?' , false , NULL , 0 , &cStrLen ) ;
buf = new char[ cStrLen ] ;
char* buf = new char[cStrLen];
CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding,
'?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;