Make sizing logic clearer, at the expense of a few duplicated lines.

[wxWidgets.git] / src / mac / corefoundation / utilsexc_base.cpp

diff --git a/src/mac/corefoundation/utilsexc_base.cpp b/src/mac/corefoundation/utilsexc_base.cpp
index f706f4fb5f6296bbf3faef8d0c395718bde2fee1..878d2ed8142f69062b9d974033a4da7a4fa88d8b 100644 (file)
--- a/src/mac/corefoundation/utilsexc_base.cpp
+++ b/src/mac/corefoundation/utilsexc_base.cpp
@@ -40,11 +40,7 @@
 #include "wx/mac/corefoundation/cfstring.h"
 
 // Default path style
 #include "wx/mac/corefoundation/cfstring.h"
 
 // Default path style

-#ifdef __WXMAC_OSX__

 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 #define kDefaultPathStyle kCFURLPOSIXPathStyle

-#else
-#define kDefaultPathStyle kCFURLHFSPathStyle
-#endif

 
 //===========================================================================
 //  IMPLEMENTATION
 
 //===========================================================================
 //  IMPLEMENTATION


@@ -61,7 +57,7 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 long wxMacExecute(wxChar **argv,
                int flags,
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 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);
 {
     // Semi-macros used for return value of wxMacExecute
     const long errorCode = ((flags & wxEXEC_SYNC) ? -1 : 0);


@@ -91,7 +87,7 @@ long wxMacExecute(wxChar **argv,
     CFURLRef cfurlApp =
         CFURLCreateWithFileSystemPath(
             kCFAllocatorDefault,
     CFURLRef cfurlApp =
         CFURLCreateWithFileSystemPath(
             kCFAllocatorDefault,

-            wxMacCFStringHolder(path),
+            wxCFStringRef(path),

             kDefaultPathStyle,
             true); //false == not a directory
 
             kDefaultPathStyle,
             true); //false == not a directory
 


@@ -159,7 +155,7 @@ long wxMacExecute(wxChar **argv,
             // First, try creating as a directory
             cfurlCurrentFile = CFURLCreateWithFileSystemPath(
                                 kCFAllocatorDefault,
             // First, try creating as a directory
             cfurlCurrentFile = CFURLCreateWithFileSystemPath(
                                 kCFAllocatorDefault,

-                                wxMacCFStringHolder(*argv),
+                                wxCFStringRef(*argv),

                                 kDefaultPathStyle,
                                 true); //true == directory
         }
                                 kDefaultPathStyle,
                                 true); //true == directory
         }


@@ -169,7 +165,7 @@ long wxMacExecute(wxChar **argv,
             // as a regular file
             cfurlCurrentFile = CFURLCreateWithFileSystemPath(
                                 kCFAllocatorDefault,
             // as a regular file
             cfurlCurrentFile = CFURLCreateWithFileSystemPath(
                                 kCFAllocatorDefault,

-                                wxMacCFStringHolder(*argv),
+                                wxCFStringRef(*argv),

                                 kDefaultPathStyle,
                                 false); //false == regular file
         }
                                 kDefaultPathStyle,
                                 false); //false == regular file
         }


@@ -180,7 +176,7 @@ long wxMacExecute(wxChar **argv,
             // so try creating it through CFURLCreateWithString
             cfurlCurrentFile = CFURLCreateWithString(
                                 kCFAllocatorDefault,
             // so try creating it through CFURLCreateWithString
             cfurlCurrentFile = CFURLCreateWithString(
                                 kCFAllocatorDefault,

-                                wxMacCFStringHolder(*argv),
+                                wxCFStringRef(*argv),

                                 NULL);
         }
 
                                 NULL);
         }