summaryrefslogtreecommitdiffstats
path: root/scintilla/src
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@users.sourceforge.net>2010-12-11 14:20:39 +0000
committerXhmikosR <xhmikosr@users.sourceforge.net>2010-12-11 14:20:39 +0000
commite2056e071c7ea4b14373cf57f0d14b7e9fa71961 (patch)
tree090c4d3c032f637ec87e32401635a2c536d3ded8 /scintilla/src
parent19ecbaf04525ab5359bcf128ec72af0a7663e27e (diff)
downloadnotepad2-mod-e2056e071c7ea4b14373cf57f0d14b7e9fa71961.zip
notepad2-mod-e2056e071c7ea4b14373cf57f0d14b7e9fa71961.tar.gz
notepad2-mod-e2056e071c7ea4b14373cf57f0d14b7e9fa71961.tar.bz2
update scintilla to the latest HG (12112010)
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@326 28bd50df-7adb-d945-0439-6e466c6a13cc
Diffstat (limited to 'scintilla/src')
-rw-r--r--scintilla/src/Editor.cxx4
-rw-r--r--scintilla/src/Editor.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx
index a463611..f6c8fa0 100644
--- a/scintilla/src/Editor.cxx
+++ b/scintilla/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/scintilla/src/Editor.h b/scintilla/src/Editor.h
index 50cce72..9872388 100644
--- a/scintilla/src/Editor.h
+++ b/scintilla/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();