OSX two-level header fixes

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 1ace26ef2db4e71ae49b1636c4aa770a5ff245c9..cd13eb058882e55cee011b27bd59f164cbde7523 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -79,8 +79,12 @@
 #endif
 
 #ifdef __WXMAC__
+#ifndef __DARWIN__
     #include <Timer.h>
     #include <DriverServices.h>
+#else
+    #include <Carbon/Carbon.h>
+#endif
 #endif
 
 #ifdef __WXPALMOS__

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 77b77f2055a72f46aa1288c9f3aae066705e1a0c..9eb1a44cb6f8fe19f5db00bd31c744ea8d9060ed 100644 (file)
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -25,7 +25,9 @@
 #include "wx/arrstr.h"
 
 #include "wx/mac/uma.h"
+#ifndef __DARWIN__
 #include <Appearance.h>
+#endif
 
 // ============================================================================
 // implementation of wxCheckListBox

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index 65401b5f33931e1ba76073fe81b588886540ec25..6096d47388640f283388b078897d44a19536eac1 100644 (file)
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -37,7 +37,9 @@
 #include "wx/image.h"
 #include "wx/metafile.h"
 #include "wx/mac/private.h"
+#ifndef __DARWIN__
 #include <Scrap.h>
+#endif
 
 // ----------------------------------------------------------------------------
 // functions

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 3d7902505911e40cf8f9169d9d9f31347e0d5aa1..d4dc936fcd1dbdcbd81971068b9a3ecc5f2b6375 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -32,9 +32,11 @@ using namespace std ;
 #endif
 
 #include "wx/mac/private.h"
+#ifndef __DARWIN__
 #include <ATSUnicode.h>
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>
+#endif
 
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index 60a898e95ad406d70c0a5abae1f7bcf5d0a71fca..8e81c44804a17f996a7c1bbf89b3ed9df304149f 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -33,7 +33,9 @@ IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 
 #include "wx/mac/private.h"
 
+#ifndef __DARWIN__
 #include <Navigation.h>
+#endif
 
 #include "MoreFilesX.h"
 

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 8029ee53ec56c28b274779f6c31aaf12360f6b94..0a3f6497c22cffb1dfecf5adee83c68b662ca148 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -24,7 +24,9 @@
 #include "wx/fontutil.h"
 
 #include "wx/mac/private.h"
+#ifndef __DARWIN__
 #include <ATSUnicode.h>
+#endif
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)

diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp
index a461af5ef69ccbe9fd6ce2e2195a833d43977ae7..623a4d9c01e0b2e8c440dd7ca090186edc837b07 100644 (file)
--- a/src/mac/carbon/mediactrl.cpp
+++ b/src/mac/carbon/mediactrl.cpp
@@ -66,9 +66,13 @@
 //uma is for wxMacFSSpec
 #include "wx/mac/uma.h"
 #include "wx/timer.h"
+#ifndef __DARWIN__
 #include <Movies.h>
 #include <Gestalt.h>
 #include <QuickTimeComponents.h>    //Standard QT stuff
+#else
+#include <QuickTime/QuickTimeComponents.h>
+#endif
 
 //Determines whether version 4 of QT is installed (Pretty much for classic only)
 Boolean _wxIsQuickTime4Installed (void)

diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp
index 0ff7a6c09d2414b2bd8f147ab350491fcecfde95..847502c1b7c7c442382e165bc416df3ad94bc8ec 100644 (file)
--- a/src/mac/carbon/mimetmac.cpp
+++ b/src/mac/carbon/mimetmac.cpp
@@ -58,8 +58,10 @@
 
 // other standard headers
 #include <ctype.h>
-#include <InternetConfig.h> //For mime types
 
+#ifndef __DARWIN__
+#include <InternetConfig.h> //For mime types
+#endif
 
 /*   START CODE SAMPLE FROM TECHNOTE 1002 (http://developer.apple.com/technotes/tn/tn1002.html) */
 
@@ -389,7 +391,7 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd,
 #if defined(__DARWIN__)
 
 //on darwin, use launch services
-#include "LaunchServices.h"
+#include <ApplicationServices/ApplicationServices.h>
 
 wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
 {

diff --git a/src/mac/carbon/sound.cpp b/src/mac/carbon/sound.cpp
index a4704e9b1c56f1deace524e026875b71d35a223c..b63f9639290542f6d6475a04a4584a43eae639e8 100644 (file)
--- a/src/mac/carbon/sound.cpp
+++ b/src/mac/carbon/sound.cpp
@@ -45,9 +45,11 @@
 
 #ifdef __WXMAC__
 #include "wx/mac/uma.h"
+#ifndef __DARWIN__
 #include <Movies.h>
 #include <Gestalt.h>
 #endif
+#endif
 
 #if defined __WXMAC__ && defined __DARWIN__/*TARGET_CARBON*/
 #ifdef __APPLE_CC__
@@ -64,7 +66,11 @@
 #include <qtml.h>
 #endif
 
+#ifndef __DARWIN__
 #include <QuickTimeComponents.h>
+#else
+#include <QuickTime/QuickTimeComponents.h>
+#endif
 
 //Time between timer calls
 #define MOVIE_DELAY 100

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index ccbfe3de4e46e1d8d23735791bbdf49c8de76866..09005b4ea4f8273194981ca220638cf2e0c8322a 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -70,10 +70,12 @@ enum
 };
 #endif
 
+#ifndef __DARWIN__
 #include <MacTextEditor.h>
 #include <ATSUnicode.h>
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>
+#endif
 #include "wx/mac/uma.h"
 
 class wxMacFunctor

diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index cb8ecb4c2d523b4ef4540c070d309843ff65b583..bbfafd4b38cc8f0dca4637d941f081988ec2fdd1 100644 (file)
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -35,7 +35,7 @@
 #include "wx/thread.h"
 
 #ifdef __WXMAC__
-#if TARGET_API_MAC_OSX
+#ifdef __DARWIN__
 #include <CoreServices/CoreServices.h>
 #else
 #include <DriverServices.h>

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 22120e08f60efcbe403621ff9f511848b1728d43..8588e8526052e581e5bdb8327e7e3fb20591af61 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -14,9 +14,9 @@
 #if wxUSE_GUI
 
 #include "wx/dc.h"
-#include <MacTextEditor.h>
 
 #ifndef __DARWIN__
+#  include <MacTextEditor.h>
 #  include <Navigation.h>
 #  if defined(TARGET_CARBON)
 #    if PM_USE_SESSION_APIS

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 479e31e3cd73ecc234bf2624d12dea8014d1ffe5..69a34ceec5a28878f9b298cae8227c14e885e4de 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -50,9 +50,13 @@
 #include <Multiprocessing.h>
 #endif
 
+#ifdef __DARWIN__
+#include <Carbon/Carbon.h>
+#else
 #include <ATSUnicode.h>
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>
+#endif
 #endif // wxUSE_GUI
 
 #include  "wx/mac/private.h"  // includes mac headers