X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b030203c5926bd6af8bc310469c911f2143f7e1..992527a5738f7fb629d2aaeee64cfc733ddb7e1c:/include/wx/cocoa/font.h diff --git a/include/wx/cocoa/font.h b/include/wx/cocoa/font.h index f2075fe537..b230ab76a3 100644 --- a/include/wx/cocoa/font.h +++ b/include/wx/cocoa/font.h @@ -12,10 +12,6 @@ #ifndef _WX_FONT_H_ #define _WX_FONT_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "font.h" -#endif - class WXDLLEXPORT wxFontRefData: public wxGDIRefData { friend class WXDLLEXPORT wxFont; @@ -99,13 +95,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, @@ -115,15 +105,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); } @@ -141,9 +127,6 @@ public: virtual ~wxFont(); - // assignment - wxFont& operator=(const wxFont& font); - // implement base class pure virtuals virtual int GetPointSize() const; virtual int GetFamily() const; @@ -158,7 +141,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); @@ -168,9 +151,6 @@ public: virtual bool RealizeResource(); protected: - // common part of all ctors - void Init(); - void Unshare(); private: