updated wxExecute API

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/utilsexc.cpp b/src/mac/carbon/utilsexc.cpp
index 3b4903212c6ba5dacc30fb2a2ba8925b8261ce01..c97c35e44337206de7c4fd08913698ae80fbd595 100644 (file)
--- a/src/mac/carbon/utilsexc.cpp
+++ b/src/mac/carbon/utilsexc.cpp
@@ -25,7 +25,7 @@
 #ifndef __DARWIN__
 #define wxEXECUTE_WIN_MESSAGE 10000
 
 #ifndef __DARWIN__
 #define wxEXECUTE_WIN_MESSAGE 10000
 

-long wxExecute(const wxString& command, bool sync, wxProcess *handler)
+long wxExecute(const wxString& command, int flags, wxProcess *handler)

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;

diff --git a/src/mac/utilsexc.cpp b/src/mac/utilsexc.cpp
index 3b4903212c6ba5dacc30fb2a2ba8925b8261ce01..c97c35e44337206de7c4fd08913698ae80fbd595 100644 (file)
--- a/src/mac/utilsexc.cpp
+++ b/src/mac/utilsexc.cpp
@@ -25,7 +25,7 @@
 #ifndef __DARWIN__
 #define wxEXECUTE_WIN_MESSAGE 10000
 
 #ifndef __DARWIN__
 #define wxEXECUTE_WIN_MESSAGE 10000
 

-long wxExecute(const wxString& command, bool sync, wxProcess *handler)
+long wxExecute(const wxString& command, int flags, wxProcess *handler)

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index 731951079715984ea9db1009725ba9ca213c1fe6..82318cbcaf845b86136e1b01414ca8493bc2517a 100644 (file)
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -132,7 +132,7 @@ MRESULT APIENTRY wxExecuteWindowCbk(
 
 long wxExecute(
   const wxString&                   rCommand
 
 long wxExecute(
   const wxString&                   rCommand

-, bool                              bSync
+, int                               flags

 , wxProcess*                        pHandler
 )
 {
 , wxProcess*                        pHandler
 )
 {


@@ -153,7 +153,7 @@ long wxExecute(
     PFNWP                           pOldProc;
     TID                             vTID;
 
     PFNWP                           pOldProc;
     TID                             vTID;
 

-    if (bSync)
+    if (flags & wxEXEC_SYNC)

         ulExecFlag = EXEC_SYNC;
     else
         ulExecFlag = EXEC_ASYNCRESULT;
         ulExecFlag = EXEC_SYNC;
     else
         ulExecFlag = EXEC_ASYNCRESULT;


@@ -177,8 +177,8 @@ long wxExecute(
 
     pData->vResultCodes = vResultCodes;
     pData->hWnd         = NULLHANDLE;
 
     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;
     {
         wxASSERT_MSG(!pHandler, wxT("wxProcess param ignored for sync execution"));
         pData->pHandler = NULL;


@@ -203,7 +203,7 @@ long wxExecute(
         // the process still started up successfully...
         return vResultCodes.codeTerminate;
     }
         // 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
     {
         // return the pid
         // warning: don't exit your app unless you actively


@@ -225,7 +225,7 @@ long wxExecute(
 
 long wxExecute(
   char**                            ppArgv
 
 long wxExecute(
   char**                            ppArgv

-, bool                              bSync
+, int                               flags

 , wxProcess*                        pHandler
 )
 {
 , wxProcess*                        pHandler
 )
 {


@@ -237,7 +237,7 @@ long wxExecute(
     }
     sCommand.RemoveLast();
     return wxExecute( sCommand
     }
     sCommand.RemoveLast();
     return wxExecute( sCommand

-                     ,bSync
+                     ,flags

                      ,pHandler
                     );
 }
                      ,pHandler
                     );
 }