leave in only Julian's version of CaptureMouse code

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 6ffcaea012b9827bec575611f260bcc6d0c7315c..f1b4b5ef7c0461af924d3d232de55e9218ee7340 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1708,10 +1708,7 @@ void wxWindowBase::CaptureMouse()
     wxWindow *winOld = GetCapture();
     if ( winOld )
     {
     wxWindow *winOld = GetCapture();
     if ( winOld )
     {

-       // I think this is correct, but not compatible with some ports
-#if defined(__WXX11__) || defined(__WXMGL__)
-       ((wxWindowBase*) winOld)->DoReleaseMouse();
-#endif
+        ((wxWindowBase*) winOld)->DoReleaseMouse();

        
         // save it on stack
         wxWindowNext *item = new wxWindowNext;
        
         // save it on stack
         wxWindowNext *item = new wxWindowNext;


@@ -1734,12 +1731,7 @@ void wxWindowBase::ReleaseMouse()
 
     if ( ms_winCaptureNext )
     {
 
     if ( ms_winCaptureNext )
     {

-       // I think this is correct, but not compatible with some ports
-#if defined(__WXX11__) || defined(__WXMGL__)

         ((wxWindowBase*)ms_winCaptureNext->win)->DoCaptureMouse();
         ((wxWindowBase*)ms_winCaptureNext->win)->DoCaptureMouse();

-#else
-        ms_winCaptureNext->win->CaptureMouse();
-#endif

        
         wxWindowNext *item = ms_winCaptureNext;
         ms_winCaptureNext = item->next;
        
         wxWindowNext *item = ms_winCaptureNext;
         ms_winCaptureNext = item->next;