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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index a27fe5126b5596560b89fa1f094997f5dc41e690..764048fbc2ef05e6af89c98e3e73cbe9021e57cb 100644 (file)
--- 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) {
 
 void ScintillaWX::SetMouseCapture(bool on) {
     if (mouseDownCaptures) {

-        if (on && !stc->HasCapture())
+        if (on && !capturedMouse)

             stc->CaptureMouse();
             stc->CaptureMouse();

-        else if (!on && stc->HasCapture())
+        else if (!on && capturedMouse && stc->HasCapture())

             stc->ReleaseMouse();
             stc->ReleaseMouse();

-        capturedMouse = stc->HasCapture();
+        capturedMouse = on;

     }
 }
 
 
 bool ScintillaWX::HaveMouseCapture() {
     }
 }
 
 
 bool ScintillaWX::HaveMouseCapture() {

-    capturedMouse = stc->HasCapture();

     return capturedMouse;
 }
 
     return capturedMouse;
 }
 

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index a27fe5126b5596560b89fa1f094997f5dc41e690..764048fbc2ef05e6af89c98e3e73cbe9021e57cb 100644 (file)
--- 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) {
 
 void ScintillaWX::SetMouseCapture(bool on) {
     if (mouseDownCaptures) {

-        if (on && !stc->HasCapture())
+        if (on && !capturedMouse)

             stc->CaptureMouse();
             stc->CaptureMouse();

-        else if (!on && stc->HasCapture())
+        else if (!on && capturedMouse && stc->HasCapture())

             stc->ReleaseMouse();
             stc->ReleaseMouse();

-        capturedMouse = stc->HasCapture();
+        capturedMouse = on;

     }
 }
 
 
 bool ScintillaWX::HaveMouseCapture() {
     }
 }
 
 
 bool ScintillaWX::HaveMouseCapture() {

-    capturedMouse = stc->HasCapture();

     return capturedMouse;
 }
 
     return capturedMouse;
 }