fixed bug due to which all items in a virtual control stayed sometimes selected even...

[wxWidgets.git] / src / msw / font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 16993de87863b1204a6446b825911d04b69749ae..918e7c06d28ffad9b7a3e5bf675200792be5d736 100644 (file)
--- 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() )
             {