From: Stefan Csomor Date: Sat, 7 Feb 2004 08:02:40 +0000 (+0000) Subject: adding textencoding for classic X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9e687455629dc0b36f4392286ffad8d72b32e2b7 adding textencoding for classic git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 820a7d6bad..43e74bf081 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -2245,7 +2245,13 @@ wxFontEncoding wxLocale::GetSystemEncoding() return wxFONTENCODING_CP950; } #elif defined(__WXMAC__) - return wxMacGetFontEncFromSystemEnc( CFStringGetSystemEncoding() ) ; + TextEncoding encoding = 0 ; +#if TARGET_CARBON + encoding = CFStringGetSystemEncoding() ; +#else + UpgradeScriptInfoToTextEncoding ( smSystemScript , kTextLanguageDontCare , kTextRegionDontCare , NULL , &encoding ) ; +#endif + return wxMacGetFontEncFromSystemEnc( encoding ) ; #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP wxString encname = GetSystemEncodingName(); if ( !encname.empty() )