X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e7ed2b008e4c179b4b46449877f2e492cc0ab9f..7a766dcda16f3eaaa9f26d5e147e958b24d175b0:/src/common/intl.cpp diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 168c333343..8f36b359d7 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -444,7 +444,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons if ( convertEncoding ) { wxFontEncoding targetEnc = wxFONTENCODING_SYSTEM; - wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(charset, FALSE); + wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(charset, FALSE); if ( enc == wxFONTENCODING_SYSTEM ) { convertEncoding = FALSE; // unknown encoding @@ -1340,7 +1340,7 @@ wxFontEncoding wxLocale::GetSystemEncoding() wxString encname = GetSystemEncodingName(); if ( !encname.empty() ) { - wxFontEncoding enc = wxTheFontMapper-> + wxFontEncoding enc = wxFontMapper::Get()-> CharsetToEncoding(encname, FALSE /* not interactive */); // this should probably be considered as a bug in CharsetToEncoding():