X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bb84929ec5b27eae5433982703dd6d0df89bfc2d..d1f2ac459a122eec2fa2317765b5c30909fca750:/include/wx/fontenc.h?ds=inline

diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h
index 24bf9baeba..73c832a771 100644
--- a/include/wx/fontenc.h
+++ b/include/wx/fontenc.h
@@ -54,6 +54,10 @@ enum wxFontEncoding
     wxFONTENCODING_CP866,           // and another one
         // and for Windows
     wxFONTENCODING_CP874,           // WinThai
+    wxFONTENCODING_CP932,           // Japanese (shift-JIS)
+    wxFONTENCODING_CP936,           // Chinese simplified (GB)
+    wxFONTENCODING_CP949,           // Korean (Hangul charset)
+    wxFONTENCODING_CP950,           // Chinese (traditional - Big5)
     wxFONTENCODING_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic
     wxFONTENCODING_CP1252,          // WinLatin1
@@ -99,12 +103,18 @@ struct WXDLLEXPORT wxNativeEncodingInfo
     wxFontEncoding encoding;    // so that we know what this struct represents
 
 #if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__)
-    wxNativeEncodingInfo() { charset = 0; /* ANSI_CHARSET */ }
+    wxNativeEncodingInfo()
+        : facename()
+        , encoding(wxFONTENCODING_SYSTEM)
+        , charset(0) /* ANSI_CHARSET */
+    { }
 
     int      charset;
 #elif defined(_WX_X_FONTLIKE)
     wxString xregistry,
              xencoding;
+#elif defined(__WXMGL__)
+    int      mglEncoding;
 #else
     #error "Unsupported toolkit"
 #endif