X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f76c075805027058f08ffba0e8c1b32372f5fd44..39601a7f74796aae377ad1520595f083fdafd7b6:/include/wx/font.h diff --git a/include/wx/font.h b/include/wx/font.h index 873ba84a4a..225460cda8 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -113,7 +113,7 @@ class WXDLLIMPEXP_CORE wxFontBase : public wxGDIObject public: /* derived classes should provide the following ctors: - + wxFont(); wxFont(const wxString& nativeFontInfoString); wxFont(const wxNativeFontInfo& info); @@ -132,7 +132,7 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); */ - + // creator function virtual ~wxFontBase(); @@ -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__)