added an error message if a bitmap can't be addedto the image list

[wxWidgets.git] / src / motif / utilsexc.cpp

diff --git a/src/motif/utilsexc.cpp b/src/motif/utilsexc.cpp
index 94ff593d4f769abfd2de6b012d8d74a7f42c7319..c7c928a2de8addb77a0741c2aad979b976dffbf8 100644 (file)
--- a/src/motif/utilsexc.cpp
+++ b/src/motif/utilsexc.cpp
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 
 #ifdef VMS
 /*steve*/
@@ -35,11 +36,11 @@
 
 #else
 
-#if defined(_AIX) || defined(__xlC__)
+#if defined(__AIX__) || defined(__xlC__)
 #include <sys/socket.h>
 #include <sys/select.h>
 #else
-#ifndef DG
+#ifndef __DATA_GENERAL__
 #include <sys/syscall.h>
 #endif
 #endif
@@ -51,22 +52,70 @@
 
 #endif
 
+#ifdef __SVR4__
+  #include <sys/systeminfo.h>
+#endif
+
+#ifdef __SOLARIS__
+// somehow missing from sys/wait.h but in the system's docs
+extern "C"
+{
+   pid_t wait4(pid_t pid, int *statusp, int options, struct rusage
+               *rusage);
+}
+#endif
+
 #include <sys/time.h>
+#include <errno.h>
 
 #include <Xm/Xm.h>
 
-#define wxEXECUTE_WIN_MESSAGE 10000
+struct wxLocalProcessData
+{
+  int pid, end_process;
+  wxProcess *process;
+};
+
+#ifdef __SOLARIS__
+// somehow missing from sys/wait.h but in the system's docs
+extern "C"
+{
+   pid_t wait4(pid_t pid, int *statusp, int options, struct rusage
+               *rusage);
+}
+#endif
 
 void xt_notify_end_process(XtPointer client, int *fid,
                           XtInputId *id)
 {
-  Bool *flag = (Bool *) client;
-  *flag = TRUE;
+  wxLocalProcessData *process_data = (wxLocalProcessData *)client;
+
+  int pid;
+
+  pid = (process_data->pid > 0) ? process_data->pid : -(process_data->pid);
+
+  /* wait4 is not part of any standard, use at own risk
+   * not sure what wait4 does, but wait3 seems to be closest, whats a digit ;-)
+   * --- offer@sgi.com */
+#if !defined(__sgi) && !defined(__SGI__) && !defined(__ALPHA__) && !defined(__SUNCC__)
+  wait4(process_data->pid, NULL, 0, NULL);
+#else
+  wait3((int *) NULL, 0, (rusage *) NULL);
+#endif
 
   XtRemoveInput(*id);
+  if (process_data->process)
+    process_data->process->OnTerminate(process_data->pid);
+
+  process_data->end_process = TRUE;
+
+  if (process_data->pid > 0)
+    delete process_data;
+  else
+    process_data->pid = 0;
 }
 
-long wxExecute(char **argv, bool sync, wxProcess *WXUNUSED(handler))
+long wxExecute(char **argv, bool sync, wxProcess *handler)
 {
 #ifdef VMS
   return(0);
@@ -114,28 +163,34 @@ long wxExecute(char **argv, bool sync, wxProcess *WXUNUSED(handler))
       _exit (-1);
     }
 
-  int end_process = 0;
+  wxLocalProcessData *process_data = new wxLocalProcessData;
+
+  process_data->end_process = 0;
+  process_data->process = handler;
+  process_data->pid = (sync) ? pid : -pid;
 
   close(proc_link[1]);
   XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(), proc_link[0],
                 (XtPointer *) XtInputReadMask,
                 (XtInputCallbackProc) xt_notify_end_process,
-                (XtPointer) &end_process);
+                (XtPointer) process_data);
 
   if (sync) {
-    while (!end_process)
+    while (!process_data->end_process)
        XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
 
-    if (WIFEXITED(end_process) != 0)
-      return WEXITSTATUS(end_process);
+    if (WIFEXITED(process_data->end_process) != 0)
+      return WEXITSTATUS(process_data->end_process);
   }
 
+  delete process_data;
+
   return pid;
 #endif
   // end VMS
 }
 
-long wxExecute (const wxString& command, bool sync, wxProcess* WXUNUSED(process))
+long wxExecute (const wxString& command, bool sync, wxProcess* handler)
 {
 #ifdef VMS
   return(0);
@@ -156,7 +211,7 @@ long wxExecute (const wxString& command, bool sync, wxProcess* WXUNUSED(process)
   while ((argv[argc++] = strtok (NULL, IFS)) != NULL)
     /* loop */ ;
 
-  return wxExecute(argv, sync);
+  return wxExecute(argv, sync, handler);
 #endif
   // VMS
 }