Interface fixes for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-05-20 21:58:27 +00:00
parent 11716cbe14
commit 099243cb43

View File

@@ -300,7 +300,7 @@ public:
@false, the function will fail if an attribute is present in @a attr but not @false, the function will fail if an attribute is present in @a attr but not
in this object. in this object.
*/ */
bool EqPartial(const wxTextAttrEx& attr, bool weakTest = true) const; bool EqPartial(const wxTextAttr& attr, bool weakTest = true) const;
/** /**
@name GetXXX functions @name GetXXX functions
@@ -760,7 +760,7 @@ public:
Sets the attributes for the given font. Sets the attributes for the given font.
Note that wxTextAttr does not store an actual wxFont object. 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. Sets the font encoding.