Fixed possibility of releasing mouse if the window no longer had it captured

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-12-17 20:57:55 +00:00
parent 90aaa86507
commit 18976605f5
4 changed files with 6 additions and 12 deletions

View File

@@ -139,7 +139,6 @@ END_EVENT_TABLE()
ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
capturedMouse = false;
wMain = win;
stc = win;
wheelRotation = 0;
@@ -221,16 +220,15 @@ void ScintillaWX::SetTicking(bool on) {
void ScintillaWX::SetMouseCapture(bool on) {
if (on && !capturedMouse)
if (on && !stc->HasCapture())
stc->CaptureMouse();
else if (!on && capturedMouse)
else if (!on && stc->HasCapture())
stc->ReleaseMouse();
capturedMouse = on;
}
bool ScintillaWX::HaveMouseCapture() {
return capturedMouse;
return stc->HasCapture();
}

View File

@@ -151,7 +151,6 @@ public:
void DoScrollToColumn(int column);
private:
bool capturedMouse;
wxStyledTextCtrl* stc;
#if wxUSE_DRAG_AND_DROP

View File

@@ -139,7 +139,6 @@ END_EVENT_TABLE()
ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
capturedMouse = false;
wMain = win;
stc = win;
wheelRotation = 0;
@@ -221,16 +220,15 @@ void ScintillaWX::SetTicking(bool on) {
void ScintillaWX::SetMouseCapture(bool on) {
if (on && !capturedMouse)
if (on && !stc->HasCapture())
stc->CaptureMouse();
else if (!on && capturedMouse)
else if (!on && stc->HasCapture())
stc->ReleaseMouse();
capturedMouse = on;
}
bool ScintillaWX::HaveMouseCapture() {
return capturedMouse;
return stc->HasCapture();
}

View File

@@ -151,7 +151,6 @@ public:
void DoScrollToColumn(int column);
private:
bool capturedMouse;
wxStyledTextCtrl* stc;
#if wxUSE_DRAG_AND_DROP