in wxGetFontEncFromCharSet(): map only DEFAULT_CHARSET to wxFONTENCODING_SYSTEM ...

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

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index 6bea2a9a399cf35b6e07b1a8cee4731cbf28f886..6ab9f34d8f577a0f78665a7088bf438ae4bbfd09 100644 (file)
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -190,7 +190,10 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
     switch ( cs )
     {
         default:
-            // assume the system charset
+            wxFAIL_MSG( _T("unexpected Win32 charset") );
+            // fall through and assume the system charset
+
+        case DEFAULT_CHARSET:
             fontEncoding = wxFONTENCODING_SYSTEM;
             break;
 
@@ -198,6 +201,11 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
             fontEncoding = wxFONTENCODING_CP1252;
             break;
 
+        case SYMBOL_CHARSET:
+            // what can we do here?
+            fontEncoding = wxFONTENCODING_MAX;
+            break;
+
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
         case EASTEUROPE_CHARSET:
             fontEncoding = wxFONTENCODING_CP1250;