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

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 1c3108308580f8a2c7892b6915276121f400482d..bf940a280d757da9312597a71b91d8bf3397871b 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -790,18 +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
     WindowRef tlwref = GetControlOwner( theControl ) ;
     
     GetControlBounds( theControl , bounds ) ;
 #if TARGET_API_MAC_OSX
     WindowRef tlwref = GetControlOwner( theControl ) ;

-    wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
+    wxWindow* tlwwx = (wxWindow*) wxFindWinFromMacWindow( tlwref ) ;

     ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
 
     HIPoint hiPoint = CGPointMake(  0 , 0 ) ;
 
     HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl  ) ;
     ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
 
     HIPoint hiPoint = CGPointMake(  0 , 0 ) ;
 
     HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl  ) ;

-    OffsetRect( bounds , hiPoint.x , hiPoint.y ) ;
+    OffsetRect( bounds , (short) (hiPoint.x) , (short) (hiPoint.y) ) ;

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