using separate imaglist on mac

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index bf940a280d757da9312597a71b91d8bf3397871b..807f122922a20b2bfea5f208353047740bcd8f32 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -33,6 +33,9 @@
 #endif
 #include "wx/mac/uma.h"
 
 #endif
 #include "wx/mac/uma.h"
 

+#if TARGET_API_MAC_OSX
+#include "wx/toplevel.h"
+#endif

 
 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of
 
 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of


@@ -790,18 +793,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 ) ;
-    

     GetControlBounds( theControl , bounds ) ;
 #if TARGET_API_MAC_OSX
     WindowRef tlwref = GetControlOwner( theControl ) ;
     GetControlBounds( theControl , bounds ) ;
 #if TARGET_API_MAC_OSX
     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) ) ;
+    wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
+    if ( tlwwx->MacUsesCompositing() )
+    {
+        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 ;
 }