Fix error and some warnings - wxTopLevelWindowMac needs toplevel.h, but we only need...

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 9f577b30f575baf40e0fd5bc74b3e32a951837f1..bf940a280d757da9312597a71b91d8bf3397871b 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -194,7 +194,7 @@ long UMAGetProcessMode()
     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;
 
     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;
 

-    procno.highLongOfPSN = NULL ;
+    procno.highLongOfPSN = 0 ;

     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;


@@ -790,34 +790,18 @@ OSStatus UMAPutScrap( Size size , OSType type , void *data )
 
 Rect* UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds)
 {
 
 Rect* UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds)
 {

-    wxWindow* win = wxFindControlFromMacControl( theControl ) ;
+//    wxWindow* win = wxFindControlFromMacControl( theControl ) ;

     
     GetControlBounds( theControl , bounds ) ;
 #if TARGET_API_MAC_OSX
     
     GetControlBounds( theControl , bounds ) ;
 #if TARGET_API_MAC_OSX

-    if ( win != NULL && win->MacGetTopLevelWindow() != NULL )   
-    {
-        wxWindow* parent = win->GetParent() ;
-        if ( parent )
-        {
-            // the parent controls 'origin' expressed in its own
-            // window coordinates (explanation in window.cpp)
-            int x , y ;
-            x = 0 ;
-            y = 0 ;
-            
-            if ( !parent->IsTopLevel() )
-            {
-                x += parent->MacGetLeftBorderSize() ;
-                y += parent->MacGetTopBorderSize() ;
-            }
-            
-            parent->MacWindowToRootWindow( &x , & y ) ;
-            bounds->left += x ;
-            bounds->right += x ;
-            bounds->top += y ;
-            bounds->bottom += y ;
-        }
-    }
+    WindowRef tlwref = GetControlOwner( theControl ) ;
+    wxWindow* tlwwx = (wxWindow*) wxFindWinFromMacWindow( tlwref ) ;
+    ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
+
+    HIPoint hiPoint = CGPointMake(  0 , 0 ) ;
+
+    HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl  ) ;
+    OffsetRect( bounds , (short) (hiPoint.x) , (short) (hiPoint.y) ) ;

 #endif
     return bounds ;
 }
 #endif
     return bounds ;
 }