From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 30 Aug 2010 08:47:23 +0000 (+0000)
Subject: Don't add space before para twice in paragraph layout
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/602a592c226820703525c6ee99102e0e9859f079

Don't add space before para twice in paragraph layout
Discard attributes from empty text object when merging


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index ab926437d8..fb45e814cd 100644
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -3594,7 +3594,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
     // Apply styles to wrapped lines
     ApplyParagraphStyle(attr, rect, dc);
 
-    SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceBeforePara + spaceAfterPara));
+    SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceAfterPara));
 
     m_dirty = false;