X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6788ecb8a99b15c454c345fb0dac9cd11a84cd6e..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk1/font.h diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h index 0a2bfbb095..6936e530f3 100644 --- a/include/wx/gtk1/font.h +++ b/include/wx/gtk1/font.h @@ -1,47 +1,41 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.h +// Name: wx/gtk1/font.h // Purpose: // Author: Robert Roebling // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKFONTH__ #define __GTKFONTH__ -#ifdef __GNUG__ - #pragma interface -#endif - #include "wx/hash.h" // ---------------------------------------------------------------------------- // classes // ---------------------------------------------------------------------------- -class wxDC; -class wxPaintDC; -class wxWindow; +class WXDLLIMPEXP_FWD_CORE wxDC; +class WXDLLIMPEXP_FWD_CORE wxPaintDC; +class WXDLLIMPEXP_FWD_CORE wxWindow; -class wxFont; +class WXDLLIMPEXP_FWD_CORE wxFont; // ---------------------------------------------------------------------------- // 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(const wxString& fontname, - wxFontEncoding fontenc = wxFONTENCODING_DEFAULT) - { - Init(); + wxFont() { } - Create(fontname, fontenc); + // wxGTK-specific + wxFont(const wxString& fontname) + { + Create(fontname); } wxFont(const wxNativeFontInfo& info); @@ -50,12 +44,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); } @@ -63,19 +55,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, - wxFontEncoding fontenc = wxFONTENCODING_DEFAULT); - bool Create(const wxNativeFontInfo& fontinfo); - - ~wxFont(); + bool Create(const wxString& fontname); - // assignment - wxFont& operator=(const wxFont& font); + virtual ~wxFont(); // implement base class pure virtuals virtual int GetPointSize() const; @@ -85,16 +72,19 @@ 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 SetNativeFontInfo( const wxNativeFontInfo& info ); + + virtual void SetNoAntiAliasing( bool no = true ); + virtual bool GetNoAntiAliasing() const ; // implementation from now on void Unshare(); @@ -104,8 +94,7 @@ public: // no data :-) protected: - // common part of all ctors - void Init(); + virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); private: DECLARE_DYNAMIC_CLASS(wxFont)