summaryrefslogtreecommitdiffstats
path: root/scintilla/src
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@users.sourceforge.net>2010-11-20 23:40:33 +0000
committerXhmikosR <xhmikosr@users.sourceforge.net>2010-11-20 23:40:33 +0000
commiteb0f534202378d82596dc11ecbf470f63a831a89 (patch)
tree97db0f931c2ca783762eb6642e084ddf20d2bb74 /scintilla/src
parent9c707dc7c90022b9a8811285c68565cddf6ab1bf (diff)
downloadnotepad2-mod-eb0f534202378d82596dc11ecbf470f63a831a89.zip
notepad2-mod-eb0f534202378d82596dc11ecbf470f63a831a89.tar.gz
notepad2-mod-eb0f534202378d82596dc11ecbf470f63a831a89.tar.bz2
update scintilla to the latest HG
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@250 28bd50df-7adb-d945-0439-6e466c6a13cc
Diffstat (limited to 'scintilla/src')
-rw-r--r--scintilla/src/Editor.cxx2
-rw-r--r--scintilla/src/Selection.cxx5
-rw-r--r--scintilla/src/Selection.h1
3 files changed, 7 insertions, 1 deletions
diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx
index 5060066..a463611 100644
--- a/scintilla/src/Editor.cxx
+++ b/scintilla/src/Editor.cxx
@@ -708,7 +708,7 @@ void Editor::SetRectangularRange() {
if (line == lineAnchor)
sel.SetSelection(range);
else
- sel.AddSelection(range);
+ sel.AddSelectionWithoutTrim(range);
}
}
}
diff --git a/scintilla/src/Selection.cxx b/scintilla/src/Selection.cxx
index d33bd02..0fff045 100644
--- a/scintilla/src/Selection.cxx
+++ b/scintilla/src/Selection.cxx
@@ -291,6 +291,11 @@ void Selection::AddSelection(SelectionRange range) {
mainRange = ranges.size() - 1;
}
+void Selection::AddSelectionWithoutTrim(SelectionRange range) {
+ ranges.push_back(range);
+ mainRange = ranges.size() - 1;
+}
+
void Selection::TentativeSelection(SelectionRange range) {
if (!tentativeMain) {
rangesSaved = ranges;
diff --git a/scintilla/src/Selection.h b/scintilla/src/Selection.h
index c7f2062..890bc78 100644
--- a/scintilla/src/Selection.h
+++ b/scintilla/src/Selection.h
@@ -166,6 +166,7 @@ public:
void TrimSelection(SelectionRange range);
void SetSelection(SelectionRange range);
void AddSelection(SelectionRange range);
+ void AddSelectionWithoutTrim(SelectionRange range);
void TentativeSelection(SelectionRange range);
void CommitTentative();
int CharacterInSelection(int posCharacter) const;