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

18
include/wx/private/fontmgr.h
View File

@@ -205,9 +205,9 @@ class wxFontMgrFontRefData : public wxGDIRefData
{ {
public: public:
wxFontMgrFontRefData(int size = wxDEFAULT, wxFontMgrFontRefData(int size = wxDEFAULT,
int family = wxDEFAULT, wxFontFamily family = wxFONTFAMILY_DEFAULT,
int style = wxDEFAULT, wxFontStyle style = wxFONTSTYLE_NORMAL,
int weight = wxDEFAULT, wxFontWeight weight = wxFONTWEIGHT_NORMAL,
bool underlined = false, bool underlined = false,
const wxString& faceName = wxEmptyString, const wxString& faceName = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
@@ -223,16 +223,16 @@ public:
int GetPointSize() const { return m_info.pointSize; } int GetPointSize() const { return m_info.pointSize; }
wxString GetFaceName() const { return m_info.faceName; } wxString GetFaceName() const { return m_info.faceName; }
int GetFamily() const { return m_info.family; } wxFontFamily GetFamily() const { return m_info.family; }
int GetStyle() const { return m_info.style; } wxFontStyle GetStyle() const { return m_info.style; }
int GetWeight() const { return m_info.weight; } wxFontWeight GetWeight() const { return m_info.weight; }
bool GetUnderlined() const { return m_info.underlined; } bool GetUnderlined() const { return m_info.underlined; }
wxFontEncoding GetEncoding() const { return m_info.encoding; } wxFontEncoding GetEncoding() const { return m_info.encoding; }
void SetPointSize(int pointSize); void SetPointSize(int pointSize);
void SetFamily(int family); void SetFamily(wxFontFamily family);
void SetStyle(int style); void SetStyle(wxFontStyle style);
void SetWeight(int weight); void SetWeight(wxFontWeight weight);
void SetFaceName(const wxString& faceName); void SetFaceName(const wxString& faceName);
void SetUnderlined(bool underlined); void SetUnderlined(bool underlined);
void SetEncoding(wxFontEncoding encoding); void SetEncoding(wxFontEncoding encoding);

26
src/common/fontmgrcmn.cpp
View File

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