Implementing column click event handler and SortItems function for native list ctrl.

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index d5f59cef31745af5053a90363969c9130cd9f647..7da19bddc940e9b0552a6afd0452ec885ea37b94 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -13,6 +13,7 @@
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

+#include "wx/toplevel.h"

 #include "wx/dc.h"
 
 #ifndef __DARWIN__
 #include "wx/dc.h"
 
 #ifndef __DARWIN__


@@ -29,13 +30,10 @@
 #endif
 
 #ifndef __DARWIN__
 #endif
 
 #ifndef __DARWIN__

-#include <Scrap.h>
+#  include <Scrap.h>

 #endif
 #endif

-#include "wx/mac/uma.h"

 
 

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

 
 // 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


@@ -50,8 +48,6 @@ static bool sUMAHasAquaLayout = false ;
 
 static bool sUMAHasInittedAppearance = false;
 
 
 static bool sUMAHasInittedAppearance = false;
 

-extern int gAGABackgroundColor ;
-

 bool UMAHasAppearance() { return sUMAHasAppearance ; }
 long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
 long UMAGetSystemVersion() { return sUMASystemVersion ; }
 bool UMAHasAppearance() { return sUMAHasAppearance ; }
 long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
 long UMAGetSystemVersion() { return sUMASystemVersion ; }


@@ -856,7 +852,7 @@ Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds )
     WindowRef tlwref = GetControlOwner( theControl ) ;
 
     wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
     WindowRef tlwref = GetControlOwner( theControl ) ;
 
     wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;

-    if ( tlwwx != NULL && tlwwx->MacUsesCompositing() )
+    if ( tlwwx != NULL )

     {
         ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
         HIPoint hiPoint = CGPointMake( 0 , 0 ) ;
     {
         ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
         HIPoint hiPoint = CGPointMake( 0 , 0 ) ;