avoid infinite recursion for richtooltops, (hopefully) fixes #15070

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

diff --git a/interface/wx/fontmap.h b/interface/wx/fontmap.h
index 790e551063fbde34990de4d5a01672c41a83ed70..358273c6487314f8c37c6a9fa7be9709bcb704aa 100644 (file)
--- a/interface/wx/fontmap.h
+++ b/interface/wx/fontmap.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxFontMapper
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxFontMapper
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -54,9 +54,9 @@
     @endcode
 
     @library{wxcore}
     @endcode
 
     @library{wxcore}

-    @category{misc}
+    @category{cfg}

 
 

-    @see wxEncodingConverter, @ref overview_nonenglish "Writing non-English applications"
+    @see wxEncodingConverter, @ref overview_nonenglish

 */
 class wxFontMapper
 {
 */
 class wxFontMapper
 {


@@ -85,8 +85,8 @@ public:
         idea to call this function from the event handlers for repeatedly generated
         events such as @c EVT_PAINT.
     */
         idea to call this function from the event handlers for repeatedly generated
         events such as @c EVT_PAINT.
     */

-    wxFontEncoding CharsetToEncoding(const wxString& charset,
-                                     bool interactive = true);
+    virtual wxFontEncoding CharsetToEncoding(const wxString& charset,
+                                             bool interactive = true);

 
     /**
         Get the current font mapper object. If there is no current object, creates one.
 
     /**
         Get the current font mapper object. If there is no current object, creates one.


@@ -167,8 +167,8 @@ public:
         Check whether given encoding is available in given face or not.
         If no facename is given, find @e any font in this encoding.
     */
         Check whether given encoding is available in given face or not.
         If no facename is given, find @e any font in this encoding.
     */

-    bool IsEncodingAvailable(wxFontEncoding encoding,
-                             const wxString& facename = wxEmptyString);
+    virtual bool IsEncodingAvailable(wxFontEncoding encoding,
+                                     const wxString& facename = wxEmptyString);

 
     /**
         Set the current font mapper object and return previous one (may be @NULL).
 
     /**
         Set the current font mapper object and return previous one (may be @NULL).


@@ -179,14 +179,6 @@ public:
     */
     static wxFontMapper* Set(wxFontMapper* mapper);
 
     */
     static wxFontMapper* Set(wxFontMapper* mapper);
 

-    /**
-        Set the config object to use (may be @NULL to use default).
-        By default, the global one (from wxConfigBase::Get() will be used)
-        and the default root path for the config settings is the string returned
-        by GetDefaultConfigPath().
-    */
-    void SetConfig(wxConfigBase* config);
-

     /**
         Set the root config path to use (should be an absolute path).
     */
     /**
         Set the root config path to use (should be an absolute path).
     */