Merge branch 'deprecated' of https://github.com/MaartenBent/wxWidgets
Fixes for deprecation and other warnings in samples and demos. See https://github.com/wxWidgets/wxWidgets/pull/617
This commit is contained in:
@@ -558,6 +558,12 @@ public:
|
||||
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
|
||||
{ return FindOrCreateFont(pointSize, (wxFontFamily)family, (wxFontStyle)style,
|
||||
(wxFontWeight)weight, underline, face, encoding); }
|
||||
|
||||
wxFont *FindOrCreateFont(const wxFontInfo& fontInfo)
|
||||
{ return FindOrCreateFont(fontInfo.GetPointSize(), fontInfo.GetFamily(),
|
||||
fontInfo.GetStyle(), fontInfo.GetWeight(),
|
||||
fontInfo.IsUnderlined(), fontInfo.GetFaceName(),
|
||||
fontInfo.GetEncoding()); }
|
||||
};
|
||||
|
||||
extern WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList;
|
||||
|
Reference in New Issue
Block a user