From ee6b5480430b41b705d925464ad7cba2877ab44d Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 27 Feb 2014 10:07:16 +0000
Subject: [PATCH] Correction for wxTextAttrCollectCommonAttributes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/richtext/richtextbuffer.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 92cb22668a..17d727401d 100644
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -14136,6 +14136,16 @@ void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAtt
         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 (currentStyle.HasCharacterStyleName())