some wxArtProv docs

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index d613e6174a6757be60d4931bd05f7ab7f43ab733..677ad2714da717144cbda3cfc3f4c8cfb450d4c8 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -66,7 +66,9 @@ public:
     virtual bool OnInit() { return TRUE; }
     virtual void OnExit()
     {
     virtual bool OnInit() { return TRUE; }
     virtual void OnExit()
     {

+#if wxUSE_WCHAR_T

         wxConvLocal.Clear();
         wxConvLocal.Clear();

+#endif

     }
 
     DECLARE_DYNAMIC_CLASS(wxStrConvModule)
     }
 
     DECLARE_DYNAMIC_CLASS(wxStrConvModule)


@@ -789,7 +791,7 @@ public:
                                      enc(wxFONTENCODING_SYSTEM)
     {
         if (name)
                                      enc(wxFONTENCODING_SYSTEM)
     {
         if (name)

-            enc = wxTheFontMapper->CharsetToEncoding(name, FALSE);
+            enc = wxFontMapper::Get()->CharsetToEncoding(name, FALSE);

 
         m_ok = m2w.Init(enc, wxFONTENCODING_UNICODE) &&
                w2m.Init(wxFONTENCODING_UNICODE, enc);
 
         m_ok = m2w.Init(enc, wxFONTENCODING_UNICODE) &&
                w2m.Init(wxFONTENCODING_UNICODE, enc);


@@ -838,7 +840,7 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
 {
     // check for the special case of ASCII charset
 #if wxUSE_FONTMAP
 {
     // check for the special case of ASCII charset
 #if wxUSE_FONTMAP

-    if ( wxTheFontMapper->CharsetToEncoding(name) == wxFONTENCODING_DEFAULT )
+    if ( wxFontMapper::Get()->CharsetToEncoding(name) == wxFONTENCODING_DEFAULT )

 #else // wxUSE_FONTMAP
     if ( !name )
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
 #else // wxUSE_FONTMAP
     if ( !name )
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP