compilation fixes for wxUniv (moved wxDlgProc back to toplevel.cpp)

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index f76cdda44189f4ef251f4917bd64d59ea1dc4e1e..af237f6a89f3a2d3167d91e4d3896dcdff52b226 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -139,6 +139,10 @@
 #include  "wx/filename.h"
 #include  "wx/file.h"
 
 #include  "wx/filename.h"
 #include  "wx/file.h"
 

+#ifdef __WXMSW__
+    #include "wx/msw/mslu.h"
+#endif
+

 // ============================================================================
 // implementation of wxFile
 // ============================================================================
 // ============================================================================
 // implementation of wxFile
 // ============================================================================


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

+

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


@@ -476,9 +481,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_strTemp = wxFileName::CreateTempFileName(strName);
+    m_strName = fn.GetFullPath();
+
+    m_strTemp = wxFileName::CreateTempFileName(m_strName, &m_file);

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


@@ -486,19 +504,12 @@ bool wxTempFile::Open(const wxString& strName)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    // actually open the file now (it must already exist)
-    if ( !m_file.Open(m_strTemp, wxFile::write) )
-    {
-        // opening existing file failed?
-        return FALSE;
-    }
-

 #ifdef __UNIX__
     // the temp file should have the same permissions as the original one
     mode_t mode;
 
     wxStructStat st;
 #ifdef __UNIX__
     // the temp file should have the same permissions as the original one
     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;
     }