X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c14b6c3241d48d9cc36a2fd0aeab0ba330d96de..20fb9ddf29c84e9684f79bc55cc38fe5b665fae9:/include/wx/gtk/font.h?ds=sidebyside diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 2743dca469..0f446d745c 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -20,9 +20,9 @@ public: wxFont() { } // wxGTK-specific - wxFont(const wxString& fontname) + wxFont(const wxString& nativeFontInfoString) { - Create(fontname); + Create(nativeFontInfoString); } wxFont(const wxNativeFontInfo& info); @@ -51,6 +51,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, @@ -83,7 +95,7 @@ public: virtual void SetUnderlined( bool underlined ); virtual void SetEncoding(wxFontEncoding encoding); - WXDECLARE_COMPAT_SETTERS + wxDECLARE_COMMON_FONT_METHODS(); virtual void SetNoAntiAliasing( bool no = true ); virtual bool GetNoAntiAliasing() const ;