applied Unicode fixes for mingw32 (patch 429654)

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 42e01b62742e8c4e8b05c3c2c0e629d8cb7e736e..3b0a992d8906c017fe464b319cc9df0d31695b9f 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -34,6 +34,9 @@
 #include <locale.h>
 #include <ctype.h>
 #include <stdlib.h>
+#ifdef HAVE_LANGINFO_H
+  #include <langinfo.h>
+#endif
 
 // wxWindows
 #ifndef WX_PRECOMP
@@ -955,7 +958,10 @@ wxString wxLocale::GetSystemEncodingName()
 #if defined(HAVE_LANGINFO_H) && defined(CODESET)
     // GNU libc provides current character set this way (this conforms
     // to Unix98)
+    char *oldLocale = strdup(setlocale(LC_CTYPE, NULL));
+    setlocale(LC_CTYPE, "");
     char *alang = nl_langinfo(CODESET);
+    setlocale(LC_CTYPE, oldLocale);
     if (alang)
     {
         encname = wxConvLibc.cMB2WX(alang);
@@ -1006,8 +1012,8 @@ wxFontEncoding wxLocale::GetSystemEncoding()
     wxString encname = GetSystemEncodingName();
     if ( !encname.empty() )
     {
-        return wxFontMapper::CharsetToEncoding(encname,
-                                               FALSE /* not interactive */);
+        return wxTheFontMapper->
+            CharsetToEncoding(encname, FALSE /* not interactive */);
     }
 #endif // Win32/Unix