A few tweaks and cleanups

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

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index c13b9b3473aa95f7e6aea50484b939c366a61d3f..82318cbcaf845b86136e1b01414ca8493bc2517a 100644 (file)
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -43,30 +43,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-//
-// already defined via nerror.h in app.h so undef them
-//
-#ifdef EEXIST
-#undef EEXIST
-#endif
-#ifdef ENOENT
-#undef ENOENT
-#endif
-#ifdef EMFILE
-#undef EMFILE
-#endif
-#ifdef EINTR
-#undef EINTR
-#endif
-#ifdef EINVAL
-#undef EINVAL
-#endif
-#ifdef ENOMEM
-#undef ENOMEM
-#endif
-#ifdef EACCES
-#undef EACCES
-#endif
 #include <errno.h>
 #include <stdarg.h>
 
@@ -154,11 +130,9 @@ MRESULT APIENTRY wxExecuteWindowCbk(
     return 0;
 }
 
-extern wxChar wxPanelClassName[];
-
 long wxExecute(
   const wxString&                   rCommand
-, bool                              bSync
+, int                               flags
 , wxProcess*                        pHandler
 )
 {
@@ -179,7 +153,7 @@ long wxExecute(
     PFNWP                           pOldProc;
     TID                             vTID;
 
-    if (bSync)
+    if (flags & wxEXEC_SYNC)
         ulExecFlag = EXEC_SYNC;
     else
         ulExecFlag = EXEC_ASYNCRESULT;
@@ -203,8 +177,8 @@ long wxExecute(
 
     pData->vResultCodes = vResultCodes;
     pData->hWnd         = NULLHANDLE;
-    pData->bState       = bSync;
-    if (bSync)
+    pData->bState       = (flags & wxEXEC_SYNC) != 0;
+    if (flags & wxEXEC_SYNC)
     {
         wxASSERT_MSG(!pHandler, wxT("wxProcess param ignored for sync execution"));
         pData->pHandler = NULL;
@@ -229,7 +203,7 @@ long wxExecute(
         // the process still started up successfully...
         return vResultCodes.codeTerminate;
     }
-    if (!bSync)
+    if (!(flags & wxEXEC_SYNC))
     {
         // return the pid
         // warning: don't exit your app unless you actively
@@ -251,7 +225,7 @@ long wxExecute(
 
 long wxExecute(
   char**                            ppArgv
-, bool                              bSync
+, int                               flags
 , wxProcess*                        pHandler
 )
 {
@@ -263,7 +237,7 @@ long wxExecute(
     }
     sCommand.RemoveLast();
     return wxExecute( sCommand
-                     ,bSync
+                     ,flags
                      ,pHandler
                     );
 }