X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64932e4105654e784d0276671f5ac28f9bdb4ee9..ccaf2891c9082773460c50c7eb7a910ea51e7003:/include/wx/msw/font.h?ds=sidebyside diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index 05edfdf958..d95b0da260 100644 --- a/include/wx/msw/font.h +++ b/include/wx/msw/font.h @@ -24,6 +24,8 @@ public: // ctors and such wxFont() { } + wxFont(const wxFontInfo& info); + #if FUTURE_WXWIN_COMPATIBILITY_3_0 wxFont(int size, int family, @@ -114,10 +116,10 @@ public: virtual int GetPointSize() const; virtual wxSize GetPixelSize() const; virtual bool IsUsingSizeInPixels() const; - virtual wxFontFamily GetFamily() const; virtual wxFontStyle GetStyle() const; virtual wxFontWeight GetWeight() const; virtual bool GetUnderlined() const; + virtual bool GetStrikethrough() const; virtual wxString GetFaceName() const; virtual wxFontEncoding GetEncoding() const; virtual const wxNativeFontInfo *GetNativeFontInfo() const; @@ -129,6 +131,7 @@ public: virtual void SetWeight(wxFontWeight weight); virtual bool SetFaceName(const wxString& faceName); virtual void SetUnderlined(bool underlined); + virtual void SetStrikethrough(bool strikethrough); virtual void SetEncoding(wxFontEncoding encoding); wxDECLARE_COMMON_FONT_METHODS(); @@ -159,6 +162,7 @@ protected: wxFontEncoding encoding = wxFONTENCODING_DEFAULT); virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info); + virtual wxFontFamily DoGetFamily() const; // implement wxObject virtuals which are used by AllocExclusive() virtual wxGDIRefData *CreateGDIRefData() const;