Fix wxBase compilation with UTF-8-based wxString under MSW.

Use wxString::t_str() instead of wx_str() in Windows API function calls.

Closes #14325.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-05-23 21:16:45 +00:00
parent 364f3b0700
commit b2b6da49e2
10 changed files with 19 additions and 18 deletions

View File

@@ -857,14 +857,14 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
// WinCE requires appname to be non null
// Win32 allows for null
#ifdef __WXWINCE__
(wxChar *)
moduleName.wx_str(),// application name
(wxChar *)
arguments.wx_str(), // arguments
static_cast<const TCHAR *>(
moduleName.t_str()),// application name
const_cast<TCHAR *>(static_cast<const TCHAR *>(
arguments.t_str())), // arguments
#else
NULL, // application name (use only cmd line)
(wxChar *)
command.wx_str(), // full command line
const_cast<TCHAR *>(static_cast<const TCHAR *>(
command.t_str())), // full command line
#endif
NULL, // security attributes: defaults for both
NULL, // the process and its main thread
@@ -872,7 +872,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
dwFlags, // process creation flags
envBuffer.data(), // environment (may be NULL which is fine)
useCwd // initial working directory
? const_cast<wxChar *>(env->cwd.wx_str())
? const_cast<TCHAR *>(static_cast<const TCHAR *>(env->cwd.t_str()))
: NULL, // (or use the same)
&si, // startup info (unused here)
&pi // process info