X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8d69700fc39bc00a1a897da71dd062a986255aa..4eccf53dd554235876dccd4e37331d64427e84c4:/src/mac/corefoundation/utilsexc_base.cpp?ds=sidebyside

diff --git a/src/mac/corefoundation/utilsexc_base.cpp b/src/mac/corefoundation/utilsexc_base.cpp
index a82bcb3ceb..878d2ed814 100644
--- a/src/mac/corefoundation/utilsexc_base.cpp
+++ b/src/mac/corefoundation/utilsexc_base.cpp
@@ -28,6 +28,7 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/utils.h"
+    #include "wx/wxcrt.h"
 #endif // WX_PRECOMP
 
 // Mac Includes
@@ -39,11 +40,7 @@
 #include "wx/mac/corefoundation/cfstring.h"
 
 // Default path style
-#ifdef __WXMAC_OSX__
 #define kDefaultPathStyle kCFURLPOSIXPathStyle
-#else
-#define kDefaultPathStyle kCFURLHFSPathStyle
-#endif
 
 //===========================================================================
 //  IMPLEMENTATION
@@ -60,7 +57,7 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 long wxMacExecute(wxChar **argv,
                int flags,
-               wxProcess *process)
+               wxProcess *WXUNUSED(process))
 {
     // Semi-macros used for return value of wxMacExecute
     const long errorCode = ((flags & wxEXEC_SYNC) ? -1 : 0);
@@ -90,7 +87,7 @@ long wxMacExecute(wxChar **argv,
     CFURLRef cfurlApp =
         CFURLCreateWithFileSystemPath(
             kCFAllocatorDefault,
-            wxMacCFStringHolder(path),
+            wxCFStringRef(path),
             kDefaultPathStyle,
             true); //false == not a directory
 
@@ -158,7 +155,7 @@ long wxMacExecute(wxChar **argv,
             // First, try creating as a directory
             cfurlCurrentFile = CFURLCreateWithFileSystemPath(
                                 kCFAllocatorDefault,
-                                wxMacCFStringHolder(*argv),
+                                wxCFStringRef(*argv),
                                 kDefaultPathStyle,
                                 true); //true == directory
         }
@@ -168,7 +165,7 @@ long wxMacExecute(wxChar **argv,
             // as a regular file
             cfurlCurrentFile = CFURLCreateWithFileSystemPath(
                                 kCFAllocatorDefault,
-                                wxMacCFStringHolder(*argv),
+                                wxCFStringRef(*argv),
                                 kDefaultPathStyle,
                                 false); //false == regular file
         }
@@ -179,7 +176,7 @@ long wxMacExecute(wxChar **argv,
             // so try creating it through CFURLCreateWithString
             cfurlCurrentFile = CFURLCreateWithString(
                                 kCFAllocatorDefault,
-                                wxMacCFStringHolder(*argv),
+                                wxCFStringRef(*argv),
                                 NULL);
         }