X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5791cc7af207a74deb0bea60f99cd97429bcb8c..a516284f67e1910fc6dc5364b289340332d0d35f:/include/wx/gtk/font.h diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index efd441ad5a..da9c9a474f 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.h +// Name: wx/gtk/font.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -20,9 +20,9 @@ public: wxFont() { } // wxGTK-specific - wxFont(const wxString& fontname) + wxFont(const wxString& nativeFontInfoString) { - Create(fontname); + Create(nativeFontInfoString); } wxFont(const wxNativeFontInfo& info); @@ -62,7 +62,7 @@ public: Create(10, family, style, weight, underlined, face, encoding); SetPixelSize(pixelSize); } - + bool Create(int size, wxFontFamily family, wxFontStyle style, @@ -78,7 +78,6 @@ public: // implement base class pure virtuals virtual int GetPointSize() const; - virtual wxFontFamily GetFamily() const; virtual wxFontStyle GetStyle() const; virtual wxFontWeight GetWeight() const; virtual wxString GetFaceName() const; @@ -95,10 +94,7 @@ public: virtual void SetUnderlined( bool underlined ); virtual void SetEncoding(wxFontEncoding encoding); - WXDECLARE_COMPAT_SETTERS - - virtual void SetNoAntiAliasing( bool no = true ); - virtual bool GetNoAntiAliasing() const ; + wxDECLARE_COMMON_FONT_METHODS(); // implementation from now on void Unshare(); @@ -114,6 +110,8 @@ protected: virtual wxGDIRefData* CreateGDIRefData() const; virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; + virtual wxFontFamily DoGetFamily() const; + private: DECLARE_DYNAMIC_CLASS(wxFont) };