cursor handling fix

[wxWidgets.git] / src / mac / carbon / window.cpp

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 35913c0d0c2142afbbc5c81d5379bdd9e150a42b..295086cb603649499b4d75d37072ee3ec0303ec7 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1416,27 +1416,30 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
 
     wxASSERT_MSG( m_cursor.Ok(),
         wxT("cursor must be valid after call to the base version"));
 
     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 ?

     
     

-    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 ) )
+    wxWindowMac *mouseWin = 0 ;

     {
     {

-        if ( mouseWin == this && !wxIsBusy() )
-        {
-            m_cursor.MacInstall() ;
-        }
+        WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+        CGrafPtr savePort ;
+        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() ;
     }
     {
         m_cursor.MacInstall() ;
     }