From: Václav Slavík <vslavik@fastmail.fm>
Date: Mon, 24 Dec 2001 14:08:38 +0000 (+0000)
Subject: fixes to wxFont mods for the case w/o native fontinfo struct
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f7b301fa5bae53f03ee6ffbaddde1bf98cbc9146?hp=ef243e708a7f77e58b9c42edac862cc0dc0a6b07

fixes to wxFont mods for the case w/o native fontinfo struct
(could never possibly compile)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 9fcb7d694f..bdc45ec3bc 100644
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -83,7 +83,7 @@ wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
     wxNativeFontInfo *fontInfo = new wxNativeFontInfo();
 
     fontInfo->SetPointSize(GetPointSize());
-    fontInfo->SetFamily(GetFamily());
+    fontInfo->SetFamily((wxFontFamily)GetFamily());
     fontInfo->SetStyle((wxFontStyle)GetStyle());
     fontInfo->SetWeight((wxFontWeight)GetWeight());
     fontInfo->SetUnderlined(GetUnderlined());
@@ -257,7 +257,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
-    family = (int)l;
+    family = (wxFontFamily)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
@@ -371,7 +371,7 @@ void wxNativeFontInfo::SetUnderlined(bool underlined_)
 
 void wxNativeFontInfo::SetFaceName(wxString facename_)
 {
-    facename = facename_;
+    faceName = facename_;
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family_)