From 8b34b163019430b9e6f715020695f85ede79602f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 19 Mar 2007 01:37:22 +0000 Subject: [PATCH] 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 --- src/common/intl.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 40c997970f..bac6f22053 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -2466,7 +2466,13 @@ wxFontEncoding wxLocale::GetSystemEncoding() // (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 // 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; }