Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes to wxFont mods for the case w/o native fontinfo struct

Browse Source 
(could never possibly compile)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-24 14:08:38 +00:00
parent ef243e708a
commit f7b301fa5b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/fontcmn.cpp
View File

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