From 134d7051bf501b1c07ac6963b38203bcfce1b6d4 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 13 Jul 2006 00:18:04 +0000 Subject: [PATCH] Reverted part of rev 1.92. It causes probelms on Windows when scrolling with the scrollbars since the mouse can be captured nativly momentarily. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/stc/ScintillaWX.cpp | 7 +++---- src/stc/ScintillaWX.cpp | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp index a27fe5126b..764048fbc2 100644 --- a/contrib/src/stc/ScintillaWX.cpp +++ b/contrib/src/stc/ScintillaWX.cpp @@ -328,17 +328,16 @@ void ScintillaWX::SetTicking(bool on) { void ScintillaWX::SetMouseCapture(bool on) { if (mouseDownCaptures) { - if (on && !stc->HasCapture()) + if (on && !capturedMouse) stc->CaptureMouse(); - else if (!on && stc->HasCapture()) + else if (!on && capturedMouse && stc->HasCapture()) stc->ReleaseMouse(); - capturedMouse = stc->HasCapture(); + capturedMouse = on; } } bool ScintillaWX::HaveMouseCapture() { - capturedMouse = stc->HasCapture(); return capturedMouse; } diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index a27fe5126b..764048fbc2 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -328,17 +328,16 @@ void ScintillaWX::SetTicking(bool on) { void ScintillaWX::SetMouseCapture(bool on) { if (mouseDownCaptures) { - if (on && !stc->HasCapture()) + if (on && !capturedMouse) stc->CaptureMouse(); - else if (!on && stc->HasCapture()) + else if (!on && capturedMouse && stc->HasCapture()) stc->ReleaseMouse(); - capturedMouse = stc->HasCapture(); + capturedMouse = on; } } bool ScintillaWX::HaveMouseCapture() { - capturedMouse = stc->HasCapture(); return capturedMouse; } -- 2.45.2