return wxFONTENCODING_ISO8859_1, not wxFONTENCODING_SYSTEM, from wxLocale::GetSystemEncoding() when locale is C under Unix (why didn't we do this before?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2466,7 +2466,13 @@ wxFontEncoding wxLocale::GetSystemEncoding()
|
|||||||
// (a.k.a. US-ASCII) which is arguably a bug but keep it like this for
|
// (a.k.a. US-ASCII) which is arguably a bug but keep it like this for
|
||||||
// backwards compatibility and just take care to not return
|
// backwards compatibility and just take care to not return
|
||||||
// wxFONTENCODING_DEFAULT from here as this surely doesn't make sense
|
// wxFONTENCODING_DEFAULT from here as this surely doesn't make sense
|
||||||
if ( enc != wxFONTENCODING_MAX && enc != wxFONTENCODING_DEFAULT )
|
if ( enc == wxFONTENCODING_DEFAULT )
|
||||||
|
{
|
||||||
|
// we don't have wxFONTENCODING_ASCII, so use the closest one
|
||||||
|
return wxFONTENCODING_ISO8859_1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( enc != wxFONTENCODING_MAX )
|
||||||
{
|
{
|
||||||
return enc;
|
return enc;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user