X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3bf5a59b5e058bebffcf9d87f03550b4ecf93e73..a596eeb93f525c64d374f49e5986c57d1ea124a7:/include/wx/gtk1/font.h diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h index 9d66ddc909..6936e530f3 100644 --- a/include/wx/gtk1/font.h +++ b/include/wx/gtk1/font.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.h +// Name: wx/gtk1/font.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,38 +10,31 @@ #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 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() { } // wxGTK-specific wxFont(const wxString& fontname) { - Init(); - Create(fontname); } @@ -51,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); } @@ -64,17 +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); - ~wxFont(); - - // assignment - wxFont& operator=(const wxFont& font); + virtual ~wxFont(); // implement base class pure virtuals virtual int GetPointSize() const; @@ -91,28 +79,23 @@ 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); - 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: virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); - // common part of all ctors - void Init(); - private: DECLARE_DYNAMIC_CLASS(wxFont) };