Added missing URL attribute testing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -6562,6 +6562,9 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, i
|
|||||||
attr1.GetFont().GetUnderlined() != attr2.GetFont().GetUnderlined())
|
attr1.GetFont().GetUnderlined() != attr2.GetFont().GetUnderlined())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if ((flags & wxTEXT_ATTR_URL) && attr1.GetURL() != attr2.GetURL())
|
||||||
|
return false;
|
||||||
|
|
||||||
if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment())
|
if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -6668,6 +6671,9 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2,
|
|||||||
attr1.GetFont().GetUnderlined() != attr2.GetFontUnderlined())
|
attr1.GetFont().GetUnderlined() != attr2.GetFontUnderlined())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if ((flags & wxTEXT_ATTR_URL) && attr1.GetURL() != attr2.GetURL())
|
||||||
|
return false;
|
||||||
|
|
||||||
if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment())
|
if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user