Various changes needed to get up to date with current CVS

[wxWidgets.git] / wxPython / src / fonts.i

diff --git a/wxPython/src/fonts.i b/wxPython/src/fonts.i
index fc3cf551f3e582f1fc76863216fb0b4e6ff81cc2..2c81f771d1d47cdb66487825fb5d26766c19ecc9 100644 (file)
--- a/wxPython/src/fonts.i
+++ b/wxPython/src/fonts.i
@@ -131,26 +131,25 @@ enum wxFontEncoding
 
     wxFONTENCODING_UTF7,            // UTF-7 Unicode encoding
     wxFONTENCODING_UTF8,            // UTF-8 Unicode encoding
-    wxFONTENCODING_UTF16,           // UTF-16 Unicode encoding
+    wxFONTENCODING_EUC_JP,          // Extended Unix Codepage for Japanese
     wxFONTENCODING_UTF16BE,         // UTF-16 Big Endian Unicode encoding
     wxFONTENCODING_UTF16LE,         // UTF-16 Little Endian Unicode encoding
-    wxFONTENCODING_UTF32,           // UTF-32 Unicode encoding
     wxFONTENCODING_UTF32BE,         // UTF-32 Big Endian Unicode encoding
     wxFONTENCODING_UTF32LE,         // UTF-32 Little Endian Unicode encoding
 
+    wxFONTENCODING_MAX,
+
     // Far Eastern encodings
-        // Chinese
-    wxFONTENCODING_GB2312 = wxFONTENCODING_CP936, // Simplified Chinese
-    wxFONTENCODING_BIG5 = wxFONTENCODING_CP950,   // Traditional Chinese
+    wxFONTENCODING_GB2312,          // Simplified Chinese
+    wxFONTENCODING_BIG5,            // Traditional Chinese
 
-        // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html)
-    wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932,  // Shift JIS
-    wxFONTENCODING_EUC_JP = wxFONTENCODING_UTF8 + 1,  // Extended Unix Codepage
-                                                      // for Japanese
+    wxFONTENCODING_SHIFT_JIS,       // Shift JIS
 
-    wxFONTENCODING_UNICODE,         // Unicode (for wxEncodingConverter only)
 
-    wxFONTENCODING_MAX
+    // Aliases
+    wxFONTENCODING_UTF16,
+    wxFONTENCODING_UTF32,
+    wxFONTENCODING_UNICODE,
 };