wxUniversal fixes:

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

diff --git a/wxPython/src/fonts.i b/wxPython/src/fonts.i
index 454e4af1bc309fb6d6aea328b418c2ec4dca2064..7506801a9dd64bc135b4a32cc29de877ee9e7db7 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 "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>
 #include <wx/fontutil.h>
 #include <wx/fontenum.h>
 #include <wx/intl.h>


@@ -223,6 +222,11 @@ public:
     wxFontMapper();
     ~wxFontMapper();
 
     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
 
     // find an alternative for the given encoding (which is supposed to not be
     // available on this system). If successful, return TRUE and rwxFontEcoding