X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5791cc7af207a74deb0bea60f99cd97429bcb8c..43ff861df48f0837dac98005dd397c5f127ca136:/include/wx/cocoa/font.h?ds=sidebyside diff --git a/include/wx/cocoa/font.h b/include/wx/cocoa/font.h index acda832c69..b671f95bcb 100644 --- a/include/wx/cocoa/font.h +++ b/include/wx/cocoa/font.h @@ -62,7 +62,7 @@ public: { (void)Create(size, family, style, weight, underlined, face, encoding); } - + wxFont(const wxSize& pixelSize, wxFontFamily family, wxFontStyle style, @@ -74,7 +74,7 @@ public: Create(10, family, style, weight, underlined, face, encoding); SetPixelSize(pixelSize); } - + /*! @abstract Construction with opaque wxNativeFontInfo */ wxFont(const wxNativeFontInfo& info) @@ -103,7 +103,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; @@ -119,7 +118,7 @@ public: virtual void SetUnderlined(bool underlined); virtual void SetEncoding(wxFontEncoding encoding); - WXDECLARE_COMPAT_SETTERS + wxDECLARE_COMMON_FONT_METHODS(); // implementation only from now on // ------------------------------- @@ -149,6 +148,8 @@ protected: virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxFontFamily DoGetFamily() const; + private: DECLARE_DYNAMIC_CLASS(wxFont) };