OSX regrouping

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 54cc271c41f14b70380730401a736a7a50eefec2..076cabb60fc2abd3222af1d82e06b436e9218f52 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -63,19 +63,6 @@
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
 
-#if defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
-    // For MacTypes.h for Debugger function
-    #include <CoreFoundation/CFBase.h>
-#endif
-
-#if defined(__WXMAC__)
-    #ifdef __DARWIN__
-        #include  <CoreServices/CoreServices.h>
-    #else
-        #include  "wx/mac/private.h"  // includes mac headers
-    #endif
-#endif // __WXMAC__
-
 #ifdef __WXDEBUG__
     #if wxUSE_STACKWALKER
         #include "wx/stackwalk.h"

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index 6154cb60a1bd804290d45aa059f767fe079d1caa..02ebf4edf1230bcc83706cd1970a43738898dab0 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -62,7 +62,7 @@ bool wxDir::HasFiles(const wxString& spec) const
 }
 
 // we have a (much) faster version for Unix
-#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__EMX__) || defined(__WINE__)
+#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || ( defined(__WXMAC__) && !wxOSX_USE_IPHONE) || defined(__EMX__) || defined(__WINE__)
 
 bool wxDir::HasSubDirs(const wxString& spec) const
 {

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index fd55bcb89f0574787222595091976045377146db..87553c632964fdaf6d3be5b2664685289c7595d2 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -364,7 +364,7 @@ bool wxDocument::OnSaveDocument(const wxString& file)
     Modify(false);
     SetFilename(file);
     SetDocumentSaved(true);
-#ifdef __WXMAC__
+#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
     wxFileName fn(file) ;
     fn.MacSetDefaultTypeAndCreator() ;
 #endif

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index d5626c7709685d6f2d64ac579805de785aea079a..ad4e20adb5ff975dd080427f628cb43ac29c5cb2 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -1035,7 +1035,7 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 
   ResetDirty();
 
-#if defined(__WXMAC__)
+#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
   m_fnLocalFile.MacSetTypeAndCreator('TEXT', 'ttxt');
 #endif // __WXMAC__
 

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index b9053ba8ac76d8dda4841b558f47f568de45b137..0597305a5e6d410c80a0f275efac7caebdb5eb3a 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1657,7 +1657,7 @@ wxString wxGetOSDirectory()
     wxChar buf[256];
     GetWindowsDirectory(buf, 256);
     return wxString(buf);
-#elif defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)
+#elif defined(__WXMAC__) && wxOSX_USE_CARBON
     return wxMacFindFolder(kOnSystemDisk, 'macs', false);
 #else
     return wxEmptyString;

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index d781b78685807b9bec251d0a95e99e8ed0d6b2bd..ee7e4d412adb2b587294f5717fabc377d6ed1d6d 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -1068,7 +1068,7 @@ wxString wxFileName::GetTempDir()
         // default
 #if defined(__DOS__) || defined(__OS2__)
         dir = _T(".");
-#elif defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)
+#elif defined(__WXMAC__) && wxOSX_USE_CARBON
         dir = wxMacFindFolder(short(kOnSystemDisk), kTemporaryFolderType, kCreateFolder);
 #else
         dir = _T("/tmp");
@@ -2383,7 +2383,7 @@ wxString wxFileName::GetHumanReadableSize(const wxString &failmsg, int precision
 // Mac-specific functions
 // ----------------------------------------------------------------------------
 
-#if defined( __WXMAC__ ) && !defined( __WXOSX_IPHONE__ )
+#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
 
 const short kMacExtensionMaxLength = 16 ;
 class MacDefaultExtensionRecord

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 509044fadd07793d96358f95297c4f7903383081..ab8ecc932d6ec1abd9e527e3008888b96fd2537b 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -181,7 +181,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
             }
     }
 
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && wxOSX_USE_CARRBON
     return wxIcon(iconBest.GetHICON(), size);
 #else
     return iconBest;

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index daa630585abfd2964b9e61ad70f5c834e1bcf195..1121e348a7f1fc0623568271a8d409850610fbec 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -48,7 +48,7 @@
 // implementation classes:
 #if defined(__WXMSW__)
     #include "wx/msw/mimetype.h"
-#elif defined(__WXMAC__)
+#elif ( defined(__WXMAC__) && wxOSX_USE_CARBON )
     #include "wx/osx/mimetype.h"
 #elif defined(__WXPM__) || defined (__EMX__)
     #include "wx/os2/mimetype.h"

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 12c4cee992c3e4e0d8e42d2db15a1fadf0dfdb06..4da0d2fa96a56cd02a27543bf5df459ad2ef08d4 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -212,7 +212,7 @@ wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent,
 
 wxDCImpl* wxNativePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data )
 {
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXUNIVERSAL__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || ( defined(__WXUNIVERSAL__) && !defined(__WXMAC__) )
     return new wxPostScriptDCImpl( owner, data );
 #else
     return new wxPrinterDCImpl( owner, data );