X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f76c075805027058f08ffba0e8c1b32372f5fd44..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/dfb/font.h?ds=sidebyside diff --git a/include/wx/dfb/font.h b/include/wx/dfb/font.h index def7085e07..3ccdebb422 100644 --- a/include/wx/dfb/font.h +++ b/include/wx/dfb/font.h @@ -47,7 +47,7 @@ public: { Create(size, family, style, weight, underlined, face, encoding); } - + wxFont(const wxSize& pixelSize, wxFontFamily family, wxFontStyle style, @@ -59,7 +59,20 @@ public: Create(10, family, style, weight, underlined, face, encoding); 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, @@ -71,7 +84,6 @@ public: // implement base class pure virtuals virtual int GetPointSize() const; - virtual wxFontFamily GetFamily() const; virtual wxFontStyle GetStyle() const; virtual wxFontWeight GetWeight() const; virtual wxString GetFaceName() const; @@ -90,10 +102,6 @@ public: wxDECLARE_COMMON_FONT_METHODS(); - // Unofficial API, don't use - virtual void SetNoAntiAliasing(bool no = true); - virtual bool GetNoAntiAliasing() const; - // implementation from now on: wxIDirectFBFontPtr GetDirectFBFont(bool antialiased) const; @@ -101,6 +109,8 @@ protected: virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxFontFamily DoGetFamily() const; + private: DECLARE_DYNAMIC_CLASS(wxFont) };