From: Ryan Norton <wxprojects@comcast.net>
Date: Sat, 26 Feb 2005 10:00:30 +0000 (+0000)
Subject: Fix error and some warnings - wxTopLevelWindowMac needs toplevel.h, but we only need... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1b5bee64fda0bbabe4234aa7143c3d6de4496149

Fix error and some warnings - wxTopLevelWindowMac needs toplevel.h, but we only need a plain window - warnings are an unused variable (commented out) and passing floats in place of shorts - and why is this file in wxBase anyway?  Oh well...


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 1c31083085..bf940a280d 100644
--- 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)
 {
-    wxWindow* win = wxFindControlFromMacControl( theControl ) ;
+//    wxWindow* win = wxFindControlFromMacControl( 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  ) ;
-    OffsetRect( bounds , hiPoint.x , hiPoint.y ) ;
+    OffsetRect( bounds , (short) (hiPoint.x) , (short) (hiPoint.y) ) ;
 #endif
     return bounds ;
 }