moving themeing include to private.h

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

include/wx/osx/cocoa/private.h

@@ -23,6 +23,9 @@
 #if wxOSX_USE_ATSU_TEXT
     // we need theming and atsu
     #include <Carbon/Carbon.h>
+#else
+    // we only need theming, if we find a better include replace the following
+    #include <Carbon/Carbon.h>
 #endif
 
 #ifdef __OBJC__

src/aui/auibar.cpp

@@ -38,8 +38,6 @@
 
 #ifdef __WXMAC__
 #include "wx/osx/private.h"
-// for theming support
-#include <Carbon/Carbon.h>
 #endif
 
 #include "wx/arrimpl.cpp"

src/aui/auibook.cpp

@@ -35,8 +35,6 @@
 
 #ifdef __WXMAC__
 #include "wx/osx/private.h"
-// for theming support
-#include <Carbon/Carbon.h>
 #endif
 
 #include "wx/arrimpl.cpp"

src/aui/dockart.cpp

@@ -38,8 +38,6 @@
 #include "wx/osx/private.h"
 #include "wx/graphics.h"
 #include "wx/dcgraph.h"
-// for theming support
-#include <Carbon/Carbon.h>
 #endif
 
 #ifdef __WXGTK__

src/generic/listctrl.cpp

@@ -52,8 +52,6 @@
 
 #ifdef __WXMAC__
     #include "wx/osx/private.h"
-    // for theming support
-    #include <Carbon/Carbon.h>
 #endif
 
 #if defined(__WXMSW__) && !defined(__WXWINCE__) && !defined(__WXUNIVERSAL__)

src/osx/carbon/font.cpp

@@ -28,11 +28,6 @@
 
 #include "wx/osx/private.h"
 
-#if wxOSX_USE_ATSU_TEXT && !wxOSX_USE_CARBON
-// include theming support
-#include <Carbon/Carbon.h>
-#endif
-
 #include <map>
 #include <string>
 

src/osx/carbon/renderer.cpp

@@ -30,11 +30,6 @@
 #include "wx/dcgraph.h"
 #include "wx/osx/private.h"
 
-#if wxOSX_USE_COCOA
-// bring in the theme headers
-#include <Carbon/Carbon.h>
-#endif
-
 // check if we're currently in a paint event
 inline bool wxInPaintEvent(wxWindow* win, wxDC& dc)
 {

src/osx/utils_osx.cpp

@@ -40,12 +40,6 @@
 #endif
 
 #include "wx/osx/private.h"
-
-#if wxOSX_USE_COCOA
-// to get the theming APIs
-#include <Carbon/Carbon.h>
-#endif
-
 #include "wx/osx/private/timer.h"
 
 #include "wx/evtloop.h"

src/osx/window_osx.cpp

@@ -67,10 +67,6 @@
 #include "wx/osx/uma.h"
 #else
 #include "wx/osx/private.h"
-#if wxOSX_USE_COCOA
-// bring in theming
-#include <Carbon/Carbon.h>
-#endif
 #endif
 
 #define MAC_SCROLLBAR_SIZE 15