From: Julian Smart Date: Fri, 28 Nov 2008 12:35:15 +0000 (+0000) Subject: wxRichTextCtrl no longer deletes a character when content is selected X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dc5de0dd3678b3d5307769643fbc5b9b726cfeef wxRichTextCtrl no longer deletes a character when content is selected before pressing Delete (fixes bug #10153). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index e987e6027a..1b321c28f1 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -872,13 +872,12 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) long newPos = m_caretPosition; - DeleteSelectedContent(& newPos); + bool processed = DeleteSelectedContent(& newPos); // Submit range in character positions, which are greater than caret positions, // so subtract 1 for deleted character and add 1 for conversion to character position. if (newPos > -1) { - bool processed = false; if (event.CmdDown()) { long pos = wxRichTextCtrl::FindNextWordPosition(-1); @@ -922,12 +921,11 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) long newPos = m_caretPosition; - DeleteSelectedContent(& newPos); + bool processed = DeleteSelectedContent(& newPos); // Submit range in character positions, which are greater than caret positions, if (newPos < GetBuffer().GetRange().GetEnd()+1) { - bool processed = false; if (event.CmdDown()) { long pos = wxRichTextCtrl::FindNextWordPosition(1);