From 0a84f928e9a273248a4843f6282507a39212d2d1 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 21 Sep 2009 12:57:12 +0000
Subject: [PATCH] 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 | 3 +++
 src/aui/auibar.cpp             | 2 --
 src/aui/auibook.cpp            | 2 --
 src/aui/dockart.cpp            | 2 --
 src/generic/listctrl.cpp       | 2 --
 src/osx/carbon/font.cpp        | 5 -----
 src/osx/carbon/renderer.cpp    | 5 -----
 src/osx/utils_osx.cpp          | 6 ------
 src/osx/window_osx.cpp         | 4 ----
 9 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index ab8ba6b158..a1df421303 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/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__
diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index b7af874e97..c7583b9d88 100644
--- a/src/aui/auibar.cpp
+++ b/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"
diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index fe15ff4051..3cdc6a6f06 100644
--- a/src/aui/auibook.cpp
+++ b/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"
diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 7712c3b143..58b988cd1b 100644
--- a/src/aui/dockart.cpp
+++ b/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__
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 20136f0086..26c3b4fdd8 100644
--- a/src/generic/listctrl.cpp
+++ b/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__)
diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index aaf764a566..da83253eaa 100644
--- a/src/osx/carbon/font.cpp
+++ b/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>
 
diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp
index b0138ca631..95dfc4a1bb 100644
--- a/src/osx/carbon/renderer.cpp
+++ b/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)
 {
diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp
index 1081852ae7..8a612a66da 100644
--- a/src/osx/utils_osx.cpp
+++ b/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"
diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 4c873caa31..fe3f3a18bf 100644
--- a/src/osx/window_osx.cpp
+++ b/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
-- 
2.45.2