1. registry files corresponding to the recent registry.h changes

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index cfd23a7f25af9625ca0dcd97c48cbb856d32ec29..e74411c2294eedf414227f55551f265a4441dfa0 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -24,6 +24,7 @@
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"
+#include "wx/intl.h"
 #endif
 
 #include "wx/log.h"
@@ -32,18 +33,18 @@
 
 #include <ctype.h>
 
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
 #include <direct.h>
+#ifndef __MWERKS__
 #include <dos.h>
 #endif
+#endif
 
 #ifdef __GNUWIN32__
+#ifndef __TWIN32__
 #include <sys/unistd.h>
 #include <sys/stat.h>
-#ifndef __MINGW32__
-#include <std.h>
 #endif
-
 #endif
 
 #ifdef __WIN32__
@@ -112,7 +113,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
   if (command == "")
     return 0;
 
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__TWIN32__)
   char * cl;
   char * argp;
   int clen;
@@ -203,3 +204,16 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
   return(instanceID);
 #endif
 }
+
+long wxExecute(char **argv, bool sync, wxProcess *handler)
+{
+  wxString command = "";
+
+  while (*argv != NULL) {
+    command += *argv;
+    command += ' ';
+    argv++;
+  }
+  command.RemoveLast();
+  return wxExecute(command, sync, handler);
+}