made wxCSConv fall back to iso-8859-1 if wxFONTENCODING_SYSTEM is specified and wxLoc...

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 97b58b24978caac758169ae86121c5ffc6398d56..52f1a41c1781537972505bd394caf7c93c76516c 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -3499,14 +3499,17 @@ void wxCSConv::CreateConvIfNeeded() const
     {
         wxCSConv *self = (wxCSConv *)this; // const_cast
 
-#if wxUSE_INTL
         // if we don't have neither the name nor the encoding, use the default
         // encoding for this system
         if ( !m_name && m_encoding == wxFONTENCODING_SYSTEM )
         {
+#if wxUSE_INTL
             self->m_name = wxStrdup(wxLocale::GetSystemEncodingName());
-        }
+#else
+            // fallback to some reasonable default:
+            self->m_encoding = wxFONTENCODING_ISO8859_1;
 #endif // wxUSE_INTL
+        }
 
         self->m_convReal = DoCreate();
         self->m_deferred = false;