X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..90527a50d74bed6ed6b4d163e8170ae8c3f5d869:/include/wx/mac/classic/font.h diff --git a/include/wx/mac/classic/font.h b/include/wx/mac/classic/font.h index 78aa2f4d5f..07e8f7107a 100644 --- a/include/wx/mac/classic/font.h +++ b/include/wx/mac/classic/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 - // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- @@ -24,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, @@ -40,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); } @@ -66,9 +52,6 @@ public: virtual ~wxFont(); - // assignment - wxFont& operator=(const wxFont& font); - // implement base class pure virtuals virtual int GetPointSize() const; virtual int GetFamily() const; @@ -83,7 +66,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); @@ -94,7 +77,7 @@ public: // Unofficial API, don't use virtual void SetNoAntiAliasing( bool noAA = TRUE ) ; - virtual bool GetNoAntiAliasing() ; + virtual bool GetNoAntiAliasing() const ; // Mac-specific, risks to change, don't use in portable code short GetMacFontNum() const; @@ -103,9 +86,6 @@ public: wxUint32 GetMacATSUFontID() const; protected: - // common part of all ctors - void Init(); - void Unshare(); private: