X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9817be8a86c3818597a3f7cda014794f57ee8886..6041f69ca7bbb7c39e4ba64e407bc3ac39e3687f:/include/wx/msw/font.h diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index a88eee2606..3f49e65e78 100644 --- a/include/wx/msw/font.h +++ b/include/wx/msw/font.h @@ -110,15 +110,10 @@ public: virtual ~wxFont(); - // wxFontBase overridden functions - virtual wxString GetNativeFontInfoDesc() const; - virtual wxString GetNativeFontInfoUserDesc() const; - // implement base class pure virtuals 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; @@ -135,7 +130,7 @@ public: virtual void SetUnderlined(bool underlined); virtual void SetEncoding(wxFontEncoding encoding); - WXDECLARE_COMPAT_SETTERS + wxDECLARE_COMMON_FONT_METHODS(); virtual bool IsFixedWidth() const; @@ -163,6 +158,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;