X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdbd4e96121a470b518420cff4c2dfea20f2b7a6..670048b2f09d543de2ecba4800f2428fbad743e8:/include/wx/gtk/font.h?ds=sidebyside diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index c14e0fc8cf..11ceb4335f 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -7,20 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKFONTH__ -#define __GTKFONTH__ - -#include "wx/hash.h" - -// ---------------------------------------------------------------------------- -// classes -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDC; -class WXDLLIMPEXP_CORE wxPaintDC; -class WXDLLIMPEXP_CORE wxWindow; - -class WXDLLIMPEXP_CORE wxFont; +#ifndef _WX_GTK_FONT_H_ +#define _WX_GTK_FONT_H_ // ---------------------------------------------------------------------------- // wxFont @@ -29,15 +17,11 @@ class WXDLLIMPEXP_CORE wxFont; class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: - // ctors and such - wxFont() { Init(); } - wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); } + wxFont() { } // wxGTK-specific wxFont(const wxString& fontname) { - Init(); - Create(fontname); } @@ -51,8 +35,6 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); - (void)Create(size, family, style, weight, underlined, face, encoding); } @@ -67,10 +49,7 @@ public: // wxGTK-specific bool Create(const wxString& fontname); - ~wxFont(); - - // assignment - wxFont& operator=(const wxFont& font); + virtual ~wxFont(); // implement base class pure virtuals virtual int GetPointSize() const; @@ -87,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); @@ -105,8 +84,11 @@ protected: // common part of all ctors void Init(); + virtual wxObjectRefData* CreateRefData() const; + virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const; + private: DECLARE_DYNAMIC_CLASS(wxFont) }; -#endif // __GTKFONTH__ +#endif // _WX_GTK_FONT_H_