X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a473abaf2f6171a649fac9ede9a5f11cb7ddbeb..2a45803fc3877afd0ae3ce356dfe216505165882:/include/wx/osx/font.h diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h index b05661b4b1..007eaef9cf 100644 --- a/include/wx/osx/font.h +++ b/include/wx/osx/font.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.h +// Name: wx/osx/font.h // Purpose: wxFont class // Author: Julian Smart // Modified by: @@ -27,7 +27,7 @@ enum wxOSXSystemFont wxOSX_SYSTEM_FONT_MINI, wxOSX_SYSTEM_FONT_MINI_BOLD, wxOSX_SYSTEM_FONT_LABELS, - wxOSX_SYSTEM_FONT_VIEWS, + wxOSX_SYSTEM_FONT_VIEWS }; @@ -79,6 +79,19 @@ public: SetPixelSize(pixelSize); } + wxFont(int pointSize, + wxFontFamily family, + int flags = wxFONTFLAG_DEFAULT, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + Create(pointSize, family, + GetStyleFromFlags(flags), + GetWeightFromFlags(flags), + GetUnderlinedFromFlags(flags), + face, encoding); + } + bool Create(int size, wxFontFamily family, wxFontStyle style, @@ -108,6 +121,8 @@ public: virtual wxFontEncoding GetEncoding() const; virtual const wxNativeFontInfo *GetNativeFontInfo() const; + virtual bool IsFixedWidth() const; + virtual void SetPointSize(int pointSize); virtual void SetFamily(wxFontFamily family); virtual void SetStyle(wxFontStyle style);