X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9cf8de4c742b21548661d5a4b3a380e9eae18080..229653c99e1d679aab15772a4a25909ca52c4d94:/src/msw/font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 16993de878..918e7c06d2 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -281,6 +281,9 @@ void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
 
     m_nativeFontInfoOk = TRUE;
     m_nativeFontInfo = info;
+    // This is the best we can do since we don't have the
+    // correct information at this point.
+    m_family = wxSWISS;
 }
 
 wxFontRefData::~wxFontRefData()
@@ -523,7 +526,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
 #if wxUSE_FONTMAP
-        if ( wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        if ( wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )
         {
             if ( !info.facename.empty() )
             {