bug fix for using multiline string (i.e. with embedded '\n's) in wxTextCtrl ctor

[wxWidgets.git] / src / common / file.cpp

diff --git a/src/common/file.cpp b/src/common/file.cpp
index f0209434b2f854d80eebf7d0f210f133e2fabf45..0973ec9c3854675aea09a57562f8c9a801bc87f7 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -28,7 +28,7 @@
 #if wxUSE_FILE
 
 // standard
-#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
   #include  <io.h>
 
 #ifndef __SALFORDC__
@@ -88,6 +88,9 @@
 #ifndef __MWERKS__
     #include  <sys/types.h>   // needed for stat
     #include  <sys/stat.h>    // stat
+#elif ( defined(__MWERKS__) && defined(__WXMSW__) )
+    #include  <sys/types.h>   // needed for stat
+    #include  <sys/stat.h>    // stat
 #endif
 
 #if defined(__BORLANDC__) || defined(_MSC_VER)
@@ -473,7 +476,10 @@ bool wxTempFile::Open(const wxString& strName)
     // OS/2 supports that have them (HPFS, FAT32) and security (HPFS386)
     static const wxChar *szMktempSuffix = wxT("XXX");
     m_strTemp << strName << szMktempSuffix;
+    // Temporarily remove - MN
+    #ifndef __WATCOMC__
     ::DosCreateDir(m_strTemp.GetWriteBuf(MAX_PATH), NULL);
+    #endif
 #else // Windows
     wxString strPath;
     wxSplitPath(strName, &strPath, NULL, NULL);