X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8462a84b2caab30265823ebbdbdfc7cff91486e6..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/x11/font.h diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h index a7197b878b..a7cabdeb9f 100644 --- a/include/wx/x11/font.h +++ b/include/wx/x11/font.h @@ -57,6 +57,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, @@ -80,7 +93,6 @@ public: // implement base class pure virtuals virtual int GetPointSize() const; - virtual wxFontFamily GetFamily() const; virtual wxFontStyle GetStyle() const; virtual wxFontWeight GetWeight() const; virtual bool GetUnderlined() const; @@ -129,6 +141,7 @@ protected: virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); + virtual wxFontFamily DoGetFamily() const; void Unshare();