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

fix the incoherence pointed out by ifacecheck between wx docs, that documents usage of the wxFontFamily, wxFontStyle and wxFontWeight enums in wxFont setters and getters, and the actual sources, which use 'int' instead; provided the same backward-compatibility pattern already used for wxBrush,wxPen both against 'int' overloads and against the wxDeprecatedGUIConstants enum values

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-11-03 17:02:25 +00:00
parent e2ca659906
commit 0c14b6c324
26 changed files with 736 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/os2/font.cpp
View File

@@ -272,9 +272,9 @@ protected:
// Font characterstics
//
int m_nPointSize;
int m_nFamily;
int m_nStyle;
int m_nWeight;
wxFontFamily m_family;
wxFontStyle m_style;
wxFontWeight m_weight;
bool m_bUnderlined;
wxString m_sFaceName;
wxFontEncoding m_vEncoding;
@@ -891,9 +891,9 @@ wxFont::wxFont(
// in wxDC::SetFont, when information is available about scaling etc.
// ----------------------------------------------------------------------------
bool wxFont::Create( int nPointSize,
int nFamily,
int nStyle,
int nWeight,
wxFontFamily nFamily,
wxFontStyle nStyle,
wxFontWeight nWeight,
bool bUnderlined,
const wxString& rsFaceName,
wxFontEncoding vEncoding )
@@ -1082,23 +1082,23 @@ int wxFont::GetPointSize() const
return M_FONTDATA->GetPointSize();
} // end of wxFont::GetPointSize
int wxFont::GetFamily() const
wxFontFamily wxFont::GetFamily() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
wxCHECK_MSG( Ok(), wxFONTFAMILY_MAX, wxT("invalid font") );
return M_FONTDATA->GetFamily();
} // end of wxFont::GetFamily
int wxFont::GetStyle() const
wxFontStyle wxFont::GetStyle() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") );
return M_FONTDATA->GetStyle();
} // end of wxFont::GetStyle
int wxFont::GetWeight() const
wxFontWeight wxFont::GetWeight() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") );
return M_FONTDATA->GetWeight();
}