Removed the old, manual entry function, macro, and class category pages and replaced...

[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..41172aed2ded766d1928cb97b4f7e9a3889fd741 100644 (file)
--- a/src/mac/corefoundation/utilsexc_base.cpp
+++ b/src/mac/corefoundation/utilsexc_base.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        mac/corefoundation/utilsexc_base.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        mac/corefoundation/utilsexc_base.cpp

-// Purpose:     wxMacExecute
+// Purpose:     wxMacLaunch

 // Author:      Ryan Norton
 // Modified by:
 // Created:     2005-06-21
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2005-06-21


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


@@ -52,25 +48,19 @@
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //

-//    wxMacExecute
+//    wxMacLaunch

 //
 // argv is the command line split up, with the application path first
 // 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
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //
 // argv is the command line split up, with the application path first
 // 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,
-               wxProcess *process)
+bool wxMacLaunch(char **argv)

 {
 {

-    // 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
-

     // Obtains the number of arguments for determining the size of
     // the CFArray used to hold them
     CFIndex cfiCount = 0;
     // Obtains the number of arguments for determining the size of
     // the CFArray used to hold them
     CFIndex cfiCount = 0;

-    for(wxChar** argvcopy = argv; *argvcopy != NULL ; ++argvcopy)
+    for(char** argvcopy = argv; *argvcopy != NULL ; ++argvcopy)

     {
         ++cfiCount;
     }
     {
         ++cfiCount;
     }


@@ -79,8 +69,8 @@ long wxMacExecute(wxChar **argv,
     // to launch
     if(cfiCount == 0)
     {
     // to launch
     if(cfiCount == 0)
     {

-        wxLogDebug(wxT("wxMacExecute No file to launch!"));
-        return errorCode ;
+        wxLogDebug(wxT("wxMacLaunch No file to launch!"));
+        return false ;

     }
 
     // Path to bundle
     }
 
     // Path to bundle


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

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

             kDefaultPathStyle,
             true); //false == not a directory
 
     // Check for error from the CFURL
     if(!cfurlApp)
     {
             kDefaultPathStyle,
             true); //false == not a directory
 
     // Check for error from the CFURL
     if(!cfurlApp)
     {

-        wxLogDebug(wxT("wxMacExecute Can't open path: %s"), path.c_str());
-        return errorCode ;
+        wxLogDebug(wxT("wxMacLaunch Can't open path: %s"), path.c_str());
+        return false ;

     }
 
     // Create a CFBundle from the CFURL created earlier
     }
 
     // Create a CFBundle from the CFURL created earlier


@@ -110,9 +100,9 @@ long wxMacExecute(wxChar **argv,
     // at all (maybe a simple directory etc.)
     if(!cfbApp)
     {
     // at all (maybe a simple directory etc.)
     if(!cfbApp)
     {

-        wxLogDebug(wxT("wxMacExecute Bad bundle: %s"), path.c_str());
+        wxLogDebug(wxT("wxMacLaunch Bad bundle: %s"), path.c_str());

         CFRelease(cfurlApp);
         CFRelease(cfurlApp);

-        return errorCode ;
+        return false ;

     }
 
     // Get the bundle type and make sure its an 'APPL' bundle
     }
 
     // Get the bundle type and make sure its an 'APPL' bundle


@@ -121,10 +111,10 @@ long wxMacExecute(wxChar **argv,
     CFBundleGetPackageInfo(cfbApp, &dwBundleType, &dwBundleCreator);
     if(dwBundleType != 'APPL')
     {
     CFBundleGetPackageInfo(cfbApp, &dwBundleType, &dwBundleCreator);
     if(dwBundleType != 'APPL')
     {

-        wxLogDebug(wxT("wxMacExecute Not an APPL bundle: %s"), path.c_str());
+        wxLogDebug(wxT("wxMacLaunch Not an APPL bundle: %s"), path.c_str());

         CFRelease(cfbApp);
         CFRelease(cfurlApp);
         CFRelease(cfbApp);
         CFRelease(cfurlApp);

-        return errorCode ;
+        return false ;

     }
 
     // Create a CFArray for dealing with the command line
     }
 
     // Create a CFArray for dealing with the command line


@@ -133,10 +123,10 @@ long wxMacExecute(wxChar **argv,
                                     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("wxMacLaunch Could not create CFMutableArray"));

         CFRelease(cfbApp);
         CFRelease(cfurlApp);
         CFRelease(cfbApp);
         CFRelease(cfurlApp);

-        return errorCode ;
+        return false ;

     }
 
     // Loop through command line arguments to the bundle,
     }
 
     // Loop through command line arguments to the bundle,


@@ -159,7 +149,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 +159,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 +170,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);
         }
 


@@ -188,7 +178,7 @@ long wxMacExecute(wxChar **argv,
         if(!cfurlCurrentFile)
         {
             wxLogDebug(
         if(!cfurlCurrentFile)
         {
             wxLogDebug(

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

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


@@ -226,12 +216,12 @@ long wxMacExecute(wxChar **argv,
     // Check for error from LSOpenFromURLSpec
     if(status != noErr)
     {
     // Check for error from LSOpenFromURLSpec
     if(status != noErr)
     {

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

                    (int)status);
                    (int)status);

-        return errorCode ;
+        return false ;

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

-    return successCode;
+    return true ;

 }
 
 }