OSX two-level header fixes

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index c0af2ac2564d6427b09314cf8aef2401184eaf22..8d223f8da074d8afa2801d7de8d5f73d648c5557 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -57,11 +57,8 @@
 #endif
 
 #if defined(__WXMAC__)
-    // VZ: MacTypes.h is enough under Mac OS X (where I could test it) but
-    //     I don't know which headers are needed under earlier systems so
-    //     include everything when in doubt
     #ifdef __DARWIN__
-        #include  "MacTypes.h"
+        #include  <CoreServices/CoreServices.h>
     #else
         #include  "wx/mac/private.h"  // includes mac headers
     #endif

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index ac467d90d873a7ef4933c2bac78d97578c208f12..d6d4dd5a54be7d162df0ee3cfb8cf0d81753167c 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -36,10 +36,13 @@
 #endif
 
 #ifdef __WXMAC__
-    #include <ATSUnicode.h>
-    #include <TextCommon.h>
-    #include <TextEncodingConverter.h>
-
+#ifdef __DARWIN__
+#include <Carbon/Carbon.h>
+#else
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>
+#endif
     #include "wx/fontutil.h"
     #include "wx/mac/private.h"  // includes mac headers
 

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 40bc93d8716be48732e200d33fc2425bc5123e4f..ed6cb03ae8895e375bc8a7c2f32a93c508b13a3f 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -75,9 +75,11 @@
 #include "wx/utils.h"
 
 #ifdef __WXMAC__
+#ifndef __DARWIN__
 #include <ATSUnicode.h>
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>
+#endif
 
 #include  "wx/mac/private.h"  // includes mac headers
 #endif