Use the current font for the DoGetBestSize calculation

[wxWidgets.git] / src / common / fontmap.cpp

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 3920675618376c3ecaff03f1a10d3067eb3d2846..be05e44b854c3eee3d1601312623b71ff3751b88 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -51,6 +51,7 @@
 #include "wx/msgdlg.h"
 #include "wx/fontdlg.h"
 #include "wx/choicdlg.h"
+#include "wx/encinfo.h"
 
 #include "wx/encconv.h"
 
@@ -162,6 +163,19 @@ wxFontMapper::~wxFontMapper()
 {
 }
 
+bool wxFontMapper::IsWxFontMapper()
+{   return true; }
+
+/* static */
+wxFontMapper *wxFontMapper::Get()
+{
+    wxFontMapperBase *fontmapper = wxFontMapperBase::Get();
+    wxASSERT_MSG(fontmapper->IsWxFontMapper(), wxT("GUI code requested a wxFontMapper but we only have a wxFontMapperBase."));
+    // Now return it anyway because there's a chance the GUI code might just
+    // only want to call wxFontMapperBase functions.
+    return (wxFontMapper*)fontmapper;
+}
+
 wxFontEncoding
 wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
 {