fix when bitmap is not valid

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 516e0a6a7cee8e1bc99a2634e38806c58ae22516..cf96614eef8034e73e0f9cce3ec9c62508e2a28d 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -908,23 +908,23 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
         cset = NULL;
     }
 
-#if wxUSE_FONTMAP
-    cset = new EC_CharSet(name);
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+    cset = new CP_CharSet(name);
     if ( cset->usable() )
         return cset;
 
     delete cset;
     cset = NULL;
-#endif // wxUSE_FONTMAP
+#endif // __WIN32__
 
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-    cset = new CP_CharSet(name);
+#if wxUSE_FONTMAP
+    cset = new EC_CharSet(name);
     if ( cset->usable() )
         return cset;
 
     delete cset;
     cset = NULL;
-#endif // __WIN32__
+#endif // wxUSE_FONTMAP
 
     wxLogError(_("Cannot convert from encoding '%s'!"), name);