simpler fix for rendering bug fixed in previous revision

[wxWidgets.git] / wxPython / src / fonts.i

diff --git a/wxPython/src/fonts.i b/wxPython/src/fonts.i
index 6f00cd0b0c7a3b3a6a6b1b764bb7306155d55782..4b94964473d3c53b0c3c06dd91c18c7806149b39 100644 (file)
--- a/wxPython/src/fonts.i
+++ b/wxPython/src/fonts.i
@@ -17,7 +17,6 @@
 #include "helpers.h"
 #include <wx/fontmap.h>
 #include <wx/fontenc.h>
-#include <wx/fontmap.h>
 #include <wx/fontutil.h>
 #include <wx/fontenum.h>
 #include <wx/intl.h>
@@ -223,6 +222,11 @@ public:
     wxFontMapper();
     ~wxFontMapper();
 
+    // return instance of the wxFontMapper singleton
+    static wxFontMapper *Get();
+    // set the sigleton to 'mapper' instance and return previous one
+    static wxFontMapper *Set(wxFontMapper *mapper);
+
 
     // find an alternative for the given encoding (which is supposed to not be
     // available on this system). If successful, return TRUE and rwxFontEcoding
@@ -751,6 +755,11 @@ public:
     // check if the given catalog is loaded
     bool IsLoaded(const wxString& szDomain) const;
 
+    // Retrieve the language info struct for the given language
+    //
+    // Returns NULL if no info found, pointer must *not* be deleted by caller
+    static const wxLanguageInfo *GetLanguageInfo(int lang);
+
     // Add custom language to the list of known languages.
     // Notes: 1) wxLanguageInfo contains platform-specific data
     //        2) must be called before Init to have effect
@@ -854,6 +863,9 @@ public:
     // or output encoding is not supported.)
     bool Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method = wxCONVERT_STRICT);
 
+
+    // TODO:  Need to do something about unicode mode...
+
     // Convert input string according to settings passed to Init.
     // Note that you must call Init before using Convert!
     wxString Convert(const wxString& input);
@@ -868,6 +880,7 @@ public:
 //  #endif
 
 
+
     // Return equivalent(s) for given font that are used
     // under given platform. wxPLATFORM_CURRENT means the plaform
     // this binary was compiled for