added wxTreeEvent::GetKeyEvent() to allow to retrieve the key event flags from EVT_TR...

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 9118bcb7b1e218f0956ba2930328d382ff0f69c1..1f09b3d44830d3272d576f533ff1a3ace6b2e185 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -298,19 +298,30 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
     }
     while ( rc == -1 && errno == EINTR );
 
     }
     while ( rc == -1 && errno == EINTR );
 

-
-    if( rc == -1 || ! (WIFEXITED(status) || WIFSIGNALED(status)) )
+    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"));
+        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))
+    {
+        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)
        /* 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)

-
-          JACS adds -- I have other code that kills a process recursively
-          and calls waitpid; so this function then generates an error.
-          I've commented out the wxLogSysError and the 'else' so that
-          termination is always done properly.

        */
     }
     // else
        */
     }
     // else


@@ -595,6 +606,13 @@ long wxExecute(wxChar **argv,
 
         // there is no return after successful exec()
         _exit(-1);
 
         // there is no return after successful exec()
         _exit(-1);

+
+        // some compilers complain about missing return - of course, they
+        // should know that exit() doesn't return but what else can we do if
+        // they don't?
+#if defined(__VMS) || defined(__INTEL_COMPILER)
+        return 0;
+#endif

     }
     else // we're in parent
     {
     }
     else // we're in parent
     {


@@ -670,13 +688,6 @@ long wxExecute(wxChar **argv,
         return exitcode;
 #endif // wxUSE_GUI
     }
         return exitcode;
 #endif // wxUSE_GUI
     }

-#ifdef __VMS
-   // VMS does not recognise exit as a return and complains about
-   // a missing return
-   // I think VMS is wrong in this
-   //     JJ
-   return 0;
-#endif

 }
 
 #undef ERROR_RETURN_CODE
 }
 
 #undef ERROR_RETURN_CODE