X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/efd1393bccefbb6cf12f82d5e10a4fb6080e6702..0ded6bb695f82a0b98d0862ec6870fc5c6cb8b97:/src/common/intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 9875b2f168..0aefb4530a 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1295,11 +1295,31 @@ wxFontEncoding wxLocale::GetSystemEncoding()
 #ifdef __WIN32__
     UINT codepage = ::GetACP();
 
-    // wxWindows only knows about CP1250-1257
+    // wxWindows only knows about CP1250-1257, 932, 936, 949, 950
     if ( codepage >= 1250 && codepage <= 1257 )
     {
         return (wxFontEncoding)(wxFONTENCODING_CP1250 + codepage - 1250);
     }
+
+    if ( codepage == 932 )
+    {
+        return wxFONTENCODING_CP932;
+    }
+
+    if ( codepage == 936 )
+    {
+        return wxFONTENCODING_CP936;
+    }
+
+    if ( codepage == 949 )
+    {
+        return wxFONTENCODING_CP949;
+    }
+
+    if ( codepage == 950 )
+    {
+        return wxFONTENCODING_CP950;
+    }
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
     wxString encname = GetSystemEncodingName();
     if ( !encname.empty() )