moving themeing include to private.h

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

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index ab8ba6b158e049fff758f3dd83df427d8df2374a..a1df4213036db53c38297982052b0529a4d88d2b 100644 (file)
--- 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 b7af874e97db34e7c06240877a4e1fe3b61543ef..c7583b9d88d430e73b730f7e9d634b0671a3bac2 100644 (file)
--- 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 fe15ff4051b56835ec559392ab995a7a31e16ec3..3cdc6a6f0680d97220609fdf4eb75e97e8a91506 100644 (file)
--- 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 7712c3b1436490e31fb6f4fa490c7ae2eaf8a3bc..58b988cd1bc936763f0a5109776e6a3100c68812 100644 (file)
--- 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 20136f008627679d0ec8f2f2257c010f7e3f8bf3..26c3b4fdd8a7c70615f49589896b9fe964db40fc 100644 (file)
--- 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 aaf764a566dbe139fa69857f625c9316633a9726..da83253eaa0f347e0a0ac7315322748dd2906d3a 100644 (file)
--- 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 b0138ca631aba0c03fe230dcca39e76f7b706e06..95dfc4a1bb17e24b38efb2d51bc7c64827ec6107 100644 (file)
--- 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 1081852ae7829e4931dabeb3fcc71196ddf5aec4..8a612a66dafe954942253f27918e4db7a3c08a11 100644 (file)
--- 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 4c873caa31242c17ee866053c9e17e721a19d0a9..fe3f3a18bf04befcb32db6abb0e69d7da3b83e59 100644 (file)
--- 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