Add wxFont::Underlined() and MakeUnderlined() methods.

Add two more helpers for consistency with the existing methods such as Bold()
and MakeBold().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-02-27 12:46:59 +00:00
parent 0d0fdaacf8
commit 801423ee34
4 changed files with 35 additions and 1 deletions

View File

@@ -467,6 +467,7 @@ All (GUI):
- Added support for saving PNG files with palette (troelsk). - Added support for saving PNG files with palette (troelsk).
- Added support for saving as GIF and animated GIF (troelsk). - Added support for saving as GIF and animated GIF (troelsk).
- Fix wxWrapSizer minimal size calculation (Catalin Raceanu). - Fix wxWrapSizer minimal size calculation (Catalin Raceanu).
- Added wxFont::Underlined() and MakeUnderlined() methods.
GTK: GTK:

View File

@@ -303,12 +303,14 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
/* functions for modifying font in place */ \ /* functions for modifying font in place */ \
wxFont& MakeBold(); \ wxFont& MakeBold(); \
wxFont& MakeItalic(); \ wxFont& MakeItalic(); \
wxFont& MakeUnderlined(); \
wxFont& MakeLarger() { return Scale(1.2f); } \ wxFont& MakeLarger() { return Scale(1.2f); } \
wxFont& MakeSmaller() { return Scale(1/1.2f); } \ wxFont& MakeSmaller() { return Scale(1/1.2f); } \
wxFont& Scale(float x); \ wxFont& Scale(float x); \
/* functions for creating fonts based on this one */ \ /* functions for creating fonts based on this one */ \
wxFont Bold() const; \ wxFont Bold() const; \
wxFont Italic() const; \ wxFont Italic() const; \
wxFont Underlined() const; \
wxFont Larger() const { return Scaled(1.2f); } \ wxFont Larger() const { return Scaled(1.2f); } \
wxFont Smaller() const { return Scaled(1/1.2f); } \ wxFont Smaller() const { return Scaled(1/1.2f); } \
wxFont Scaled(float x) const wxFont Scaled(float x) const

View File

@@ -574,6 +574,15 @@ public:
*/ */
wxFont Smaller() const; wxFont Smaller() const;
/**
Returns underlined version of this font.
@see MakeUnderlined()
@since 2.9.2
*/
wxFont Underlined() const;
/** /**
Changes this font to be bold. Changes this font to be bold.
@@ -616,6 +625,15 @@ public:
*/ */
wxFont& MakeSmaller(); wxFont& MakeSmaller();
/**
Changes this font to be underlined.
@see Underlined()
@since 2.9.2
*/
wxFont& MakeUnderlined();
/** /**
Changes the size of this font. Changes the size of this font.

View File

@@ -513,7 +513,20 @@ wxFont& wxFont::MakeItalic()
wxFont wxFont::Italic() const wxFont wxFont::Italic() const
{ {
wxFont font(*this); wxFont font(*this);
font.SetStyle(wxFONTSTYLE_ITALIC); font.MakeItalic();
return font;
}
wxFont& wxFont::MakeUnderlined()
{
SetUnderlined(true);
return *this;
}
wxFont wxFont::Underlined() const
{
wxFont font(*this);
font.MakeUnderlined();
return font; return font;
} }