made globals static to avoid linking problems

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index f26c3285af25c506c3023beb48d34828e4cbb594..cdbaabf73ee6bd5d17c8c489e9907b0664306150 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -521,7 +521,6 @@ const char *IC_CharSet::ms_wcCharsetName = NULL;
 bool IC_CharSet::ms_wcNeedsSwap = FALSE;
 
 IC_CharSet::IC_CharSet(const wxChar *name)
-          : wxCharacterSet(name)
 {
     // Do it the hard way
     char cname[100];
@@ -883,8 +882,8 @@ wxGetCharacterSet(const wxChar *name, wxFontEncoding encoding)
     // check for the special case of ASCII charset
     if ( (!name && encoding == wxFONTENCODING_DEFAULT)
 #if wxUSE_FONTMAP
-            || wxFontMapper::Get()->
-                    CharsetToEncoding(name) == wxFONTENCODING_DEFAULT
+            || (name && wxFontMapper::Get()->
+                    CharsetToEncoding(name) == wxFONTENCODING_DEFAULT)
 #endif // wxUSE_FONTMAP
        )
     {