X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..1721a8c028d3b6a553634c632117fbfac102a30e:/include/wx/fontmap.h

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index fd6f79d62c..0256128ad4 100644
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -24,18 +24,18 @@
     #include "wx/fontutil.h"    // for wxNativeEncodingInfo
 #endif // wxUSE_GUI
 
-#if wxUSE_CONFIG
-    class WXDLLEXPORT_BASE wxConfigBase;
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+    class WXDLLIMPEXP_BASE wxConfigBase;
 #endif // wxUSE_CONFIG
 
-class WXDLLEXPORT_BASE wxFontMapper;
+class WXDLLIMPEXP_BASE wxFontMapper;
 
 #if wxUSE_GUI
-    class WXDLLEXPORT_CORE wxWindow;
+    class WXDLLIMPEXP_CORE wxWindow;
 #endif // wxUSE_GUI
 
 // ============================================================================
-// wxFontMapper manages user-definable correspondence between wxWindows font
+// wxFontMapper manages user-definable correspondence between wxWidgets font
 // encodings and the fonts present on the machine.
 //
 // This is a singleton class, font mapper objects can only be accessed using
@@ -47,7 +47,7 @@ class WXDLLEXPORT_BASE wxFontMapper;
 //                   in knowledge of the encodings equivalence
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxFontMapperBase
+class WXDLLIMPEXP_BASE wxFontMapperBase
 {
 public:
     // constructtor and such
@@ -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
     // -------------------------------------
 
@@ -96,6 +94,12 @@ public:
     // NB: hard-coded now, but might change later (read it from config?)
     static wxString GetEncodingDescription(wxFontEncoding encoding);
 
+    // find the encoding corresponding to the given name, inverse of
+    // GetEncodingName() and less general than CharsetToEncoding()
+    //
+    // returns wxFONTENCODING_MAX if the name is not a supported encoding
+    static wxFontEncoding GetEncodingFromName(const wxString& name);
+
 
     // functions which allow to configure the config object used: by default,
     // the global one (from wxConfigBase::Get() will be used) and the default
@@ -103,7 +107,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 +120,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 +147,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;
@@ -167,7 +178,7 @@ private:
 
 #if wxUSE_GUI
 
-class WXDLLEXPORT_CORE wxFontMapper : public wxFontMapperBase
+class WXDLLIMPEXP_CORE wxFontMapper : public wxFontMapperBase
 {
 public:
     // default ctor
@@ -201,7 +212,9 @@ public:
                            bool interactive = true);
 
     // checks whether given encoding is available in given face or not.
-    // If no facename is given, 
+    //
+    // if no facename is given (default), return true if it's available in any
+    // facename at alll.
     virtual bool IsEncodingAvailable(wxFontEncoding encoding,
                                      const wxString& facename = wxEmptyString);
 
@@ -240,7 +253,7 @@ private:
 
 #else // !wxUSE_GUI
 
-class WXDLLEXPORT_BASE wxFontMapper : public wxFontMapperBase
+class WXDLLIMPEXP_BASE wxFontMapper : public wxFontMapperBase
 {
 };
 
@@ -250,7 +263,7 @@ class WXDLLEXPORT_BASE wxFontMapper : public wxFontMapperBase
 // global variables
 // ----------------------------------------------------------------------------
 
-// the default font mapper for wxWindows programs do NOT use! This is for
+// the default font mapper for wxWidgets programs do NOT use! This is for
 // backward compatibility, use wxFontMapper::Get() instead
 #define wxTheFontMapper (wxFontMapper::Get())