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

wxFont::MakeXXX() and Scale() methods now modify the font in place; XXX() and Scaled() create new font

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-17 21:27:37 +00:00
parent a188ac2988
commit 6e7d2550ce
4 changed files with 115 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/font.h
View File

@@ -297,12 +297,18 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
#define wxDECLARE_COMMON_FONT_METHODS() \
wxDECLARE_FONT_COMPAT_SETTER \
\
/* functions for modifying font in place */ \
wxFont& MakeBold(); \
wxFont& MakeItalic(); \
wxFont& MakeLarger() { return Scale(1.2f); } \
wxFont& MakeSmaller() { return Scale(1/1.2f); } \
wxFont& Scale(float x); \
/* functions for creating fonts based on this one */ \
wxFont MakeBold() const; \
wxFont MakeItalic() const; \
wxFont MakeLarger() const { return Scale(1.2f); } \
wxFont MakeSmaller() const { return Scale(1/1.2f); } \
wxFont Scale(float x) const
wxFont Bold() const; \
wxFont Italic() const; \
wxFont Larger() const { return Scaled(1.2f); } \
wxFont Smaller() const { return Scaled(1/1.2f); } \
wxFont Scaled(float x) const
// include the real class declaration
#if defined(__WXPALMOS__)