made UTF-16/32 equivalent to the corresponding LE/BE version (patch 812358)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h
index d507f4ef3cb30895fe564d6c96e792d02bb77232..60666c0abb920c9c993171704d93be64fae0315b 100644 (file)
--- a/include/wx/fontenc.h
+++ b/include/wx/fontenc.h
@@ -68,6 +68,7 @@ enum wxFontEncoding
 
     wxFONTENCODING_UTF7,            // UTF-7 Unicode encoding
     wxFONTENCODING_UTF8,            // UTF-8 Unicode encoding
 
     wxFONTENCODING_UTF7,            // UTF-7 Unicode encoding
     wxFONTENCODING_UTF8,            // UTF-8 Unicode encoding

+    wxFONTENCODING_EUC_JP,          // Extended Unix Codepage for Japanese

     wxFONTENCODING_UTF16,           // UTF-16 Unicode encoding
     wxFONTENCODING_UTF16BE,         // UTF-16 Big Endian Unicode encoding
     wxFONTENCODING_UTF16LE,         // UTF-16 Little Endian Unicode encoding
     wxFONTENCODING_UTF16,           // UTF-16 Unicode encoding
     wxFONTENCODING_UTF16BE,         // UTF-16 Big Endian Unicode encoding
     wxFONTENCODING_UTF16LE,         // UTF-16 Little Endian Unicode encoding


@@ -75,19 +76,28 @@ enum wxFontEncoding
     wxFONTENCODING_UTF32BE,         // UTF-32 Big Endian Unicode encoding
     wxFONTENCODING_UTF32LE,         // UTF-32 Little Endian Unicode encoding
 
     wxFONTENCODING_UTF32BE,         // UTF-32 Big Endian Unicode encoding
     wxFONTENCODING_UTF32LE,         // UTF-32 Little Endian Unicode encoding
 

-    // Far Eastern encodings
+    wxFONTENCODING_UNICODE,         // Unicode (for wxEncodingConverter only)
+
+    wxFONTENCODING_MAX,             // highest enumerated encoding value
+
+
+    // aliases for endian-dependent UTF encodings
+#ifdef WORDS_BIGENDIAN
+    wxFONTENCODING_UTF16 = wxFONTENCODING_UTF16BE,  // native UTF-16
+    wxFONTENCODING_UTF32 = wxFONTENCODING_UTF32BE,  // native UTF-32
+#else // WORDS_BIGENDIAN
+    wxFONTENCODING_UTF16 = wxFONTENCODING_UTF16LE,  // native UTF-16
+    wxFONTENCODING_UTF32 = wxFONTENCODING_UTF32LE,  // native UTF-32
+#endif // WORDS_BIGENDIAN
+
+
+    // alternative names for Far Eastern encodings

         // Chinese
     wxFONTENCODING_GB2312 = wxFONTENCODING_CP936, // Simplified Chinese
     wxFONTENCODING_BIG5 = wxFONTENCODING_CP950,   // Traditional Chinese
 
         // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html)
         // Chinese
     wxFONTENCODING_GB2312 = wxFONTENCODING_CP936, // Simplified Chinese
     wxFONTENCODING_BIG5 = wxFONTENCODING_CP950,   // 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_UNICODE,         // Unicode (for wxEncodingConverter only)
-
-    wxFONTENCODING_MAX
+    wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932 // Shift JIS

 };
 
 #endif // _WX_FONTENC_H_
 };
 
 #endif // _WX_FONTENC_H_

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 6621f29859f46fc4ba56a90a244e39ce77a6a086..d2c107ecbea724d0da1bb246074ffdf89550e1bc 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -1389,18 +1389,12 @@ wxMBConv *wxCSConv::DoCreate() const
         case wxFONTENCODING_UTF8:
              return new wxMBConvUTF8;
 
         case wxFONTENCODING_UTF8:
              return new wxMBConvUTF8;
 

-        case wxFONTENCODING_UTF16:
-             return new wxMBConvUTF16;
-

         case wxFONTENCODING_UTF16BE:
              return new wxMBConvUTF16BE;
 
         case wxFONTENCODING_UTF16LE:
              return new wxMBConvUTF16LE;
 
         case wxFONTENCODING_UTF16BE:
              return new wxMBConvUTF16BE;
 
         case wxFONTENCODING_UTF16LE:
              return new wxMBConvUTF16LE;
 

-        case wxFONTENCODING_UTF32:
-             return new wxMBConvUTF32;
-

         case wxFONTENCODING_UTF32BE:
              return new wxMBConvUTF32BE;
 
         case wxFONTENCODING_UTF32BE:
              return new wxMBConvUTF32BE;