X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f1d13738e83009afd3c2058757cefa28d709598..fe1bdf10a61ddc1f3455e5a9a22ca04a8f38eec2:/src/common/fontcmn.cpp

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_)