diff --git a/src/mac/carbon/utilsexc.cpp b/src/mac/carbon/utilsexc.cpp index 3b4903212c..c97c35e443 100644 --- a/src/mac/carbon/utilsexc.cpp +++ b/src/mac/carbon/utilsexc.cpp @@ -25,7 +25,7 @@ #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; diff --git a/src/mac/utilsexc.cpp b/src/mac/utilsexc.cpp index 3b4903212c..c97c35e443 100644 --- a/src/mac/utilsexc.cpp +++ b/src/mac/utilsexc.cpp @@ -25,7 +25,7 @@ #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; diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp index 7319510797..82318cbcaf 100644 --- a/src/os2/utilsexc.cpp +++ b/src/os2/utilsexc.cpp @@ -132,7 +132,7 @@ MRESULT APIENTRY wxExecuteWindowCbk( long wxExecute( const wxString& rCommand -, bool bSync +, int flags , wxProcess* pHandler ) { @@ -153,7 +153,7 @@ long wxExecute( PFNWP pOldProc; TID vTID; - if (bSync) + if (flags & wxEXEC_SYNC) ulExecFlag = EXEC_SYNC; else ulExecFlag = EXEC_ASYNCRESULT; @@ -177,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; @@ -203,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 @@ -225,7 +225,7 @@ long wxExecute( long wxExecute( char** ppArgv -, bool bSync +, int flags , wxProcess* pHandler ) { @@ -237,7 +237,7 @@ long wxExecute( } sCommand.RemoveLast(); return wxExecute( sCommand - ,bSync + ,flags ,pHandler ); }