Reverted part of patch #876969 ("Fixes to Borland warnings"), resulted in bugs when...

[wxWidgets.git] / include / wx / fontmap.h

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index 0af055a93e5ba48685930c91c66fd30c0e73c758..7e3481db5b3921f1c04167716522149372f446f5 100644 (file)
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -24,7 +24,7 @@
     #include "wx/fontutil.h"    // for wxNativeEncodingInfo
 #endif // wxUSE_GUI
 
-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
     class WXDLLIMPEXP_BASE wxConfigBase;
 #endif // wxUSE_CONFIG
 
@@ -62,10 +62,9 @@ public:
     // return instance of the wxFontMapper singleton
     static wxFontMapper *Get();
 
-    // set the sigleton to 'mapper' instance and return previous one
+    // set the singleton to 'mapper' instance and return previous one
     static wxFontMapper *Set(wxFontMapper *mapper);
 
-
     // translates charset strings to encoding
     // --------------------------------------
 
@@ -77,7 +76,6 @@ public:
     virtual wxFontEncoding CharsetToEncoding(const wxString& charset,
                                              bool interactive = true);
 
-
     // information about supported encodings
     // -------------------------------------
 
@@ -103,7 +101,7 @@ public:
     // GetDefaultConfigPath()
     // ----------------------------------------------------------------------
 
-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
     // set the config object to use (may be NULL to use default)
     void SetConfig(wxConfigBase *config) { m_config = config; }
 
@@ -116,7 +114,7 @@ public:
 
 
 protected:
-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
     // get the config object we're using -- if it wasn't set explicitly, this
     // function will use wxConfig::Get() to get the global one
     wxConfigBase *GetConfig();
@@ -143,6 +141,13 @@ protected:
     wxString m_configRootPath;
 #endif // wxUSE_CONFIG
 
+    // the real implementation of the base class version of CharsetToEncoding()
+    //
+    // returns wxFONTENCODING_UNKNOWN if encoding is unknown and we shouldn't
+    // ask the user about it, wxFONTENCODING_SYSTEM if it is unknown but we
+    // should/could ask the user
+    int NonInteractiveCharsetToEncoding(const wxString& charset);
+
 private:
     // the global fontmapper object or NULL
     static wxFontMapper *sm_instance;