From 752801be6d9a4e21f8cceb214543c71aad732345 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 28 Nov 2008 12:34:55 +0000 Subject: [PATCH] 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/branches/WX_2_8_BRANCH@56990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 2 ++ src/richtext/richtextctrl.cpp | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index b6e362f389..93f1a4212e 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -103,6 +103,8 @@ All (GUI): Also fixed a bug whereby e.g. Croatian keys didn't work, by moving more code to key down handler. - Fixed a problem with HTML list generation for wxRichTextCtrl. +- wxRichTextCtrl no longer deletes a character when content is selected + before pressing Delete. - Fixed wxHTML's pagebreaks computation in tables (D.J.Stauffer). - Fixed wxHtmlWindow::SelectionToText() to correctly insert newlines after single-cell paragraphs. diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index c73bcf833d..aad762ab6c 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -760,13 +760,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); @@ -865,13 +864,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);