changed wxExecute(char **) version to take wxChar **

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 4b713c73a6397ef71857eed31caa4770c85fef62..3f10fd277f73eeab67c269872adfdf96ee6b2dd7 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -173,7 +173,7 @@ enum
 // 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
 // failure and the PID of the launched process if ok.
 // 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
 // failure and the PID of the launched process if ok.

-WXDLLEXPORT long wxExecute(char **argv, int flags = wxEXEC_ASYNC,
+WXDLLEXPORT long wxExecute(wxChar **argv, int flags = wxEXEC_ASYNC,

                            wxProcess *process = (wxProcess *) NULL);
 WXDLLEXPORT long wxExecute(const wxString& command, int flags = wxEXEC_ASYNC,
                            wxProcess *process = (wxProcess *) NULL);
                            wxProcess *process = (wxProcess *) NULL);
 WXDLLEXPORT long wxExecute(const wxString& command, int flags = wxEXEC_ASYNC,
                            wxProcess *process = (wxProcess *) NULL);

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 69ee8c8c46f937dce3450584b7e8be944336f2b5..3894aaeea704e9b6c63574a1fde7838844ba894c 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -892,16 +892,18 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 #endif // Win16/32
 }
 
 #endif // Win16/32
 }
 

-long wxExecute(char **argv, int flags, wxProcess *handler)
+long wxExecute(wxChar **argv, int flags, wxProcess *handler)

 {
     wxString command;
 
 {
     wxString command;
 

-    while ( *argv != NULL )
+    for ( ;; )

     {
     {

-        command << *argv++ << ' ';
-    }
+        command += *argv++;
+        if ( !*argv )
+            break;

 
 

-    command.RemoveLast();
+        command += _T(' ');
+    }

 
     return wxExecute(command, flags, handler);
 }
 
     return wxExecute(command, flags, handler);
 }