From 099243cb43587ee0b0c6f751968168a9a99c1ff0 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 20 May 2012 21:58:27 +0000 Subject: [PATCH] Interface fixes for Phoenix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/textctrl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/wx/textctrl.h b/interface/wx/textctrl.h index 146201e99a..7909e59ee9 100644 --- a/interface/wx/textctrl.h +++ b/interface/wx/textctrl.h @@ -300,7 +300,7 @@ public: @false, the function will fail if an attribute is present in @a attr but not in this object. */ - bool EqPartial(const wxTextAttrEx& attr, bool weakTest = true) const; + bool EqPartial(const wxTextAttr& attr, bool weakTest = true) const; /** @name GetXXX functions @@ -760,7 +760,7 @@ public: Sets the attributes for the given font. Note that wxTextAttr does not store an actual wxFont object. */ - void SetFont(const wxFont& font, int flags = (wxTEXT_ATTR_FONT & ~wxTEXT_ATTR_FONT_PIXEL_SIZE)); + void SetFont(const wxFont& font, int flags = wxTEXT_ATTR_FONT & ~wxTEXT_ATTR_FONT_PIXEL_SIZE); /** Sets the font encoding. -- 2.47.2