X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c14b6c3241d48d9cc36a2fd0aeab0ba330d96de..2724d84bbefd440b4e63997eb45ec9636bcd955d:/include/wx/x11/font.h?ds=inline diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h index 300156f0bc..b2c8718392 100644 --- a/include/wx/x11/font.h +++ b/include/wx/x11/font.h @@ -45,6 +45,18 @@ public: Create(size, family, style, weight, underlined, face, encoding); } + wxFont(const wxSize& pixelSize, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined = false, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + Create(10, family, style, weight, underlined, face, encoding); + SetPixelSize(pixelSize); + } + bool Create(int size, wxFontFamily family, wxFontStyle style, @@ -68,7 +80,6 @@ public: // implement base class pure virtuals virtual int GetPointSize() const; - virtual wxFontFamily GetFamily() const; virtual wxFontStyle GetStyle() const; virtual wxFontWeight GetWeight() const; virtual bool GetUnderlined() const; @@ -86,10 +97,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 @@ -120,6 +128,7 @@ protected: virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); + virtual wxFontFamily DoGetFamily() const; void Unshare();