xti introduction

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 4df6f648b1f0dd3bdfc56fcc70df2c8fe05c1270..18fc3917c2d9a5265c4d0482ad8be4cc25c397a5 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -85,6 +85,8 @@ public:
 private:
     bool m_flagOld;
     bool& m_flag;
+
+    DECLARE_NO_COPY_CLASS(ReentrancyBlocker)
 };
 
 // ============================================================================
@@ -108,11 +110,16 @@ wxFontEncoding
 wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
 {
     // try the ways not needing the users intervention first
-    wxFontEncoding
-        encoding = wxFontMapperBase::CharsetToEncoding(charset, interactive);
+    int encoding = wxFontMapperBase::NonInteractiveCharsetToEncoding(charset);
 
     // if we failed to find the encoding, ask the user -- unless disabled
-    if ( (encoding == wxFONTENCODING_SYSTEM) && interactive )
+    if ( encoding == wxFONTENCODING_UNKNOWN )
+    {
+        // this is the special value which disables asking the user (he had
+        // chosen to suppress this the last time)
+        encoding = wxFONTENCODING_SYSTEM;
+    }
+    else if ( (encoding == wxFONTENCODING_SYSTEM) && interactive )
     {
         // prepare the dialog data
 
@@ -171,7 +178,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
 #endif // wxUSE_CONFIG
     }
 
-    return encoding;
+    return (wxFontEncoding)encoding;
 }
 
 // ----------------------------------------------------------------------------