From 907de3d67de5e1365d7c93c597dcfd9ae7373351 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Tue, 25 Mar 2014 23:27:19 +1100
Subject: Bug [#1587]. WM_LBUTTONDBLCLK was no longer sent to window.

---
 doc/ScintillaHistory.html | 4 ++++
 win32/ScintillaWin.cxx    | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 5005b3003..b1b25eb45 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -473,6 +473,10 @@
 	Bug fixed where automatic indentation wrong when caret in virtual space.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1586/">Bug #1586</a>.
 	</li>
+	<li>
+	Bug fixed on Windows where WM_LBUTTONDBLCLK was no longer sent to window.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1587/">Bug #1587</a>.
+	</li>
     </ul>
     <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite340.zip?download">Release 3.4.0</a>
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index b9eefec37..10d6639e5 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -242,7 +242,7 @@ class ScintillaWin :
 	virtual void SetCtrlID(int identifier);
 	virtual int GetCtrlID();
 	virtual void NotifyParent(SCNotification scn);
-	virtual void NotifyDoubleClick(Point pt, bool shift, bool ctrl, bool alt);
+	virtual void NotifyDoubleClick(Point pt, int modifiers);
 	virtual CaseFolder *CaseFolderForEncoding();
 	virtual std::string CaseMapString(const std::string &s, int caseMapping);
 	virtual void Copy();
@@ -1422,13 +1422,13 @@ void ScintillaWin::NotifyParent(SCNotification scn) {
 	              GetCtrlID(), reinterpret_cast<LPARAM>(&scn));
 }
 
-void ScintillaWin::NotifyDoubleClick(Point pt, bool shift, bool ctrl, bool alt) {
+void ScintillaWin::NotifyDoubleClick(Point pt, int modifiers) {
 	//Platform::DebugPrintf("ScintillaWin Double click 0\n");
-	ScintillaBase::NotifyDoubleClick(pt, shift, ctrl, alt);
+	ScintillaBase::NotifyDoubleClick(pt, modifiers);
 	// Send myself a WM_LBUTTONDBLCLK, so the container can handle it too.
 	::SendMessage(MainHWND(),
 			  WM_LBUTTONDBLCLK,
-			  shift ? MK_SHIFT : 0,
+			  (modifiers & SCI_SHIFT) ? MK_SHIFT : 0,
 			  MAKELPARAM(pt.x, pt.y));
 }
 
-- 
cgit v1.2.3