From 768c6e8be2cb044aac165c39e3f6847ee601ab0f Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 24 Jul 2005 13:36:31 +0000 Subject: [PATCH] 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 | 4 ++++ src/mac/carbon/checklst.cpp | 2 ++ src/mac/carbon/dataobj.cpp | 2 ++ src/mac/carbon/dc.cpp | 2 ++ src/mac/carbon/filedlg.cpp | 2 ++ src/mac/carbon/font.cpp | 2 ++ src/mac/carbon/mediactrl.cpp | 4 ++++ src/mac/carbon/mimetmac.cpp | 6 ++++-- src/mac/carbon/sound.cpp | 6 ++++++ src/mac/carbon/textctrl.cpp | 2 ++ src/mac/carbon/thread.cpp | 2 +- src/mac/carbon/uma.cpp | 2 +- src/mac/carbon/utils.cpp | 4 ++++ 13 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp index 1ace26ef2d..cd13eb0588 100644 --- a/src/common/stopwatch.cpp +++ b/src/common/stopwatch.cpp @@ -79,8 +79,12 @@ #endif #ifdef __WXMAC__ +#ifndef __DARWIN__ #include #include +#else + #include +#endif #endif #ifdef __WXPALMOS__ diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp index 77b77f2055..9eb1a44cb6 100644 --- 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 +#endif // ============================================================================ // implementation of wxCheckListBox diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp index 65401b5f33..6096d47388 100644 --- 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 +#endif // ---------------------------------------------------------------------------- // functions diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp index 3d79025059..d4dc936fcd 100644 --- 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 #include #include +#endif IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp index 60a898e95a..8e81c44804 100644 --- 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 +#endif #include "MoreFilesX.h" diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp index 8029ee53ec..0a3f6497c2 100644 --- 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 +#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 a461af5ef6..623a4d9c01 100644 --- 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 #include #include //Standard QT stuff +#else +#include +#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 0ff7a6c09d..847502c1b7 100644 --- a/src/mac/carbon/mimetmac.cpp +++ b/src/mac/carbon/mimetmac.cpp @@ -58,8 +58,10 @@ // other standard headers #include -#include //For mime types +#ifndef __DARWIN__ +#include //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 wxString wxFileTypeImpl::GetCommand(const wxString& verb) const { diff --git a/src/mac/carbon/sound.cpp b/src/mac/carbon/sound.cpp index a4704e9b1c..b63f963929 100644 --- 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 #include #endif +#endif #if defined __WXMAC__ && defined __DARWIN__/*TARGET_CARBON*/ #ifdef __APPLE_CC__ @@ -64,7 +66,11 @@ #include #endif +#ifndef __DARWIN__ #include +#else +#include +#endif //Time between timer calls #define MOVIE_DELAY 100 diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index ccbfe3de4e..09005b4ea4 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -70,10 +70,12 @@ enum }; #endif +#ifndef __DARWIN__ #include #include #include #include +#endif #include "wx/mac/uma.h" class wxMacFunctor diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp index cb8ecb4c2d..bbfafd4b38 100644 --- 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 #else #include diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index 22120e08f6..8588e85260 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -14,9 +14,9 @@ #if wxUSE_GUI #include "wx/dc.h" -#include #ifndef __DARWIN__ +# include # include # if defined(TARGET_CARBON) # if PM_USE_SESSION_APIS diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index 479e31e3cd..69a34ceec5 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -50,9 +50,13 @@ #include #endif +#ifdef __DARWIN__ +#include +#else #include #include #include +#endif #endif // wxUSE_GUI #include "wx/mac/private.h" // includes mac headers -- 2.45.2