Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correction for wxTextAttrCollectCommonAttributes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2014-02-27 10:07:16 +00:00
parent 69a029635d
commit ee6b548043
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/richtext/richtextbuffer.cpp
View File

@@ -14136,6 +14136,16 @@ void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAtt
currentStyle.RemoveFlag(wxTEXT_ATTR_LINE_SPACING); currentStyle.RemoveFlag(wxTEXT_ATTR_LINE_SPACING);
} }
if (attr.HasPageBreak() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_PAGE_BREAK))
{
currentStyle.SetPageBreak(true);
}
else if (!attr.HasPageBreak() && currentStyle.HasPageBreak())
{
clashingAttr.AddFlag(wxTEXT_ATTR_PAGE_BREAK);
currentStyle.RemoveFlag(wxTEXT_ATTR_PAGE_BREAK);
}
if (attr.HasCharacterStyleName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_CHARACTER_STYLE_NAME)) if (attr.HasCharacterStyleName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_CHARACTER_STYLE_NAME))
{ {
if (currentStyle.HasCharacterStyleName()) if (currentStyle.HasCharacterStyleName())