X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8462a84b2caab30265823ebbdbdfc7cff91486e6..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/dfb/font.h diff --git a/include/wx/dfb/font.h b/include/wx/dfb/font.h index f3c6c485b1..db68dbd3ff 100644 --- a/include/wx/dfb/font.h +++ b/include/wx/dfb/font.h @@ -23,6 +23,21 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: wxFont() {} + + wxFont(const wxFontInfo& info) + { + Create(info.GetPointSize(), + info.GetFamily(), + info.GetStyle(), + info.GetWeight(), + info.IsUnderlined(), + info.GetFaceName(), + info.GetEncoding()); + + if ( info.IsUsingSizeInPixels() ) + SetPixelSize(info.GetPixelSize()); + } + wxFont(const wxNativeFontInfo& info) { Create(info); } #if FUTURE_WXWIN_COMPATIBILITY_3_0 wxFont(int size, @@ -71,7 +86,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; @@ -97,6 +111,8 @@ protected: virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxFontFamily DoGetFamily() const; + private: DECLARE_DYNAMIC_CLASS(wxFont) };