X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..194027acb360e71d5c378db3eb08d63e01e164d0:/include/wx/mac/carbon/font.h diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h index f513354e35..2113b75709 100644 --- a/include/wx/mac/carbon/font.h +++ b/include/wx/mac/carbon/font.h @@ -56,6 +56,7 @@ public: // implement base class pure virtuals virtual int GetPointSize() const; + virtual wxSize GetPixelSize() const; virtual int GetFamily() const; virtual int GetStyle() const; virtual int GetWeight() const; @@ -68,7 +69,7 @@ public: virtual void SetFamily(int family); virtual void SetStyle(int style); virtual void SetWeight(int weight); - virtual void SetFaceName(const wxString& faceName); + virtual bool SetFaceName(const wxString& faceName); virtual void SetUnderlined(bool underlined); virtual void SetEncoding(wxFontEncoding encoding); @@ -97,10 +98,9 @@ public: // Returns an ATSUStyle not ATSUStyle* void* MacGetATSUStyle() const ; -protected: +private: void Unshare(); -private: DECLARE_DYNAMIC_CLASS(wxFont) };