Modified CaptureMouse to call DoReleaseMouse if necessary before

doing another DoCaptureMouse, because otherwise we have a nested
Capture which is not possible in some systems (the point of these
wrappers).
Also ReleaseMouse now calls DoCaptureMouse, not CaptureMouse, if
necessary.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 26cdbc173e44b7d8ec5c09053fb60becf48f6270..0f7a0231e31f02e74279726d82b094e1d4ee4422 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1704,6 +1704,7 @@ void wxWindowBase::CaptureMouse()
     wxWindow *winOld = GetCapture();
     if ( winOld )
     {
+       winOld->DoReleaseMouse();
         // save it on stack
         wxWindowNext *item = new wxWindowNext;
         item->win = winOld;
@@ -1725,7 +1726,7 @@ void wxWindowBase::ReleaseMouse()
 
     if ( ms_winCaptureNext )
     {
-        ms_winCaptureNext->win->CaptureMouse();
+        ms_winCaptureNext->win->DoCaptureMouse();
 
         wxWindowNext *item = ms_winCaptureNext;
         ms_winCaptureNext = item->next;