Applied patch [ 1399013 ] More removals of extraneous semicolons

[wxWidgets.git] / src / msw / utilsexc.cpp

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 2247c389d2e433048a976d9c494a2f6f9bbabae6..accecb36450b28f5e5a538eaea40995bfdde25e2 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/utilsexec.cpp
+// Name:        src/msw/utilsexc.cpp

 // Purpose:     wxExecute implementation for MSW
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxExecute implementation for MSW
 // Author:      Julian Smart
 // Modified by:


@@ -710,41 +710,33 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 #ifndef __WXWINCE__
     dwFlags |= CREATE_DEFAULT_ERROR_MODE ;
 #else
 #ifndef __WXWINCE__
     dwFlags |= CREATE_DEFAULT_ERROR_MODE ;
 #else

-    wxString ModuleName;
-    wxString Arguments;
-    { int idx = command.Find( wxT(' ') );
-      if( idx >= 0 ) {
-          ModuleName = command.Left(idx);
-          Arguments = command.Mid(idx+1);
-      } else {
-          ModuleName = command;
-      }
-    }
+    // we are assuming commands without spaces for now
+    wxString moduleName = command.BeforeFirst(wxT(' '));
+    wxString arguments = command.AfterFirst(wxT(' '));

 #endif
 
     bool ok = ::CreateProcess
                 (
 #endif
 
     bool ok = ::CreateProcess
                 (

-                    // WinCE requires appname to be non null 
+                    // WinCE requires appname to be non null

                     // Win32 allows for null
 #ifdef __WXWINCE__
                  (wxChar *)
                     // Win32 allows for null
 #ifdef __WXWINCE__
                  (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,              //   the process and its main thread
-                 redirect,          // inherit handles if we use pipes
-                 dwFlags,           // process creation flags
-                 NULL,              // environment (use the same)
-                 NULL,              // current directory (use the same)
-                 &si,               // startup info (unused here)
-                 &pi                // process info
+                 NULL,               // security attributes: defaults for both
+                 NULL,               //   the process and its main thread
+                 redirect,           // inherit handles if we use pipes
+                 dwFlags,            // process creation flags
+                 NULL,               // environment (use the same)
+                 NULL,               // current directory (use the same)
+                 &si,                // startup info (unused here)
+                 &pi                 // process info

                 ) != 0;
 
 #if wxUSE_STREAMS && !defined(__WXWINCE__)
                 ) != 0;
 
 #if wxUSE_STREAMS && !defined(__WXWINCE__)


@@ -960,4 +952,3 @@ long wxExecute(wxChar **argv, int flags, wxProcess *handler)
 
     return wxExecute(command, flags, handler);
 }
 
     return wxExecute(command, flags, handler);
 }

-