From ef08ab52840ccbe23084a814004f63c2a7b3bf92 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 24 Aug 2002 02:37:21 +0000 Subject: [PATCH] Ensure that the mouse is not captured in the calltip window git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/stc/ScintillaWX.cpp | 10 ++++++---- src/stc/ScintillaWX.cpp | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp index 10859100d6..1bf2c8800a 100644 --- a/contrib/src/stc/ScintillaWX.cpp +++ b/contrib/src/stc/ScintillaWX.cpp @@ -80,6 +80,10 @@ public: m_ct = ct; } + ~wxSTCCallTip() { + if (HasCapture()) ReleaseMouse(); + } + void OnPaint(wxPaintEvent& evt) { wxPaintDC dc(this); Surface* surfaceWindow = Surface::Allocate(); @@ -106,12 +110,10 @@ public: virtual bool Show( bool show = TRUE ) { bool retval = wxSTCCallTipBase::Show(show); - if (show) { + if (show) CaptureMouse(); - } - else { + else if (HasCapture()) ReleaseMouse(); - } return retval; } diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 10859100d6..1bf2c8800a 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -80,6 +80,10 @@ public: m_ct = ct; } + ~wxSTCCallTip() { + if (HasCapture()) ReleaseMouse(); + } + void OnPaint(wxPaintEvent& evt) { wxPaintDC dc(this); Surface* surfaceWindow = Surface::Allocate(); @@ -106,12 +110,10 @@ public: virtual bool Show( bool show = TRUE ) { bool retval = wxSTCCallTipBase::Show(show); - if (show) { + if (show) CaptureMouse(); - } - else { + else if (HasCapture()) ReleaseMouse(); - } return retval; } -- 2.50.0