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

Add wxFont ctor taking a single flags argument instead of style/weight/...

Browse Source 
Currently this ctor just does the same thing as the existing ctors in a
different way but it will be extended to support wxFONTFLAG_STRIKETHROUGH in
the next commits.

See #9907.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-01-23 11:28:21 +00:00
parent 5c7fe47762
commit 0634700a96
14 changed files with 185 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
interface/wx/font.h
View File

@@ -303,7 +303,7 @@ public:
wxFont(const wxFont& font);
/**
Creates a font object with the specified attributes.
Creates a font object with the specified attributes and size in points.
@param pointSize
Size in points. See SetPointSize() for more info.
@@ -349,7 +349,7 @@ public:
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
/**
Creates a font object with the specified attributes.
Creates a font object with the specified attributes and size in pixels.
@param pixelSize
Size in pixels. See SetPixelSize() for more info.
@@ -394,6 +394,22 @@ public:
const wxString& faceName = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
/**
Creates a font object using font flags.
This constructor is similar to the constructors above except it
specifies the font styles such as underlined, italic, bold, ... in a
single @a flags argument instead of using separate arguments for them.
This parameter can be a combination of ::wxFontFlag enum elements.
The meaning of the remaining arguments is the same as in the other
constructors, please see their documentation for details.
@since 2.9.4
*/
wxFont(int pointSize, wxFontFamily family, int flags,
const wxString& faceName = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
/**
Constructor from font description string.