X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e74d06a33b48f4335bf628da028c2a02676a92a6..42d0df0030abbac4ca11a78b2f529133e3c9d986:/include/wx/fontmap.h?ds=sidebyside

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index d8149fab21..d3b0461e72 100644
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -49,6 +49,8 @@ class WXDLLIMPEXP_CORE wxFontMapper;
 
 class WXDLLIMPEXP_BASE wxFontMapperBase
 {
+    // For IsWxFontMapper()
+    friend class WXDLLIMPEXP_CORE wxFontMapper;
 public:
     // constructtor and such
     // ---------------------
@@ -61,6 +63,8 @@ public:
 
     // return instance of the wxFontMapper singleton
     // wxBase code only cares that it's a wxFontMapperBase
+    // In wxBase, wxFontMapper is only forward declared
+    // so one cannot implicitly cast from it to wxFontMapperBase.
     static wxFontMapperBase *Get();
 
     // set the singleton to 'mapper' instance and return previous one
@@ -86,10 +90,13 @@ public:
     // get the n-th supported encoding
     static wxFontEncoding GetEncoding(size_t n);
 
-    // return internal string identifier for the encoding (see also
-    // GetEncodingDescription())
+    // return canonical name of this encoding (this is a short string,
+    // GetEncodingDescription() returns a longer one)
     static wxString GetEncodingName(wxFontEncoding encoding);
 
+    // return a list of all names of this encoding (see GetEncodingName)
+    static const wxChar** GetAllEncodingNames(wxFontEncoding encoding);
+
     // return user-readable string describing the given encoding
     //
     // NB: hard-coded now, but might change later (read it from config?)
@@ -156,6 +163,9 @@ protected:
     int NonInteractiveCharsetToEncoding(const wxString& charset);
 
 private:
+    // pseudo-RTTI since we aren't a wxObject.
+    virtual bool IsWxFontMapper();
+
     // the global fontmapper object or NULL
     static wxFontMapper *sm_instance;
 
@@ -252,6 +262,9 @@ protected:
     wxWindow *m_windowParent;
 
 private:
+    // pseudo-RTTI since we aren't a wxObject.
+    virtual bool IsWxFontMapper();
+
     DECLARE_NO_COPY_CLASS(wxFontMapper)
 };