Added style parameter to wxPopupWindow ctors so they match the Create method.

[wxWidgets.git] / src / unix / utilsunx.cpp

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index b246d08f7ae257eedbf53ad3c1ec9b535623812a..0581126a283e06b858fb6242053c1c8603a9cdd8 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -29,7 +29,12 @@
 #include "wx/stream.h"
 
 #ifdef HAVE_STATFS
-    #include <sys/vfs.h>
+#  ifdef __DARWIN__
+#    include <sys/param.h>
+#    include <sys/mount.h>
+#  else
+#    include <sys/vfs.h>
+#  endif
 #endif // HAVE_STATFS
 
 #if wxUSE_GUI
@@ -283,67 +288,21 @@ bool wxShell(const wxString& command, wxArrayString& output)
 
 void wxHandleProcessTermination(wxEndProcessData *proc_data)
 {
-    int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
-
-    // waitpid is POSIX so should be available everywhere, however on older
-    // systems wait() might be used instead in a loop (until the right pid
-    // terminates)
-    int status = 0;
-    int rc;
-
-    // wait for child termination and if waitpid() was interrupted, try again
-    do
+    // notify user about termination if required
+    if ( proc_data->process )
     {
-       rc = waitpid(pid, &status, 0);
+        proc_data->process->OnTerminate(proc_data->pid, proc_data->exitcode);
     }
-    while ( rc == -1 && errno == EINTR );
 
-    if (rc == -1)
-    {
-        // JACS: this could happen if the process was terminated and waitpid called,
-        // so commenting out for now.
-        //wxLogSysError(_("Waiting for subprocess termination failed (return code = -1)"));
-    }
-    else if (! (WIFEXITED(status)))
-    {
-        wxLogSysError(_("Waiting for subprocess termination failed (WIFEXITED returned zero)"));
-       
-       /* AFAIK, this can only happen if something went wrong within
-          wxGTK, i.e. due to a race condition or some serious bug.
-          After having fixed the order of statements in
-          GTK_EndProcessDetector(). (KB)
-       */
-    }
-    else if (WIFSIGNALED(status))
+    // clean up
+    if ( proc_data->pid > 0 )
     {
-        wxLogSysError(_("Waiting for subprocess termination failed (signal not caught)"));
-       
-       /* AFAIK, this can only happen if something went wrong within
-          wxGTK, i.e. due to a race condition or some serious bug.
-          After having fixed the order of statements in
-          GTK_EndProcessDetector(). (KB)
-       */
+       delete proc_data;
     }
-    // else
+    else
     {
-        // notify user about termination if required
-        if (proc_data->process)
-        {
-            proc_data->process->OnTerminate(proc_data->pid,
-                                            WEXITSTATUS(status));
-        }
-        // clean up
-        if ( proc_data->pid > 0 )
-        {
-           delete proc_data;
-        }
-        else
-        {
-           // wxExecute() will know about it
-           proc_data->exitcode = status;
-
-           proc_data->pid = 0;
-        }
+       // let wxExecute() know that the process has terminated
+       proc_data->pid = 0;
     }
 }