fix for using wxDataObjectComposite with the clipboard

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index cc53e66a0a21267a71504418b76a92aa66189ad7..e7834e082a39f0cb409f8b53b622bb7ff8d39e3e 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -59,6 +59,16 @@
     #ifdef __GNUWIN32__
         #include <windows.h>
     #endif
+#elif defined(__DOS__)
+    #if defined(__WATCOMC__)
+       #include <io.h>
+    #elif defined(__DJGPP__)
+       #include <io.h>
+       #include <unistd.h>
+       #include <stdio.h>
+    #else
+        #error  "Please specify the header with file functions declarations."
+    #endif
 #elif (defined(__WXPM__))
     #include <io.h>
     #define   W_OK        2
@@ -123,11 +133,11 @@
 #ifndef WX_PRECOMP
     #include  "wx/string.h"
     #include  "wx/intl.h"
-    #include  "wx/file.h"
     #include  "wx/log.h"
 #endif // !WX_PRECOMP
 
 #include  "wx/filename.h"
+#include  "wx/file.h"
 
 // ============================================================================
 // implementation of wxFile
@@ -422,7 +432,7 @@ bool wxFile::Eof() const
 
     int iRc;
 
-#if defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)
+#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)
     // @@ this doesn't work, of course, on unseekable file descriptors
     off_t ofsCur = Tell(),
     ofsMax = Length();
@@ -468,7 +478,7 @@ bool wxTempFile::Open(const wxString& strName)
 {
     m_strName = strName;
 
-    m_strTemp = wxFileName::CreateTempFileName(strName);
+    m_strTemp = wxFileName::CreateTempFileName(strName, &m_file);
 
     if ( m_strTemp.empty() )
     {