update for bakefile 0.2.6

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

diff --git a/interface/wx/fontmap.h b/interface/wx/fontmap.h
index 790e551063fbde34990de4d5a01672c41a83ed70..104a5ec81a4b6f663ef44c4cf19ba81e5aece83d 100644 (file)
--- a/interface/wx/fontmap.h
+++ b/interface/wx/fontmap.h
@@ -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).