X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d264d7091ccdc29eef962223d725742c9a8db726..55e18dbe2faca047b2008734782d52a6eb140115:/src/unix/utilsunx.cpp

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index fd816cb920..be66b6c9e4 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -28,6 +28,11 @@
 
 #include "wx/wfstream.h"
 
+#if defined( __MWERKS__ ) && defined(__MACH__)
+#define WXWIN_OS_DESCRIPTION "MacOS X"
+#define HAVE_NANOSLEEP
+#endif
+
 // not only the statfs syscall is called differently depending on platform, but
 // one of its incarnations, statvfs(), takes different arguments under
 // different platforms and even different versions of the same system (Solaris
@@ -544,7 +549,7 @@ long wxExecute(wxChar **argv,
     wxChar **mb_argv = argv;
 #endif // Unicode/ANSI
 
-#if wxUSE_GUI
+#if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
     // create pipes
     wxPipe pipeEndProcDetect;
     if ( !pipeEndProcDetect.Create() )
@@ -555,7 +560,7 @@ long wxExecute(wxChar **argv,
 
         return ERROR_RETURN_CODE;
     }
-#endif // wxUSE_GUI
+#endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
 
     // pipes for inter process communication
     wxPipe pipeIn,      // stdin
@@ -606,9 +611,9 @@ long wxExecute(wxChar **argv,
                 if ( fd == pipeIn[wxPipe::Read]
                         || fd == pipeOut[wxPipe::Write]
                         || fd == pipeErr[wxPipe::Write]
-#if wxUSE_GUI
+#if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
                         || fd == pipeEndProcDetect[wxPipe::Write]
-#endif // wxUSE_GUI
+#endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
                    )
                 {
                     // don't close this one, we still need it
@@ -630,12 +635,12 @@ long wxExecute(wxChar **argv,
         }
 #endif // !__VMS
 
-#if wxUSE_GUI
+#if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
         // reading side can be safely closed but we should keep the write one
         // opened
         pipeEndProcDetect.Detach(wxPipe::Write);
         pipeEndProcDetect.Close();
-#endif // wxUSE_GUI
+#endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
 
         // redirect stdin, stdout and stderr
         if ( pipeIn.IsOk() )
@@ -655,8 +660,9 @@ long wxExecute(wxChar **argv,
         execvp (*mb_argv, mb_argv);
 
         fprintf(stderr, "execvp(");
-        for ( char **ppc = mb_argv; *ppc; ppc++ )
-            fprintf(stderr, "%s%s", ppc == mb_argv ? "" : ", ", *ppc);
+        // CS changed ppc to ppc_ as ppc is not available under mac os CW Mach-O
+        for ( char **ppc_ = mb_argv; *ppc_; ppc_++ )
+            fprintf(stderr, "%s%s", ppc_ == mb_argv ? "" : ", ", *ppc_);
         fprintf(stderr, ") failed with error %d!\n", errno);
 
         // there is no return after successful exec()
@@ -714,6 +720,31 @@ long wxExecute(wxChar **argv,
 #if wxUSE_GUI && !defined(__WXMICROWIN__)
         wxEndProcessData *data = new wxEndProcessData;
 
+        // wxAddProcessCallback is now (with DARWIN) allowed to call the
+        // callback function directly if the process terminates before
+        // the callback can be added to the run loop. Set up the data.
+        if ( flags & wxEXEC_SYNC )
+        {
+            // we may have process for capturing the program output, but it's
+            // not used in wxEndProcessData in the case of sync execution
+            data->process = NULL;
+
+            // sync execution: indicate it by negating the pid
+            data->pid = -pid;
+        }
+        else
+        {
+            // async execution, nothing special to do - caller will be
+            // notified about the process termination if process != NULL, data
+            // will be deleted in GTK_EndProcessDetector
+            data->process  = process;
+            data->pid      = pid;
+        }
+
+
+#if defined(__DARWIN__) && defined(__WXMAC__)
+        data->tag = wxAddProcessCallbackForPid(data,pid);
+#else
         data->tag = wxAddProcessCallback
                     (
                         data,
@@ -721,16 +752,10 @@ long wxExecute(wxChar **argv,
                     );
 
         pipeEndProcDetect.Close();
+#endif // defined(__DARWIN__) && defined(__WXMAC__)
 
         if ( flags & wxEXEC_SYNC )
         {
-            // we may have process for capturing the program output, but it's
-            // not used in wxEndProcessData in the case of sync execution
-            data->process = NULL;
-
-            // sync execution: indicate it by negating the pid
-            data->pid = -pid;
-
             wxBusyCursor bc;
             wxWindowDisabler wd;
 
@@ -756,12 +781,6 @@ long wxExecute(wxChar **argv,
         }
         else // async execution
         {
-            // async execution, nothing special to do - caller will be
-            // notified about the process termination if process != NULL, data
-            // will be deleted in GTK_EndProcessDetector
-            data->process  = process;
-            data->pid      = pid;
-
             return pid;
         }
 #else // !wxUSE_GUI