No changes, just refactor common code in wxImage cloning functions.

[wxWidgets.git] / src / common / textcmn.cpp

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index fa4d41ffbca30ccf3157da7522dd20d4ad566224..473de1178f8e8f18e756bff5c0fa9bb91ed9261e 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -188,9 +188,11 @@ bool wxTextAttr::operator== (const wxTextAttr& attr) const
             GetURL() == attr.GetURL();
 }
 
             GetURL() == attr.GetURL();
 }
 

-// Partial equality test taking flags into account
-bool wxTextAttr::EqPartial(const wxTextAttr& attr, int flags) const
+// Partial equality test. Only returns false if an attribute doesn't match.
+bool wxTextAttr::EqPartial(const wxTextAttr& attr) const

 {
 {

+    int flags = attr.GetFlags();
+    

     if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && GetTextColour() != attr.GetTextColour())
         return false;
 
     if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && GetTextColour() != attr.GetTextColour())
         return false;