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

compilation fix after wxFont changes (closes #10152)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-10 14:30:41 +00:00
parent 7448d67c49
commit 5a2c086adf
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/fontmgrcmn.cpp
View File

@@ -225,19 +225,15 @@ void wxFontsManagerBase::AddBundle(wxFontBundle *bundle)
// ----------------------------------------------------------------------------
wxFontMgrFontRefData::wxFontMgrFontRefData(int size,
int family,
int style,
int weight,
wxFontFamily family,
wxFontStyle style,
wxFontWeight weight,
bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
{
if ( family == wxDEFAULT )
family = wxSWISS;
if ( style == wxDEFAULT )
style = wxNORMAL;
if ( weight == wxDEFAULT )
weight = wxNORMAL;
if ( family == wxFONTFAMILY_DEFAULT )
family = wxFONTFAMILY_SWISS;
if ( size == wxDEFAULT )
size = 12;
@@ -294,21 +290,21 @@ void wxFontMgrFontRefData::SetPointSize(int pointSize)
m_fontValid = false;
}
void wxFontMgrFontRefData::SetFamily(int family)
void wxFontMgrFontRefData::SetFamily(wxFontFamily family)
{
m_info.family = (wxFontFamily)family;
m_info.family = family;
m_fontValid = false;
}
void wxFontMgrFontRefData::SetStyle(int style)
void wxFontMgrFontRefData::SetStyle(wxFontStyle style)
{
m_info.style = (wxFontStyle)style;
m_info.style = style;
m_fontValid = false;
}
void wxFontMgrFontRefData::SetWeight(int weight)
void wxFontMgrFontRefData::SetWeight(wxFontWeight weight)
{
m_info.weight = (wxFontWeight)weight;
m_info.weight = weight;
m_fontValid = false;
}