X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..2be7beda2d186af20ce9f0cd2bc28352d890db77:/include/wx/mac/carbon/font.h diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h index c28ed650b7..352a9a79f8 100644 --- a/include/wx/mac/carbon/font.h +++ b/include/wx/mac/carbon/font.h @@ -20,13 +20,7 @@ class WXDLLEXPORT wxFont : public wxFontBase { public: // ctors and such - wxFont() { Init(); } - wxFont(const wxFont& font) - : wxFontBase() - { - Init(); - Ref(font); - } + wxFont() { } wxFont(int size, int family, @@ -36,15 +30,11 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); - (void)Create(size, family, style, weight, underlined, face, encoding); } wxFont(const wxNativeFontInfo& info) { - Init(); - (void)Create(info); } @@ -64,9 +54,6 @@ public: virtual ~wxFont(); - // assignment - wxFont& operator=(const wxFont& font); - // implement base class pure virtuals virtual int GetPointSize() const; virtual int GetFamily() const; @@ -81,7 +68,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); @@ -111,9 +98,6 @@ public: void* MacGetATSUStyle() const ; protected: - // common part of all ctors - void Init(); - void Unshare(); private: