a draft of wxSSBase class - it is yet unused and hopefully doesn't break anything...

[wxWidgets.git] / include / wx / fontenc.h

diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h
index 24bf9baeba354a333ed3dcbb2c4ce8d5653082ca..d4a9ee6a1e1e6bcacca6b45a84fbf0baaa4a481c 100644 (file)
--- 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
@@ -105,6 +109,8 @@ struct WXDLLEXPORT wxNativeEncodingInfo
 #elif defined(_WX_X_FONTLIKE)
     wxString xregistry,
              xencoding;
+#elif defined(__WXMGL__)
+    int      mglEncoding;
 #else
     #error "Unsupported toolkit"
 #endif