X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..432efcb004c8a7f4997acab1aa044c78226c36bb:/include/wx/gtk/font.h diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 1f2840764b..94b5d36009 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 @@ -61,7 +49,7 @@ public: // wxGTK-specific bool Create(const wxString& fontname); - ~wxFont(); + virtual ~wxFont(); // implement base class pure virtuals virtual int GetPointSize() const; @@ -78,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); @@ -100,4 +88,4 @@ private: DECLARE_DYNAMIC_CLASS(wxFont) }; -#endif // __GTKFONTH__ +#endif // _WX_GTK_FONT_H_