X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ead190e478a3a0ac2ce7881ef53493026eb098b3..8c03c8bed161882eb2ddbfa147fb5655fe75748d:/src/common/intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index c1055e99e3..8d11807aec 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1802,7 +1802,7 @@ bool wxLocale::Init(int language, int flags)
 
 #ifndef WX_NO_LOCALE_SUPPORT
     wxChar *szLocale = retloc ? wxStrdup(retloc) : NULL;
-    bool ret = Init(name, canonical, retloc,
+    bool ret = Init(name, canonical, szLocale,
                     (flags & wxLOCALE_LOAD_DEFAULT) != 0,
                     (flags & wxLOCALE_CONV_ENCODING) != 0);
     free(szLocale);
@@ -1811,7 +1811,7 @@ bool wxLocale::Init(int language, int flags)
         m_language = lang;
 
     return ret;
-#endif
+#endif // !WX_NO_LOCALE_SUPPORT
 }
 
 
@@ -2395,7 +2395,7 @@ wxFontEncoding wxLocale::GetSystemEncoding()
         // on some modern Linux systems (RedHat 8) the default system locale
         // is UTF8 -- but it isn't supported by wxGTK in ANSI build at all so
         // don't even try to use it in this case
-#if !wxUSE_UNICODE && defined(__WXGTK__)
+#if !wxUSE_UNICODE && (defined(__WXGTK__) || defined(__WXMOTIF__))
         if ( enc == wxFONTENCODING_UTF8 )
         {
             // the most similar supported encoding...