fixing coordinate conversions

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 929be2b656103378f77d6e81d3309d8f2fc9ca27..119e67de76d74476e17b8d4e7f48f7d0f01453a7 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -2356,7 +2356,10 @@ void wxMacGlobalToLocal( WindowRef window , Point*pt )
 {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4 
     HIPoint p = CGPointMake( pt->h, pt->v );
-    HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceWindow, window );
+       HIViewRef contentView ;
+       // TODO check toolbar offset 
+    HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
+       HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView );
     pt->h = p.x;
     pt->v = p.y;
 #else
@@ -2368,7 +2371,10 @@ void wxMacLocalToGlobal( WindowRef window , Point*pt )
 {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4 
     HIPoint p = CGPointMake( pt->h, pt->v );
-    HIPointConvert( &p, kHICoordSpaceWindow, window, kHICoordSpace72DPIGlobal, NULL );
+       HIViewRef contentView ;
+       // TODO check toolbar offset 
+    HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
+    HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL );
     pt->h = p.x;
     pt->v = p.y;
 #else