X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7e99122a0f181d199be3ec6c3928109c2bdf76b..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/include/wx/gtk/font.h?ds=sidebyside diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 8d1168f0e0..a218a29dfe 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -2,7 +2,6 @@ // Name: wx/gtk/font.h // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,7 +18,8 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase public: wxFont() { } - // wxGTK-specific + wxFont(const wxFontInfo& info); + wxFont(const wxString& nativeFontInfoString) { Create(nativeFontInfoString); @@ -63,12 +63,6 @@ public: SetPixelSize(pixelSize); } - wxFont(int pointSize, - wxFontFamily family, - int flags = wxFONTFLAG_DEFAULT, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - bool Create(int size, wxFontFamily family, wxFontStyle style, @@ -104,16 +98,12 @@ public: wxDECLARE_COMMON_FONT_METHODS(); - // Set Pango attributes for the span 0..len (or - // without any bounds if len == 0) in the specified layout. Currently only + // Set Pango attributes in the specified layout. Currently only // underlined and strike-through attributes are handled by this function. // - // Special "addDummyAttrs" parameter is used to work around a bug in old Pango - // versions in wxWindowDCImpl::DoDrawText(), see comment there. - // // If neither of them is specified, returns false, otherwise sets up the // attributes and returns true. - bool GTKSetPangoAttrs(PangoLayout* layout, size_t len = 0, bool addDummyAttrs = false) const; + bool GTKSetPangoAttrs(PangoLayout* layout) const; // implementation from now on void Unshare(); @@ -123,15 +113,14 @@ public: protected: virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); - // common part of all ctors - void Init(); - virtual wxGDIRefData* CreateGDIRefData() const; virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; virtual wxFontFamily DoGetFamily() const; private: + void Init(); + DECLARE_DYNAMIC_CLASS(wxFont) };