aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authornyamatongwe <unknown>2000-07-15 07:39:02 +0000
committernyamatongwe <unknown>2000-07-15 07:39:02 +0000
commitfbc8d3a114b6fdf12dfe6f56e3893f935dcb74c3 (patch)
tree82c3a4e690d961ad4fc9d74a8ca09dc44f925d4e /src
parent610b069a39986a922b2281bfb9c8a9d07561cafc (diff)
downloadscintilla-mirror-fbc8d3a114b6fdf12dfe6f56e3893f935dcb74c3.tar.gz
Fixed problem with CancelModes killing drag and drop by setting empty
selection. On GTK+ double click GTK+ events are ignored as this led to prblems in primary selection code.
Diffstat (limited to 'src')
-rw-r--r--src/Editor.cxx3
-rw-r--r--src/ScintillaBase.cxx4
-rw-r--r--src/ScintillaBase.h2
3 files changed, 4 insertions, 5 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx
index cec634363..e7e415c7b 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -117,7 +117,7 @@ Editor::~Editor() {
}
void Editor::Finalise() {
- CancelModes();
+ CancelModes();
}
void Editor::DropGraphics() {
@@ -1960,7 +1960,6 @@ void Editor::LineTranspose() {
}
void Editor::CancelModes() {
- SetEmptySelection(currentPos);
}
int Editor::KeyCommand(UINT iMessage) {
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index d381b6739..0d5226f4d 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -283,11 +283,11 @@ void ScintillaBase::ContextMenu(Point pt) {
void ScintillaBase::CancelModes() {
AutoCompleteCancel();
ct.CallTipCancel();
- Editor::CancelModes();
+ Editor::CancelModes();
}
void ScintillaBase::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {
- CancelModes();
+ CancelModes();
Editor::ButtonDown(pt, curTime, shift, ctrl, alt);
}
diff --git a/src/ScintillaBase.h b/src/ScintillaBase.h
index 2e7402a1c..23d31dfd1 100644
--- a/src/ScintillaBase.h
+++ b/src/ScintillaBase.h
@@ -47,7 +47,7 @@ protected:
virtual void AddCharUTF(char *s, unsigned int len);
void Command(int cmdId);
- virtual void CancelModes();
+ virtual void CancelModes();
virtual int KeyCommand(UINT iMessage);
void AutoCompleteStart(int lenEntered, const char *list);