don't use toupper() with non-ASCII key codes

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index c1055e99e338885c529db28fdb6d370127b499e9..8d11807aecac94933925fca03ab8c5c6744239d5 100644 (file)
--- 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;
 
 #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);
                     (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;
         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
         // 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...
         if ( enc == wxFONTENCODING_UTF8 )
         {
             // the most similar supported encoding...