X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59b7da02ff62a33862accc13158870f2a9a23630..94734b4e51431d4d4d5bccaf011b28e82515091e:/include/wx/osx/font.h diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h index 3450dbc349..fb7fea783a 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 }; @@ -36,7 +36,7 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase public: // ctors and such wxFont() { } - + wxFont( wxOSXSystemFont systemFont ); #if wxOSX_USE_COCOA @@ -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, @@ -146,11 +159,9 @@ public: void* MacGetATSUStyle() const ; void* OSXGetATSUStyle() const { return MacGetATSUStyle() ; } -#if WXWIN_COMPATIBILITY_2_8 wxDEPRECATED( wxUint32 MacGetATSUFontID() const ); wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const ); #endif -#endif #if wxOSX_USE_COCOA WX_NSFont OSXGetNSFont() const;