Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wxExecute() compilation in ANSI build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-03-24 23:13:12 +00:00
parent d2aa927a57
commit d7ef641d4e
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/utils.h
View File

@@ -347,15 +347,17 @@ enum
// If flags contain wxEXEC_SYNC, return -1 on failure and the exit code of the // If flags contain wxEXEC_SYNC, return -1 on failure and the exit code of the
// process if everything was ok. Otherwise (i.e. if wxEXEC_ASYNC), return 0 on // process if everything was ok. Otherwise (i.e. if wxEXEC_ASYNC), return 0 on
// failure and the PID of the launched process if ok. // failure and the PID of the launched process if ok.
WXDLLIMPEXP_BASE long wxExecute(wchar_t **argv, WXDLLIMPEXP_BASE long wxExecute(const wxString& command,
int flags = wxEXEC_ASYNC, int flags = wxEXEC_ASYNC,
wxProcess *process = NULL); wxProcess *process = NULL);
WXDLLIMPEXP_BASE long wxExecute(char **argv, WXDLLIMPEXP_BASE long wxExecute(char **argv,
int flags = wxEXEC_ASYNC, int flags = wxEXEC_ASYNC,
wxProcess *process = NULL); wxProcess *process = NULL);
WXDLLIMPEXP_BASE long wxExecute(const wxString& command, #if wxUSE_UNICODE
WXDLLIMPEXP_BASE long wxExecute(wchar_t **argv,
int flags = wxEXEC_ASYNC, int flags = wxEXEC_ASYNC,
wxProcess *process = NULL); wxProcess *process = NULL);
#endif // wxUSE_UNICODE
// execute the command capturing its output into an array line by line, this is // execute the command capturing its output into an array line by line, this is
// always synchronous // always synchronous

4
src/msw/utilsexc.cpp
View File

@@ -1035,7 +1035,11 @@ long wxExecute(char **argv, int flags, wxProcess *handler)
return wxExecuteImpl(argv, flags, handler); return wxExecuteImpl(argv, flags, handler);
} }
#if wxUSE_UNICODE
long wxExecute(wchar_t **argv, int flags, wxProcess *handler) long wxExecute(wchar_t **argv, int flags, wxProcess *handler)
{ {
return wxExecuteImpl(argv, flags, handler); return wxExecuteImpl(argv, flags, handler);
} }
#endif // wxUSE_UNICODE

6
src/unix/utilsunx.cpp
View File

@@ -382,6 +382,7 @@ public:
} }
} }
#if wxUSE_UNICODE
ArgsArray(wchar_t **wargv) ArgsArray(wchar_t **wargv)
{ {
int argc = 0; int argc = 0;
@@ -395,6 +396,7 @@ public:
m_argv[i] = wxSafeConvertWX2MB(wargv[i]).release(); m_argv[i] = wxSafeConvertWX2MB(wargv[i]).release();
} }
} }
#endif // wxUSE_UNICODE
~ArgsArray() ~ArgsArray()
{ {
@@ -491,6 +493,8 @@ long wxExecute(const wxString& command, int flags, wxProcess *process)
return wxExecute(argv, flags, process); return wxExecute(argv, flags, process);
} }
#if wxUSE_UNICODE
long wxExecute(wchar_t **wargv, int flags, wxProcess *process) long wxExecute(wchar_t **wargv, int flags, wxProcess *process)
{ {
ArgsArray argv(wargv); ArgsArray argv(wargv);
@@ -498,6 +502,8 @@ long wxExecute(wchar_t **wargv, int flags, wxProcess *process)
return wxExecute(argv, flags, process); return wxExecute(argv, flags, process);
} }
#endif // wxUSE_UNICODE
// wxExecute: the real worker function // wxExecute: the real worker function
long wxExecute(char **argv, int flags, wxProcess *process) long wxExecute(char **argv, int flags, wxProcess *process)
{ {