aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authornyamatongwe <unknown>2010-12-11 11:05:12 +1100
committernyamatongwe <unknown>2010-12-11 11:05:12 +1100
commit556ee24396ed972afe813cb35c2d93d49b6a3401 (patch)
tree15493935dd13ea38d15d41729573db1e4d2dad51 /src
parenta6636eb563da3108fe1a185cd442bb60cf873181 (diff)
downloadscintilla-mirror-556ee24396ed972afe813cb35c2d93d49b6a3401.tar.gz
Make multiple selection multi-paste work when multi-type is off. Bug #3126221.
Diffstat (limited to 'src')
-rw-r--r--src/Editor.cxx4
-rw-r--r--src/Editor.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 6cf8d7490..5ed69b36b 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -3912,8 +3912,8 @@ void Editor::InsertPaste(SelectionPosition selStart, const char *text, int len)
}
}
-void Editor::ClearSelection() {
- if (!sel.IsRectangular())
+void Editor::ClearSelection(bool retainMultipleSelections) {
+ if (!sel.IsRectangular() && !retainMultipleSelections)
FilterSelections();
UndoGroup ug(pdoc);
for (size_t r=0; r<sel.Count(); r++) {
diff --git a/src/Editor.h b/src/Editor.h
index 50948e2e3..288addee0 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -391,7 +391,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
void AddChar(char ch);
virtual void AddCharUTF(char *s, unsigned int len, bool treatAsDBCS=false);
void InsertPaste(SelectionPosition selStart, const char *text, int len);
- void ClearSelection();
+ void ClearSelection(bool retainMultipleSelections=false);
void ClearAll();
void ClearDocumentStyle();
void Cut();