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

Applied patch #13698 to fix wrong border test

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2011-12-05 09:59:51 +00:00
parent dc1c249471
commit 83c6ae8e25
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/richtext/richtextbuffer.cpp
View File

@ -864,7 +864,7 @@ bool wxRichTextObject::GetBoxRects(wxDC& dc, wxRichTextBuffer* buffer, const wxR
marginRight = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetRight()); marginRight = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetRight());
if (attr.GetTextBoxAttr().GetMargins().GetTop().IsValid()) if (attr.GetTextBoxAttr().GetMargins().GetTop().IsValid())
marginTop = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetTop()); 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()); marginBottom = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetBottom());
if (attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth().IsValid()) 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()); borderRight = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetRight().GetWidth());
if (attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth().IsValid()) if (attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth().IsValid())
borderTop = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth()); 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()); borderBottom = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetBottom().GetWidth());
if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsValid()) if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsValid())