X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..c1b293bb8df110ae772cd99fde09e5724730653a:/include/wx/fontenc.h

diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h
index 643dd54d37..0a649c423b 100644
--- a/include/wx/fontenc.h
+++ b/include/wx/fontenc.h
@@ -6,7 +6,7 @@
 // Created:     29.03.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTENC_H_
@@ -55,7 +55,7 @@ enum wxFontEncoding
     wxFONTENCODING_CP874,           // WinThai
     wxFONTENCODING_CP932,           // Japanese (shift-JIS)
     wxFONTENCODING_CP936,           // Chinese simplified (GB)
-    wxFONTENCODING_CP949,           // Korean (Hangul charset)
+    wxFONTENCODING_CP949,           // Korean (Hangul charset, a.k.a. EUC-KR)
     wxFONTENCODING_CP950,           // Chinese (traditional - Big5)
     wxFONTENCODING_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic
@@ -76,51 +76,55 @@ enum wxFontEncoding
     wxFONTENCODING_UTF32LE,         // UTF-32 Little Endian Unicode encoding
 
     wxFONTENCODING_MACROMAN,        // the standard mac encodings
-    wxFONTENCODING_MACJAPANESE,      
-    wxFONTENCODING_MACCHINESETRAD,   
-    wxFONTENCODING_MACKOREAN,       
-    wxFONTENCODING_MACARABIC,       
-    wxFONTENCODING_MACHEBREW,        
-    wxFONTENCODING_MACGREEK,       
-    wxFONTENCODING_MACCYRILLIC,      
-    wxFONTENCODING_MACDEVANAGARI,      
-    wxFONTENCODING_MACGURMUKHI,      
-    wxFONTENCODING_MACGUJARATI,     
-    wxFONTENCODING_MACORIYA,       
-    wxFONTENCODING_MACBENGALI,       
-    wxFONTENCODING_MACTAMIL,       
-    wxFONTENCODING_MACTELUGU,        
-    wxFONTENCODING_MACKANNADA,        
-    wxFONTENCODING_MACMALAJALAM,        
-    wxFONTENCODING_MACSINHALESE,        
-    wxFONTENCODING_MACBURMESE,       
-    wxFONTENCODING_MACKHMER,        
-    wxFONTENCODING_MACTHAI,        
-    wxFONTENCODING_MACLAOTIAN,        
-    wxFONTENCODING_MACGEORGIAN,        
-    wxFONTENCODING_MACARMENIAN,        
-    wxFONTENCODING_MACCHINESESIMP,        
-    wxFONTENCODING_MACTIBETAN,        
-    wxFONTENCODING_MACMONGOLIAN,        
-    wxFONTENCODING_MACETHIOPIC,        
-    wxFONTENCODING_MACCENTRALEUR,        
-    wxFONTENCODING_MACVIATNAMESE,        
-    wxFONTENCODING_MACARABICEXT,        
-    wxFONTENCODING_MACSYMBOL,        
-    wxFONTENCODING_MACDINGBATS,        
-    wxFONTENCODING_MACTURKISH,        
-    wxFONTENCODING_MACCROATIAN,        
-    wxFONTENCODING_MACICELANDIC,        
-    wxFONTENCODING_MACROMANIAN,        
-    wxFONTENCODING_MACCELTIC,        
-    wxFONTENCODING_MACGAELIC,        
-    wxFONTENCODING_MACKEYBOARD,       
+    wxFONTENCODING_MACJAPANESE,
+    wxFONTENCODING_MACCHINESETRAD,
+    wxFONTENCODING_MACKOREAN,
+    wxFONTENCODING_MACARABIC,
+    wxFONTENCODING_MACHEBREW,
+    wxFONTENCODING_MACGREEK,
+    wxFONTENCODING_MACCYRILLIC,
+    wxFONTENCODING_MACDEVANAGARI,
+    wxFONTENCODING_MACGURMUKHI,
+    wxFONTENCODING_MACGUJARATI,
+    wxFONTENCODING_MACORIYA,
+    wxFONTENCODING_MACBENGALI,
+    wxFONTENCODING_MACTAMIL,
+    wxFONTENCODING_MACTELUGU,
+    wxFONTENCODING_MACKANNADA,
+    wxFONTENCODING_MACMALAJALAM,
+    wxFONTENCODING_MACSINHALESE,
+    wxFONTENCODING_MACBURMESE,
+    wxFONTENCODING_MACKHMER,
+    wxFONTENCODING_MACTHAI,
+    wxFONTENCODING_MACLAOTIAN,
+    wxFONTENCODING_MACGEORGIAN,
+    wxFONTENCODING_MACARMENIAN,
+    wxFONTENCODING_MACCHINESESIMP,
+    wxFONTENCODING_MACTIBETAN,
+    wxFONTENCODING_MACMONGOLIAN,
+    wxFONTENCODING_MACETHIOPIC,
+    wxFONTENCODING_MACCENTRALEUR,
+    wxFONTENCODING_MACVIATNAMESE,
+    wxFONTENCODING_MACARABICEXT,
+    wxFONTENCODING_MACSYMBOL,
+    wxFONTENCODING_MACDINGBATS,
+    wxFONTENCODING_MACTURKISH,
+    wxFONTENCODING_MACCROATIAN,
+    wxFONTENCODING_MACICELANDIC,
+    wxFONTENCODING_MACROMANIAN,
+    wxFONTENCODING_MACCELTIC,
+    wxFONTENCODING_MACGAELIC,
+    wxFONTENCODING_MACKEYBOARD,
+
+    // more CJK encodings (for historical reasons some are already declared
+    // above)
+    wxFONTENCODING_ISO2022_JP,      // ISO-2022-JP JIS encoding
 
     wxFONTENCODING_MAX,             // highest enumerated encoding value
 
     wxFONTENCODING_MACMIN = wxFONTENCODING_MACROMAN ,
     wxFONTENCODING_MACMAX = wxFONTENCODING_MACKEYBOARD ,
-    
+
     // aliases for endian-dependent UTF encodings
 #ifdef WORDS_BIGENDIAN
     wxFONTENCODING_UTF16 = wxFONTENCODING_UTF16BE,  // native UTF-16
@@ -144,7 +148,10 @@ enum wxFontEncoding
     wxFONTENCODING_BIG5 = wxFONTENCODING_CP950,   // Traditional Chinese
 
         // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html)
-    wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932 // Shift JIS
+    wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932, // Shift JIS
+
+        // Korean (CP 949 not actually the same but close enough)
+    wxFONTENCODING_EUC_KR = wxFONTENCODING_CP949
 };
 
 #endif // _WX_FONTENC_H_