removing dependancy on mac headers from public wx headers (eventually adding wx/mac...

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 1f1c1b85c52c2f8b329531dea690e67ba55c1193..bbce6d8de14362de945eb03ddccd47e7253b83ee 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -59,6 +59,16 @@
     #ifdef __GNUWIN32__
         #include <windows.h>
     #endif
     #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
 #elif (defined(__WXPM__))
     #include <io.h>
     #define   W_OK        2


@@ -123,7 +133,6 @@
 #ifndef WX_PRECOMP
     #include  "wx/string.h"
     #include  "wx/intl.h"
 #ifndef WX_PRECOMP
     #include  "wx/string.h"
     #include  "wx/intl.h"

-    #include  "wx/file.h"

     #include  "wx/log.h"
 #endif // !WX_PRECOMP
 
     #include  "wx/log.h"
 #endif // !WX_PRECOMP
 


@@ -423,7 +432,7 @@ bool wxFile::Eof() const
 
     int iRc;
 
 
     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();
     // @@ this doesn't work, of course, on unseekable file descriptors
     off_t ofsCur = Tell(),
     ofsMax = Length();


@@ -460,6 +469,7 @@ bool wxFile::Eof() const
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------

+

 wxTempFile::wxTempFile(const wxString& strName)
 {
     Open(strName);
 wxTempFile::wxTempFile(const wxString& strName)
 {
     Open(strName);


@@ -467,9 +477,22 @@ wxTempFile::wxTempFile(const wxString& strName)
 
 bool wxTempFile::Open(const wxString& strName)
 {
 
 bool wxTempFile::Open(const wxString& strName)
 {

-    m_strName = strName;
+    // we must have an absolute filename because otherwise CreateTempFileName()
+    // would create the temp file in $TMP (i.e. the system standard location
+    // for the temp files) which might be on another volume/drive/mount and
+    // wxRename()ing it later to m_strName from Commit() would then fail
+    //
+    // with the absolute filename, the temp file is created in the same
+    // directory as this one which ensures that wxRename() may work later
+    wxFileName fn(strName);
+    if ( !fn.IsAbsolute() )
+    {
+        fn.Normalize(wxPATH_NORM_ABSOLUTE);
+    }
+
+    m_strName = fn.GetFullPath();

 
 

-    m_strTemp = wxFileName::CreateTempFileName(strName);
+    m_strTemp = wxFileName::CreateTempFileName(m_strName, &m_file);

 
     if ( m_strTemp.empty() )
     {
 
     if ( m_strTemp.empty() )
     {


@@ -482,7 +505,7 @@ bool wxTempFile::Open(const wxString& strName)
     mode_t mode;
 
     wxStructStat st;
     mode_t mode;
 
     wxStructStat st;

-    if ( stat(strName.fn_str(), &st) == 0 )
+    if ( stat(m_strName.fn_str(), &st) == 0 )

     {
         mode = st.st_mode;
     }
     {
         mode = st.st_mode;
     }