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

Fixed selection bug.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-10-31 06:53:55 +00:00
parent 861c549906
commit 2a7f5127e9
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/richtext/richtextbuffer.cpp
View File

@@ -1867,8 +1867,7 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, wxRichTextDrawingContext& cont
int flags = style; int flags = style;
if (selection.IsValid() && if (selection.IsValid() &&
((GetParentContainer() != this && selection.GetContainer() == this && selection.WithinSelection(GetRange().GetStart(), GetParentContainer())) || ((GetParentContainer() != this && selection.GetContainer() == this && selection.WithinSelection(GetRange().GetStart(), GetParentContainer()))))
(selection.WithinSelection(GetRange().GetStart(), this))))
{ {
flags |= wxRICHTEXT_DRAW_SELECTED; flags |= wxRICHTEXT_DRAW_SELECTED;
} }
@@ -9330,6 +9329,12 @@ wxRichTextCell::wxRichTextCell(wxRichTextObject* parent):
/// Draw the item /// Draw the item
bool wxRichTextCell::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) bool wxRichTextCell::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
{ {
if (selection.IsValid() &&
(selection.WithinSelection(GetRange().GetStart(), this)))
{
style |= wxRICHTEXT_DRAW_SELECTED;
}
return wxRichTextBox::Draw(dc, context, range, selection, rect, descent, style); return wxRichTextBox::Draw(dc, context, range, selection, rect, descent, style);
} }