svn not cvs

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index accecb36450b28f5e5a538eaea40995bfdde25e2..60dc54d9e1738c628c5f746dd33cd83cfd2b65f9 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -29,14 +29,16 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/stream.h"

 #include "wx/process.h"
 
 #include "wx/apptrait.h"
 
 #include "wx/process.h"
 
 #include "wx/apptrait.h"
 

-#include "wx/module.h"

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 


@@ -721,13 +723,13 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
                     // Win32 allows for null
 #ifdef __WXWINCE__
                  (wxChar *)
                     // Win32 allows for null
 #ifdef __WXWINCE__
                  (wxChar *)

-                 moduleName.c_str(), // application name
+                 moduleName.wx_str(),// application name

                  (wxChar *)
                  (wxChar *)

-                 arguments.c_str(),  // arguments
+                 arguments.wx_str(), // arguments

 #else
                  NULL,               // application name (use only cmd line)
                  (wxChar *)
 #else
                  NULL,               // application name (use only cmd line)
                  (wxChar *)

-                 command.c_str(),    // full command line
+                 command.wx_str(),   // full command line

 #endif
                  NULL,               // security attributes: defaults for both
                  NULL,               //   the process and its main thread
 #endif
                  NULL,               // security attributes: defaults for both
                  NULL,               //   the process and its main thread