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

blind fix based on buildbot logs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-11-08 12:56:32 +00:00
parent e882d28829
commit 98ecc3aa68
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/os2/font.cpp
View File

@@ -56,9 +56,9 @@ public:
} }
wxFontRefData( int nSize wxFontRefData( int nSize
,int nFamily ,wxFontFamily nFamily
,int nStyle ,wxFontStyle nStyle
,int nWeight ,wxFontWeight nWeight
,bool bUnderlined ,bool bUnderlined
,const wxString& sFaceName ,const wxString& sFaceName
,wxFontEncoding vEncoding ,wxFontEncoding vEncoding
@@ -120,18 +120,18 @@ public:
return m_nPointSize; return m_nPointSize;
} }
inline int GetFamily(void) const inline wxFontFamily GetFamily(void) const
{ {
return m_nFamily; return m_nFamily;
} }
inline int GetStyle(void) const inline wxFontStyle GetStyle(void) const
{ {
return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetStyle() return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetStyle()
: m_nStyle; : m_nStyle;
} }
inline int GetWeight(void) const inline wxFontWeight GetWeight(void) const
{ {
return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetWeight() return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetWeight()
: m_nWeight; : m_nWeight;
@@ -175,23 +175,23 @@ public:
m_nPointSize = nPointSize; m_nPointSize = nPointSize;
} }
inline void SetFamily(int nFamily) inline void SetFamily(wxFontFamily nFamily)
{ {
m_nFamily = nFamily; m_nFamily = nFamily;
} }
inline void SetStyle(int nStyle) inline void SetStyle(wxFontStyle nStyle)
{ {
if (m_bNativeFontInfoOk) if (m_bNativeFontInfoOk)
m_vNativeFontInfo.SetStyle((wxFontStyle)nStyle); m_vNativeFontInfo.SetStyle(nStyle);
else else
m_nStyle = nStyle; m_nStyle = nStyle;
} }
inline void SetWeight(int nWeight) inline void SetWeight(wxFontWeight nWeight)
{ {
if (m_bNativeFontInfoOk) if (m_bNativeFontInfoOk)
m_vNativeFontInfo.SetWeight((wxFontWeight)nWeight); m_vNativeFontInfo.SetWeight(nWeight);
else else
m_nWeight = nWeight; m_nWeight = nWeight;
} }
@@ -309,9 +309,9 @@ protected:
void wxFontRefData::Init( void wxFontRefData::Init(
int nPointSize int nPointSize
, int nFamily , wxFontFamily nFamily
, int nStyle , wxFontStyle nStyle
, int nWeight , wxFontWeight nWeight
, bool bUnderlined , bool bUnderlined
, const wxString& rsFaceName , const wxString& rsFaceName
, wxFontEncoding vEncoding , wxFontEncoding vEncoding
@@ -991,7 +991,7 @@ void wxFont::SetPointSize(
} // end of wxFont::SetPointSize } // end of wxFont::SetPointSize
void wxFont::SetFamily( void wxFont::SetFamily(
int nFamily wxFontFamily nFamily
) )
{ {
AllocExclusive(); AllocExclusive();
@@ -1002,7 +1002,7 @@ void wxFont::SetFamily(
} // end of wxFont::SetFamily } // end of wxFont::SetFamily
void wxFont::SetStyle( void wxFont::SetStyle(
int nStyle wxFontStyle nStyle
) )
{ {
AllocExclusive(); AllocExclusive();
@@ -1013,7 +1013,7 @@ void wxFont::SetStyle(
} // end of wxFont::SetStyle } // end of wxFont::SetStyle
void wxFont::SetWeight( void wxFont::SetWeight(
int nWeight wxFontWeight nWeight
) )
{ {
AllocExclusive(); AllocExclusive();