cursor handling fix

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

src/mac/carbon/window.cpp

@@ -1417,26 +1417,29 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
     wxASSERT_MSG( m_cursor.Ok(),
         wxT("cursor must be valid after call to the base version"));
     
-    /*
     
-    TODO why do we have to use current coordinates ?
+    wxWindowMac *mouseWin = 0 ;
-    
-    Point pt ;
-    wxWindowMac *mouseWin ;
-    GetMouse( &pt ) ;
-
-    // Change the cursor NOW if we're within the correct window
-
-    
-    if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
     {
-        if ( mouseWin == this && !wxIsBusy() )
+        WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
-        {
+        CGrafPtr savePort ;
-            m_cursor.MacInstall() ;
+        Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ;
-        }
+        
+        // TODO If we ever get a GetCurrentEvent.. replacement for the mouse
+        // position, use it...
+        
+        Point pt ;
+        GetMouse( &pt ) ;
+        ControlPartCode part ;
+        ControlRef control ;
+        control = wxMacFindControlUnderMouse( pt , window , &part ) ;
+        if ( control )
+            mouseWin = wxFindControlFromMacControl( control ) ;
+        
+        if ( swapped )
+            QDSwapPort( savePort , NULL ) ;
     }
-    */
+
-    if ( !wxIsBusy() )
+    if ( mouseWin == this && !wxIsBusy() )
     {
         m_cursor.MacInstall() ;
     }