From 555accf41fe87c0c16d4fdba968459265384fba3 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 22 Apr 2008 07:57:16 +0000 Subject: [PATCH] Two bug fixes for FindWrapPosition git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index d308d1c70b..d4003405c0 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -4124,6 +4124,9 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex /// Find a suitable wrap position. bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition) { + if (range.GetLength() <= 0) + return false; + // Find the first position where the line exceeds the available space. wxSize sz; long breakPosition = range.GetEnd(); @@ -4143,7 +4146,7 @@ bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& d { int widthFromStartOfThisRange = g_GlobalPartialTextExtents[i - GetRange().GetStart()] - widthBefore; - if (widthFromStartOfThisRange >= availableSpace) + if (widthFromStartOfThisRange > availableSpace) { breakPosition = i-1; break;