From 83c6ae8e25440be8ca4c3ebb1cf950641a6e4374 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 5 Dec 2011 09:59:51 +0000 Subject: [PATCH] Applied patch #13698 to fix wrong border test git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 95a207c3a5..ad0b3c1047 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -864,7 +864,7 @@ bool wxRichTextObject::GetBoxRects(wxDC& dc, wxRichTextBuffer* buffer, const wxR marginRight = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetRight()); if (attr.GetTextBoxAttr().GetMargins().GetTop().IsValid()) marginTop = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetTop()); - if (attr.GetTextBoxAttr().GetMargins().GetLeft().IsValid()) + if (attr.GetTextBoxAttr().GetMargins().GetBottom().IsValid()) marginBottom = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetBottom()); if (attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth().IsValid()) @@ -873,7 +873,7 @@ bool wxRichTextObject::GetBoxRects(wxDC& dc, wxRichTextBuffer* buffer, const wxR borderRight = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetRight().GetWidth()); if (attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth().IsValid()) borderTop = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth()); - if (attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth().IsValid()) + if (attr.GetTextBoxAttr().GetBorder().GetBottom().GetWidth().IsValid()) borderBottom = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetBottom().GetWidth()); if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsValid()) -- 2.45.2