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

Minor improvements and cleanings after recent WinCE fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-11-24 20:16:31 +00:00
parent 7532f691fb
commit 9cd03a43ce
1 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/msw/utilsexc.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: msw/utilsexec.cpp // Name: src/msw/utilsexc.cpp
// Purpose: wxExecute implementation for MSW // Purpose: wxExecute implementation for MSW
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -710,43 +710,33 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
#ifndef __WXWINCE__ #ifndef __WXWINCE__
dwFlags |= CREATE_DEFAULT_ERROR_MODE ; dwFlags |= CREATE_DEFAULT_ERROR_MODE ;
#else #else
wxString moduleName; // we are assuming commands without spaces for now
wxString arguments; wxString moduleName = command.BeforeFirst(wxT(' '));
int idx = command.Find( wxT(' ') ); wxString arguments = command.AfterFirst(wxT(' '));
if( idx >= 0 )
{
moduleName = command.Left(idx);
arguments = command.Mid(idx+1);
}
else
{
moduleName = command;
}
#endif #endif
bool ok = ::CreateProcess bool ok = ::CreateProcess
( (
// WinCE requires appname to be non null // WinCE requires appname to be non null
// Win32 allows for null // Win32 allows for null
#ifdef __WXWINCE__ #ifdef __WXWINCE__
(wxChar *) (wxChar *)
moduleName.c_str(), // application name moduleName.c_str(), // application name
(wxChar *) (wxChar *)
arguments.c_str(), // arguments arguments.c_str(), // arguments
#else #else
NULL, // application name (use only cmd line) NULL, // application name (use only cmd line)
(wxChar *) (wxChar *)
command.c_str(), // full command line command.c_str(), // full command line
#endif #endif
NULL, // security attributes: defaults for both NULL, // security attributes: defaults for both
NULL, // the process and its main thread NULL, // the process and its main thread
redirect, // inherit handles if we use pipes redirect, // inherit handles if we use pipes
dwFlags, // process creation flags dwFlags, // process creation flags
NULL, // environment (use the same) NULL, // environment (use the same)
NULL, // current directory (use the same) NULL, // current directory (use the same)
&si, // startup info (unused here) &si, // startup info (unused here)
&pi // process info &pi // process info
) != 0; ) != 0;
#if wxUSE_STREAMS && !defined(__WXWINCE__) #if wxUSE_STREAMS && !defined(__WXWINCE__)
@@ -962,4 +952,3 @@ long wxExecute(wxChar **argv, int flags, wxProcess *handler)
return wxExecute(command, flags, handler); return wxExecute(command, flags, handler);
} }