diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:22:55 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:22:55 +0200 |
| commit | c4182431ac7d9d306fdd2267e082fa4cec6fec2c (patch) | |
| tree | 865cca543c062b7af2586f85cee19f9af4e7614d /wx+/shell_execute.h | |
| parent | 5.11 (diff) | |
| download | FreeFileSync-c4182431ac7d9d306fdd2267e082fa4cec6fec2c.tar.gz FreeFileSync-c4182431ac7d9d306fdd2267e082fa4cec6fec2c.tar.bz2 FreeFileSync-c4182431ac7d9d306fdd2267e082fa4cec6fec2c.zip | |
5.12
Diffstat (limited to 'wx+/shell_execute.h')
| -rw-r--r-- | wx+/shell_execute.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wx+/shell_execute.h b/wx+/shell_execute.h index 6a2920e9..2531c91f 100644 --- a/wx+/shell_execute.h +++ b/wx+/shell_execute.h @@ -35,7 +35,7 @@ enum ExecutionType EXEC_TYPE_ASYNC }; -void shellExecute(const wxString& command, ExecutionType type = EXEC_TYPE_ASYNC) +void shellExecute(const Zstring& command, ExecutionType type = EXEC_TYPE_ASYNC) { #ifdef FFS_WIN //parse commandline @@ -47,8 +47,8 @@ void shellExecute(const wxString& command, ExecutionType type = EXEC_TYPE_ASYNC) ::LocalFree(tmp); } - wxString filename; - wxString arguments; + std::wstring filename; + std::wstring arguments; if (!argv.empty()) { filename = argv[0]; @@ -86,10 +86,10 @@ void shellExecute(const wxString& command, ExecutionType type = EXEC_TYPE_ASYNC) if (type == EXEC_TYPE_SYNC) { //Posix::system - execute a shell command - int rv = ::system(utfCvrtTo<std::string>(command).c_str()); //do NOT use std::system as its documentation says nothing about "WEXITSTATUS(rv)", ect... + int rv = ::system(command.c_str()); //do NOT use std::system as its documentation says nothing about "WEXITSTATUS(rv)", ect... if (rv == -1 || WEXITSTATUS(rv) == 127) //http://linux.die.net/man/3/system "In case /bin/sh could not be executed, the exit status will be that of a command that does exit(127)" { - wxMessageBox(_("Invalid command line:") + L"\n" + command); + wxMessageBox(_("Invalid command line:") + L"\n" + utfCvrtTo<wxString>(command)); return; } } @@ -100,7 +100,7 @@ void shellExecute(const wxString& command, ExecutionType type = EXEC_TYPE_ASYNC) //by default wxExecute uses a zero sized dummy window as a hack to keep focus which leaves a useless empty icon in ALT-TAB list //=> use wxEXEC_NODISABLE and roll our own window disabler! (see comment in app.cpp: void *wxGUIAppTraits::BeforeChildWaitLoop()) wxWindowDisabler dummy; //disables all top level windows - wxExecute(command, wxEXEC_ASYNC | wxEXEC_NODISABLE); + wxExecute(utfCvrtTo<wxString>(command), wxEXEC_ASYNC | wxEXEC_NODISABLE); wxLog::FlushActive(); //show wxWidgets error messages (if any) } #endif |