solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Slightly reformat FindOrCreateFont() declaration and add comments

Browse source 
Explain that the new overload is preferred and why.
This commit is contained in:
Vadim Zeitlin 2023-01-14 15:24:36 +00:00
parent e9b4b9f7e1
commit b8cff3d5cf
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/wx/font.h
View file

@ -634,6 +634,11 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
class WXDLLIMPEXP_CORE wxFontList: public wxGDIObjListBase
{
public:
// Preferred function that works for any kind of fonts.
wxFont *FindOrCreateFont(const wxFontInfo& fontInfo);
// Non-deprecated but limited older function only working for the fonts
// with the integer sizes.
wxFont *FindOrCreateFont(int pointSize,
wxFontFamily family,
wxFontStyle style,
@ -641,7 +646,8 @@ public:
bool underline = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{ return FindOrCreateFont(wxFontInfo(pointSize)
{
return FindOrCreateFont(wxFontInfo(pointSize)
.Family(family)
.Style(style).Weight(weight).Underlined(underline)
.FaceName(face).Encoding(encoding));
@ -654,8 +660,6 @@ public:
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{ return FindOrCreateFont(pointSize, (wxFontFamily)family, (wxFontStyle)style,
(wxFontWeight)weight, underline, face, encoding); }
wxFont *FindOrCreateFont(const wxFontInfo& fontInfo);
};
extern WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList;