make the Pen/Brush code backward compatible as discussed on wx-dev; marked the blocks...

[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 db2c9f38a4715603683d98e57365bfead1c1f3fb..878d2ed8142f69062b9d974033a4da7a4fa88d8b 100644 (file)
--- 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/log.h"
     #include "wx/intl.h"
     #include "wx/utils.h"

+    #include "wx/wxcrt.h"

 #endif // WX_PRECOMP
 
 // Mac Includes
 #endif // WX_PRECOMP
 
 // Mac Includes


@@ -39,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


@@ -51,20 +48,20 @@
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //

-//     wxMacExecute
+//    wxMacExecute

 //
 // argv is the command line split up, with the application path first
 //
 // argv is the command line split up, with the application path first

-// flags are the flags from wxExecute 
+// flags are the flags from wxExecute

 // process is the process passed from wxExecute for pipe streams etc.
 // returns -1 on error for wxEXEC_SYNC and 0 on error for wxEXEC_ASYNC
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 long wxMacExecute(wxChar **argv,
                int flags,
 // process is the process passed from wxExecute for pipe streams etc.
 // returns -1 on error for wxEXEC_SYNC and 0 on error for wxEXEC_ASYNC
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 long wxMacExecute(wxChar **argv,
                int flags,

-               wxProcess *process)
+               wxProcess *WXUNUSED(process))

 {
     // Semi-macros used for return value of wxMacExecute
 {
     // Semi-macros used for return value of wxMacExecute

-       const long errorCode = ((flags & wxEXEC_SYNC) ? -1 : 0);
-       const long successCode = ((flags & wxEXEC_SYNC) ? 0 : -1); // fake PID
+    const long errorCode = ((flags & wxEXEC_SYNC) ? -1 : 0);
+    const long successCode = ((flags & wxEXEC_SYNC) ? 0 : -1); // fake PID

 
     // Obtains the number of arguments for determining the size of
     // the CFArray used to hold them
 
     // Obtains the number of arguments for determining the size of
     // the CFArray used to hold them


@@ -81,18 +78,17 @@ long wxMacExecute(wxChar **argv,
         wxLogDebug(wxT("wxMacExecute No file to launch!"));
         return errorCode ;
     }
         wxLogDebug(wxT("wxMacExecute No file to launch!"));
         return errorCode ;
     }

-    
+

     // Path to bundle
     wxString path = *argv++;
 
     // Create a CFURL for the application path
     // Created this way because we are opening a bundle which is a directory
     // Path to bundle
     wxString path = *argv++;
 
     // Create a CFURL for the application path
     // Created this way because we are opening a bundle which is a directory

-    CFURLRef cfurlApp = 
+    CFURLRef cfurlApp =

         CFURLCreateWithFileSystemPath(
             kCFAllocatorDefault,
         CFURLCreateWithFileSystemPath(
             kCFAllocatorDefault,

-            wxMacCFStringHolder(path, 
-                                wxLocale::GetSystemEncoding()),
-            kDefaultPathStyle, 
+            wxCFStringRef(path),
+            kDefaultPathStyle,

             true); //false == not a directory
 
     // Check for error from the CFURL
             true); //false == not a directory
 
     // Check for error from the CFURL


@@ -114,7 +110,7 @@ long wxMacExecute(wxChar **argv,
         CFRelease(cfurlApp);
         return errorCode ;
     }
         CFRelease(cfurlApp);
         return errorCode ;
     }

-    
+

     // Get the bundle type and make sure its an 'APPL' bundle
     // Otherwise we're dealing with something else here...
     UInt32 dwBundleType, dwBundleCreator;
     // Get the bundle type and make sure its an 'APPL' bundle
     // Otherwise we're dealing with something else here...
     UInt32 dwBundleType, dwBundleCreator;


@@ -126,42 +122,41 @@ long wxMacExecute(wxChar **argv,
         CFRelease(cfurlApp);
         return errorCode ;
     }
         CFRelease(cfurlApp);
         return errorCode ;
     }

-    
+

     // Create a CFArray for dealing with the command line
     // arguments to the bundle
     // Create a CFArray for dealing with the command line
     // arguments to the bundle

-    CFMutableArrayRef cfaFiles = CFArrayCreateMutable(kCFAllocatorDefault, 
+    CFMutableArrayRef cfaFiles = CFArrayCreateMutable(kCFAllocatorDefault,

                                     cfiCount-1, &kCFTypeArrayCallBacks);
     if(!cfaFiles) //This should never happen
     {
                                     cfiCount-1, &kCFTypeArrayCallBacks);
     if(!cfaFiles) //This should never happen
     {

-        wxLogDebug(wxT("wxMacExecute Could not create CFMutableArray"));        
+        wxLogDebug(wxT("wxMacExecute Could not create CFMutableArray"));

         CFRelease(cfbApp);
         CFRelease(cfurlApp);
         return errorCode ;
     }
         CFRelease(cfbApp);
         CFRelease(cfurlApp);
         return errorCode ;
     }

-    
+

     // Loop through command line arguments to the bundle,
     // turn them into CFURLs and then put them in cfaFiles
     // For use to launch services call
         for( ; *argv != NULL ; ++argv)
         {
     // Loop through command line arguments to the bundle,
     // turn them into CFURLs and then put them in cfaFiles
     // For use to launch services call
         for( ; *argv != NULL ; ++argv)
         {

-        // Check for '<' as this will ring true for 
+        // Check for '<' as this will ring true for

         // CFURLCreateWithString but is generally not considered
         // typical on mac but is usually passed here from wxExecute
         if (wxStrcmp(*argv, wxT("<")) == 0)
             continue;
         // CFURLCreateWithString but is generally not considered
         // typical on mac but is usually passed here from wxExecute
         if (wxStrcmp(*argv, wxT("<")) == 0)
             continue;

-            
-        
-        CFURLRef cfurlCurrentFile;     // CFURL to hold file path
-        wxFileName argfn(*argv);       // Filename for path
-                
+
+
+        CFURLRef cfurlCurrentFile;    // CFURL to hold file path
+        wxFileName argfn(*argv);     // Filename for path
+

         if(argfn.DirExists())
         {
             // First, try creating as a directory
             cfurlCurrentFile = CFURLCreateWithFileSystemPath(
                                 kCFAllocatorDefault,
         if(argfn.DirExists())
         {
             // First, try creating as a directory
             cfurlCurrentFile = CFURLCreateWithFileSystemPath(
                                 kCFAllocatorDefault,

-                                wxMacCFStringHolder(*argv, 
-                                wxLocale::GetSystemEncoding()),
-                                kDefaultPathStyle, 
+                                wxCFStringRef(*argv),
+                                kDefaultPathStyle,

                                 true); //true == directory
         }
         else if(argfn.FileExists())
                                 true); //true == directory
         }
         else if(argfn.FileExists())


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

-                                wxMacCFStringHolder(*argv, 
-                                wxLocale::GetSystemEncoding()),
-                                kDefaultPathStyle, 
+                                wxCFStringRef(*argv),
+                                kDefaultPathStyle,

                                 false); //false == regular file
                                 false); //false == regular file

-        }    
+        }

         else
         {
             // Argument did not refer to
             // an entry in the local filesystem,
             // so try creating it through CFURLCreateWithString
             cfurlCurrentFile = CFURLCreateWithString(
         else
         {
             // Argument did not refer to
             // an entry in the local filesystem,
             // so try creating it through CFURLCreateWithString
             cfurlCurrentFile = CFURLCreateWithString(

-                    kCFAllocatorDefault,
-                wxMacCFStringHolder(*argv, wxLocale::GetSystemEncoding()),
-                    NULL);
+                                kCFAllocatorDefault,
+                                wxCFStringRef(*argv),
+                                NULL);

         }
         }

-        
+

         // Continue in the loop if the CFURL could not be created
         if(!cfurlCurrentFile)
         {
             wxLogDebug(
         // Continue in the loop if the CFURL could not be created
         if(!cfurlCurrentFile)
         {
             wxLogDebug(

-                wxT("wxMacExecute Could not create CFURL for argument:%s"), 
+                wxT("wxMacExecute Could not create CFURL for argument:%s"),

                 *argv);
             continue;
         }
                 *argv);
             continue;
         }


@@ -203,7 +197,7 @@ long wxMacExecute(wxChar **argv,
                             );
             CFRelease(cfurlCurrentFile); // array has retained it
         }
                             );
             CFRelease(cfurlCurrentFile); // array has retained it
         }

-    
+

     // Create a LSLaunchURLSpec for use with LSOpenFromURLSpec
     // Note that there are several flag options (launchFlags) such
     // as kLSLaunchDontSwitch etc. and maybe we could be more
     // Create a LSLaunchURLSpec for use with LSOpenFromURLSpec
     // Note that there are several flag options (launchFlags) such
     // as kLSLaunchDontSwitch etc. and maybe we could be more


@@ -211,10 +205,10 @@ long wxMacExecute(wxChar **argv,
     LSLaunchURLSpec launchspec;
     launchspec.appURL = cfurlApp;
     launchspec.itemURLs = cfaFiles;
     LSLaunchURLSpec launchspec;
     launchspec.appURL = cfurlApp;
     launchspec.itemURLs = cfaFiles;

-    launchspec.passThruParams = NULL; //AEDesc* 
-    launchspec.launchFlags = kLSLaunchDefaults; 
+    launchspec.passThruParams = NULL; //AEDesc*
+    launchspec.launchFlags = kLSLaunchDefaults;

     launchspec.asyncRefCon = NULL;
     launchspec.asyncRefCon = NULL;

-    
+

     // Finally, call LSOpenFromURL spec with our arguments
     // 2nd parameter is a pointer to a CFURL that gets
     // the actual path launched by the function
     // Finally, call LSOpenFromURL spec with our arguments
     // 2nd parameter is a pointer to a CFURL that gets
     // the actual path launched by the function


@@ -224,16 +218,16 @@ long wxMacExecute(wxChar **argv,
     CFRelease(cfbApp);
     CFRelease(cfurlApp);
     CFRelease(cfaFiles);
     CFRelease(cfbApp);
     CFRelease(cfurlApp);
     CFRelease(cfaFiles);

-    
+

     // Check for error from LSOpenFromURLSpec
     if(status != noErr)
     {
     // Check for error from LSOpenFromURLSpec
     if(status != noErr)
     {

-        wxLogDebug(wxT("wxMacExecute LSOpenFromURLSpec Error: %d"), 
+        wxLogDebug(wxT("wxMacExecute LSOpenFromURLSpec Error: %d"),

                    (int)status);
         return errorCode ;
     }
                    (int)status);
         return errorCode ;
     }

-    
+

     // No error from LSOpenFromURLSpec, so app was launched
     // No error from LSOpenFromURLSpec, so app was launched

-    return successCode; 
+    return successCode;

 }
 
 }