X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bff248644eb51397254b796bee24fa995b8870b0..44a007122460fd4967021656a30dbf85161fc53f:/include/wx/msw/font.h diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index 4756c68eab..3f49e65e78 100644 --- a/include/wx/msw/font.h +++ b/include/wx/msw/font.h @@ -47,7 +47,7 @@ public: { Create(size, family, style, weight, underlined, face, encoding); } - + bool Create(int size, wxFontFamily family, wxFontStyle style, @@ -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;