return wxFONTENCODING_ISO8859_1, not wxFONTENCODING_SYSTEM, from wxLocale::GetSystemE...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 40c997970f2e262f4b11780085a8e86e7f7ddd67..bac6f220533070bf5c94ec0d6b5fafa893ba934e 100644 (file)
--- 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;
         }