1. wxLoad/SaveFileSelector return "wxString" instead of "char *"

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 25edebce1da676752bc0781d290f7eb4f359fa34..e74411c2294eedf414227f55551f265a4441dfa0 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -33,7 +33,7 @@
 
 #include <ctype.h>
 
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
 #include <direct.h>
 #ifndef __MWERKS__
 #include <dos.h>
@@ -41,9 +41,11 @@
 #endif
 
 #ifdef __GNUWIN32__
+#ifndef __TWIN32__
 #include <sys/unistd.h>
 #include <sys/stat.h>
 #endif
+#endif
 
 #ifdef __WIN32__
 #include <io.h>
@@ -111,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;