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
This commit is contained in:
@@ -328,17 +328,16 @@ void ScintillaWX::SetTicking(bool on) {
|
|||||||
|
|
||||||
void ScintillaWX::SetMouseCapture(bool on) {
|
void ScintillaWX::SetMouseCapture(bool on) {
|
||||||
if (mouseDownCaptures) {
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -328,17 +328,16 @@ void ScintillaWX::SetTicking(bool on) {
|
|||||||
|
|
||||||
void ScintillaWX::SetMouseCapture(bool on) {
|
void ScintillaWX::SetMouseCapture(bool on) {
|
||||||
if (mouseDownCaptures) {
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user