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

build fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-11-03 18:24:05 +00:00
parent 1fdb23edd6
commit 9817be8a86
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/msw/font.h
View File

@@ -155,9 +155,9 @@ protected:
bool DoCreate(int size, bool DoCreate(int size,
const wxSize& pixelSize, const wxSize& pixelSize,
bool sizeUsingPixels, bool sizeUsingPixels,
int family, wxFontFamily family,
int style, wxFontStyle style,
int weight, wxFontWeight weight,
bool underlined = false, bool underlined = false,
const wxString& face = wxEmptyString, const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);

8
src/msw/font.cpp
View File

@@ -171,18 +171,18 @@ public:
return m_nativeFontInfoOk ? true : m_sizeUsingPixels; return m_nativeFontInfoOk ? true : m_sizeUsingPixels;
} }
int GetFamily() const wxFontFamily GetFamily() const
{ {
return m_family; return m_family;
} }
int GetStyle() const wxFontStyle GetStyle() const
{ {
return m_nativeFontInfoOk ? m_nativeFontInfo.GetStyle() return m_nativeFontInfoOk ? m_nativeFontInfo.GetStyle()
: m_style; : m_style;
} }
int GetWeight() const wxFontWeight GetWeight() const
{ {
return m_nativeFontInfoOk ? m_nativeFontInfo.GetWeight() return m_nativeFontInfoOk ? m_nativeFontInfo.GetWeight()
: m_weight; : m_weight;
@@ -410,7 +410,7 @@ void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
m_nativeFontInfo = info; m_nativeFontInfo = info;
// This is the best we can do since we don't have the // This is the best we can do since we don't have the
// correct information at this point. // correct information at this point.
m_family = wxSWISS; m_family = wxFONTFAMILY_SWISS;
} }
wxFontRefData::~wxFontRefData() wxFontRefData::~wxFontRefData()