X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..d38819f56f68eebd88fd88f47fa44711bf6ec5d0:/include/wx/gtk/font.h diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 2465dc3554..11ceb4335f 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -7,41 +7,21 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKFONTH__ -#define __GTKFONTH__ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface -#endif - -#include "wx/hash.h" - -// ---------------------------------------------------------------------------- -// classes -// ---------------------------------------------------------------------------- - -class wxDC; -class wxPaintDC; -class wxWindow; - -class wxFont; +#ifndef _WX_GTK_FONT_H_ +#define _WX_GTK_FONT_H_ // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- -class wxFont : public wxFontBase +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,12 +31,10 @@ public: int family, int style, int weight, - bool underlined = FALSE, + bool underlined = false, const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); - (void)Create(size, family, style, weight, underlined, face, encoding); } @@ -64,17 +42,14 @@ public: int family, int style, int weight, - bool underlined = FALSE, + bool underlined = false, const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // 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; @@ -84,27 +59,23 @@ public: virtual wxString GetFaceName() const; virtual bool GetUnderlined() const; virtual wxFontEncoding GetEncoding() const; - virtual wxNativeFontInfo *GetNativeFontInfo() const; + virtual const wxNativeFontInfo *GetNativeFontInfo() const; virtual bool IsFixedWidth() const; virtual void SetPointSize( int pointSize ); 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); - virtual void SetNoAntiAliasing( bool no = TRUE ); - virtual bool GetNoAntiAliasing(); + virtual void SetNoAntiAliasing( bool no = true ); + virtual bool GetNoAntiAliasing() const ; // implementation from now on void Unshare(); -#ifndef __WXGTK20__ - GdkFont* GetInternalFont(float scale = 1.0) const; -#endif - // no data :-) protected: @@ -113,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_