OSX two-level header fixes

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

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__

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

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

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)
 

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"
 

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)

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)

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
 {

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

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

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>

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

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