X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/caa6e137baa6a5a9f79c7eb3a695c1cf3addfd15..1b0b798d77b7b93b81d62162b290441bc9175e3e:/src/common/fontmap.cpp diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp index 170d32aedd..6ab97b4c2f 100644 --- a/src/common/fontmap.cpp +++ b/src/common/fontmap.cpp @@ -489,10 +489,7 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset, cs.MakeUpper(); - // nl_langinfo() under Solaris returns 646 by default which stands for - // ISO-646, i.e. 7 bit ASCII and we should recognize it to avoid - // warnings about unrecognized encoding on each program startup - if ( cs.empty() || cs == _T("US-ASCII") || cs == _T("646") ) + if ( cs.empty() || cs == _T("US-ASCII") ) { encoding = wxFONTENCODING_DEFAULT; }