updated wxExecute API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -25,7 +25,7 @@
|
|||||||
#ifndef __DARWIN__
|
#ifndef __DARWIN__
|
||||||
#define wxEXECUTE_WIN_MESSAGE 10000
|
#define wxEXECUTE_WIN_MESSAGE 10000
|
||||||
|
|
||||||
long wxExecute(const wxString& command, bool sync, wxProcess *handler)
|
long wxExecute(const wxString& command, int flags, wxProcess *handler)
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
return 0;
|
return 0;
|
||||||
|
@@ -25,7 +25,7 @@
|
|||||||
#ifndef __DARWIN__
|
#ifndef __DARWIN__
|
||||||
#define wxEXECUTE_WIN_MESSAGE 10000
|
#define wxEXECUTE_WIN_MESSAGE 10000
|
||||||
|
|
||||||
long wxExecute(const wxString& command, bool sync, wxProcess *handler)
|
long wxExecute(const wxString& command, int flags, wxProcess *handler)
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
return 0;
|
return 0;
|
||||||
|
@@ -132,7 +132,7 @@ MRESULT APIENTRY wxExecuteWindowCbk(
|
|||||||
|
|
||||||
long wxExecute(
|
long wxExecute(
|
||||||
const wxString& rCommand
|
const wxString& rCommand
|
||||||
, bool bSync
|
, int flags
|
||||||
, wxProcess* pHandler
|
, wxProcess* pHandler
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
@@ -153,7 +153,7 @@ long wxExecute(
|
|||||||
PFNWP pOldProc;
|
PFNWP pOldProc;
|
||||||
TID vTID;
|
TID vTID;
|
||||||
|
|
||||||
if (bSync)
|
if (flags & wxEXEC_SYNC)
|
||||||
ulExecFlag = EXEC_SYNC;
|
ulExecFlag = EXEC_SYNC;
|
||||||
else
|
else
|
||||||
ulExecFlag = EXEC_ASYNCRESULT;
|
ulExecFlag = EXEC_ASYNCRESULT;
|
||||||
@@ -177,8 +177,8 @@ long wxExecute(
|
|||||||
|
|
||||||
pData->vResultCodes = vResultCodes;
|
pData->vResultCodes = vResultCodes;
|
||||||
pData->hWnd = NULLHANDLE;
|
pData->hWnd = NULLHANDLE;
|
||||||
pData->bState = bSync;
|
pData->bState = (flags & wxEXEC_SYNC) != 0;
|
||||||
if (bSync)
|
if (flags & wxEXEC_SYNC)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG(!pHandler, wxT("wxProcess param ignored for sync execution"));
|
wxASSERT_MSG(!pHandler, wxT("wxProcess param ignored for sync execution"));
|
||||||
pData->pHandler = NULL;
|
pData->pHandler = NULL;
|
||||||
@@ -203,7 +203,7 @@ long wxExecute(
|
|||||||
// the process still started up successfully...
|
// the process still started up successfully...
|
||||||
return vResultCodes.codeTerminate;
|
return vResultCodes.codeTerminate;
|
||||||
}
|
}
|
||||||
if (!bSync)
|
if (!(flags & wxEXEC_SYNC))
|
||||||
{
|
{
|
||||||
// return the pid
|
// return the pid
|
||||||
// warning: don't exit your app unless you actively
|
// warning: don't exit your app unless you actively
|
||||||
@@ -225,7 +225,7 @@ long wxExecute(
|
|||||||
|
|
||||||
long wxExecute(
|
long wxExecute(
|
||||||
char** ppArgv
|
char** ppArgv
|
||||||
, bool bSync
|
, int flags
|
||||||
, wxProcess* pHandler
|
, wxProcess* pHandler
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
@@ -237,7 +237,7 @@ long wxExecute(
|
|||||||
}
|
}
|
||||||
sCommand.RemoveLast();
|
sCommand.RemoveLast();
|
||||||
return wxExecute( sCommand
|
return wxExecute( sCommand
|
||||||
,bSync
|
,flags
|
||||||
,pHandler
|
,pHandler
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user