wxUSE_XML and wxUSE_XRC build fixes if expat is not enabled

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

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index f13cf47a50e92f787a9da4056dadbc4b6a4c8303..0256128ad46e32b3ec6d1a5daebb5b24104b6472 100644 (file)
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -35,7 +35,7 @@ class WXDLLIMPEXP_BASE wxFontMapper;
 #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
@@ -94,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
@@ -141,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;
@@ -199,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);
 
@@ -248,7 +263,7 @@ class WXDLLIMPEXP_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())