non-unicode fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e71800ba3a
commit
ac86379e2a
@ -1152,10 +1152,10 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
|
|||||||
#else
|
#else
|
||||||
CFIndex cStrLen ;
|
CFIndex cStrLen ;
|
||||||
CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,
|
CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,
|
||||||
'?' , false , NULL , 0 , cStrLen ) ;
|
'?' , false , NULL , 0 , &cStrLen ) ;
|
||||||
buf = new wxChar[ cStrLen + 1 ] ;
|
buf = new wxChar[ cStrLen + 1 ] ;
|
||||||
CFStringGetBytes( m_cfs , CFRangeMake(0, len) , wxMacGetSystemEncFromFontEnc( encoding ) ,
|
CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,
|
||||||
'?' , false , (void*) buf , cStrLen , &StrLen) ;
|
'?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;
|
||||||
noChars = cStrLen ;
|
noChars = cStrLen ;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1152,10 +1152,10 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
|
|||||||
#else
|
#else
|
||||||
CFIndex cStrLen ;
|
CFIndex cStrLen ;
|
||||||
CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,
|
CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,
|
||||||
'?' , false , NULL , 0 , cStrLen ) ;
|
'?' , false , NULL , 0 , &cStrLen ) ;
|
||||||
buf = new wxChar[ cStrLen + 1 ] ;
|
buf = new wxChar[ cStrLen + 1 ] ;
|
||||||
CFStringGetBytes( m_cfs , CFRangeMake(0, len) , wxMacGetSystemEncFromFontEnc( encoding ) ,
|
CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,
|
||||||
'?' , false , (void*) buf , cStrLen , &StrLen) ;
|
'?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;
|
||||||
noChars = cStrLen ;
|
noChars = cStrLen ;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user