Move deprecated wxFont ctor implementation out of line.

Blind fix to avoid strange warnings given by OS X build slave about the ctor
being deprecated when it's defined, not used.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-01-21 19:32:04 +00:00
parent 9d3550f413
commit eba3e39426
2 changed files with 13 additions and 4 deletions

View File

@ -127,10 +127,7 @@ public:
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
// implementation only from now on

View File

@ -557,6 +557,18 @@ wxFont::wxFont(const wxString& fontdesc)
(void)Create(info);
}
wxFont::wxFont(int size,
int family,
int style,
int weight,
bool underlined,
const wxString& face,
wxFontEncoding encoding)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style,
(wxFontWeight)weight, underlined, face, encoding);
}
bool wxFont::Create(int pointSize,
wxFontFamily family,
wxFontStyle style,