escape underscores and don't use abbreviations in text

[wxWidgets.git] / src / common / fmapbase.cpp

diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp
index 85a1b0ef52b2d2f43ac165828834b6c51ccbd8b1..4ad527ddfe073cc995527db5b45f796e93bb260e 100644 (file)
--- a/src/common/fmapbase.cpp
+++ b/src/common/fmapbase.cpp
@@ -195,10 +195,10 @@ static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][10] =
 
     { wxT( "UTF-7" ), NULL },
     { wxT( "UTF-8" ), NULL },
-    { wxT( "UTF-16" ), NULL },
-    { wxT( "UTF-16BE" ), NULL },
-    { wxT( "UTF-16LE" ), NULL },
-    { wxT( "UTF-32" ), wxT( "UCS-4" ), NULL },
+    { wxT( "UTF-16" ), wxT("UCS-2"), wxT("UCS2"), NULL },
+    { wxT( "UTF-16BE" ), wxT("UCS-2BE"), NULL },
+    { wxT( "UTF-16LE" ), wxT("UCS-2LE"), NULL },
+    { wxT( "UTF-32" ), wxT( "UCS-4" ), wxT("UCS4"), NULL },
     { wxT( "UTF-32BE" ), wxT( "UCS-4BE" ), NULL },
     { wxT( "UTF-32LE" ), wxT( "UCS-4LE" ), NULL },
 
@@ -209,7 +209,7 @@ static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][10] =
       wxT("646"), wxT("roman8"), wxT( "" ), NULL },
 
     { wxT( "BIG5" ), NULL },
-    { wxT( "shift-jis" ), wxT( "shift_jis" ), wxT( "sjis" ), NULL },
+    { wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL },
     { wxT( "GB2312" ), NULL },
 };
 
@@ -573,7 +573,7 @@ wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset)
                 if ( *p == wxT('-') )
                     p++;
 
-                int value;
+                unsigned int value;
                 if ( wxSscanf(p, wxT("%u"), &value) == 1 )
                 {
                     if ( value >= 1250 )