From b5d9d763f7cceb415dd96033c05c6f181662bce9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 13 May 2009 16:22:31 +0000 Subject: [PATCH] remove misleaing mentions of wxEXEC_ASYNC from wxExecute() overloads always executing synchronously git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/utils.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/interface/wx/utils.h b/interface/wx/utils.h index 534b610ea6..096429dee5 100644 --- a/interface/wx/utils.h +++ b/interface/wx/utils.h @@ -806,10 +806,9 @@ long wxExecute(wchar_t** argv, int flags = wxEXEC_ASYNC, @param output The string array where the stdout of the executed process is saved. @param flags - Must include either wxEXEC_ASYNC or wxEXEC_SYNC and can also include - wxEXEC_NOHIDE, wxEXEC_MAKE_GROUP_LEADER (in either case) or + May include wxEXEC_NOHIDE, wxEXEC_MAKE_GROUP_LEADER (in either case) or wxEXEC_NODISABLE and wxEXEC_NOEVENTS or wxEXEC_BLOCK, which is equal to - their combination, in wxEXEC_SYNC case. + their combination. wxEXEC_SYNC is always implicitly added to the flags. @see wxShell(), wxProcess, @ref page_samples_exec, wxLaunchDefaultApplication(), wxLaunchDefaultBrowser() @@ -823,7 +822,8 @@ long wxExecute(const wxString& command, wxArrayString& output, int flags = 0); please see its documentation for general information. This version adds the possibility to additionally capture the messages from - standard error output in the @a errors array. + standard error output in the @a errors array. As with the above overload + capturing standard output only, execution is always synchronous. @param command The command to execute and any parameters to pass to it as a single @@ -833,10 +833,9 @@ long wxExecute(const wxString& command, wxArrayString& output, int flags = 0); @param errors The string array where the stderr of the executed process is saved. @param flags - Must include either wxEXEC_ASYNC or wxEXEC_SYNC and can also include - wxEXEC_NOHIDE, wxEXEC_MAKE_GROUP_LEADER (in either case) or + May include wxEXEC_NOHIDE, wxEXEC_MAKE_GROUP_LEADER (in either case) or wxEXEC_NODISABLE and wxEXEC_NOEVENTS or wxEXEC_BLOCK, which is equal to - their combination, in wxEXEC_SYNC case. + their combination. wxEXEC_SYNC is always implicitly added to the flags. @see wxShell(), wxProcess, @ref page_samples_exec, wxLaunchDefaultApplication(), wxLaunchDefaultBrowser() -- 2.47.2