X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcb9fb91ff1a9795a484a2fd89728a13f7b2ba11..96ca74cdda2a8ed485facb45de263e5b7b51d7be:/src/common/filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index f0bfce34c2..4308af2059 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -56,7 +56,7 @@
 #endif
 
 #if defined(__WXMAC__)
-    #include  "wx/mac/private.h"  // includes mac headers
+    #include  "wx/osx/private.h"  // includes mac headers
 #endif
 
 #ifdef __WINDOWS__
@@ -96,10 +96,6 @@
     #define _MAXPATHLEN 1024
 #endif
 
-#ifdef __WXMAC__
-// #    include "MoreFilesX.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
@@ -878,7 +874,7 @@ wxString wxPathOnly (const wxString& path)
 // and back again - or we get nasty problems with delimiters.
 // Also, convert to lower case, since case is significant in UNIX.
 
-#if defined(__WXMAC__)
+#if defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)
 
 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 
@@ -1661,7 +1657,7 @@ wxString wxGetOSDirectory()
     wxChar buf[256];
     GetWindowsDirectory(buf, 256);
     return wxString(buf);
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)
     return wxMacFindFolder(kOnSystemDisk, 'macs', false);
 #else
     return wxEmptyString;