X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..62c9b3d73fdf9a892a311241f1effc12dde0282a:/include/wx/gtk/font.h?ds=sidebyside diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 1f2840764b..2743dca469 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 @@ -39,6 +27,7 @@ public: wxFont(const wxNativeFontInfo& info); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 wxFont(int size, int family, int style, @@ -47,13 +36,25 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - (void)Create(size, family, style, weight, underlined, face, encoding); + (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); + } +#endif + + wxFont(int size, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined = false, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + Create(size, family, style, weight, underlined, face, encoding); } bool Create(int size, - int family, - int style, - int weight, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, bool underlined = false, const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); @@ -61,13 +62,13 @@ public: // wxGTK-specific bool Create(const wxString& fontname); - ~wxFont(); + virtual ~wxFont(); // implement base class pure virtuals virtual int GetPointSize() const; - virtual int GetFamily() const; - virtual int GetStyle() const; - virtual int GetWeight() const; + virtual wxFontFamily GetFamily() const; + virtual wxFontStyle GetStyle() const; + virtual wxFontWeight GetWeight() const; virtual wxString GetFaceName() const; virtual bool GetUnderlined() const; virtual wxFontEncoding GetEncoding() const; @@ -75,13 +76,15 @@ public: 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 void SetFamily(wxFontFamily family); + virtual void SetStyle(wxFontStyle style); + virtual void SetWeight(wxFontWeight weight); + virtual bool SetFaceName( const wxString& faceName ); virtual void SetUnderlined( bool underlined ); virtual void SetEncoding(wxFontEncoding encoding); + WXDECLARE_COMPAT_SETTERS + virtual void SetNoAntiAliasing( bool no = true ); virtual bool GetNoAntiAliasing() const ; @@ -96,8 +99,11 @@ protected: // common part of all ctors void Init(); + virtual wxGDIRefData* CreateGDIRefData() const; + virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; + private: DECLARE_DYNAMIC_CLASS(wxFont) }; -#endif // __GTKFONTH__ +#endif // _WX_GTK_FONT_H_