X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3aefa658c81b577181fc7440f1b25c9aec2a561a..3a05d58d94a25dee362c5e1025c612ec6e84678c:/src/common/intl.cpp 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() )