moving cursor update AFTER the mouse event handling, otherwise things like eg drawing...

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index c689ec094316e65c4a9b7fdd23f41d99a5cde7d8..659e5ba78e02426b01fe6e2746bee01b3ba95a63 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -509,18 +509,6 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
         
         wxevent.SetEventObject( currentMouseWindow ) ;
 
         
         wxevent.SetEventObject( currentMouseWindow ) ;
 

-        // update cursor
-        
-        wxWindow* cursorTarget = currentMouseWindow ;
-        wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ;
-
-        while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
-        {
-            cursorTarget = cursorTarget->GetParent() ;
-            if ( cursorTarget )
-                cursorPoint += cursorTarget->GetPosition() ;
-        }
-

         // make tooltips current
         
     #if wxUSE_TOOLTIPS
         // make tooltips current
         
     #if wxUSE_TOOLTIPS


@@ -568,6 +556,19 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
             wxTheApp->s_captureWindow = NULL ;
             // update cursor ?
          }
             wxTheApp->s_captureWindow = NULL ;
             // update cursor ?
          }

+
+        // update cursor
+        
+        wxWindow* cursorTarget = currentMouseWindow ;
+        wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ;
+
+        while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
+        {
+            cursorTarget = cursorTarget->GetParent() ;
+            if ( cursorTarget )
+                cursorPoint += cursorTarget->GetPosition() ;
+        }
+

     } // else if ( currentMouseWindow )
     else
     {
     } // else if ( currentMouseWindow )
     else
     {