X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dabbc6a5a1795d169f26ce95927f3e4f1a5e7b7e..84c3e788d6200d68384852e4c4785c09922ec499:/include/wx/gtk/font.h diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index a3daf930e3..7e597c249b 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -10,38 +10,30 @@ #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_CORE wxDC; +class WXDLLIMPEXP_CORE wxPaintDC; +class WXDLLIMPEXP_CORE wxWindow; -class wxFont; +class WXDLLIMPEXP_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); } @@ -55,8 +47,6 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); - (void)Create(size, family, style, weight, underlined, face, encoding); } @@ -73,9 +63,6 @@ public: ~wxFont(); - // assignment - wxFont& operator=(const wxFont& font); - // implement base class pure virtuals virtual int GetPointSize() const; virtual int GetFamily() const; @@ -91,20 +78,16 @@ 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 bool GetNoAntiAliasing() const ; // implementation from now on void Unshare(); -#ifndef __WXGTK20__ - GdkFont* GetInternalFont(float scale = 1.0) const; -#endif - // no data :-) protected: