Use WM_INITMENUPOPUP

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index b662a72b34428070b4c1539b6d3a4f4572f236b6..637d450da530548d19e9e4f8c4b5f36cae642e59 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -7,7 +7,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------


@@ -28,7 +28,7 @@
 #if wxUSE_FILE
 
 // standard
 #if wxUSE_FILE
 
 // standard

-#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

   #include  <io.h>
 
 #ifndef __SALFORDC__
   #include  <io.h>
 
 #ifndef __SALFORDC__


@@ -54,16 +54,26 @@
     #define   NOMCX
 #endif
 
     #define   NOMCX
 #endif
 

-    #include  <windows.h>     // for GetTempFileName
+#elif defined(__WXMSW__) && defined(__WXWINCE__)
+    // TODO: what to include?

 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
     #include  <unistd.h>
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
     #include  <unistd.h>

+    #include  <sys/stat.h>

     #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>
 #elif (defined(__WXPM__))
     #include <io.h>

-    #define   W_OK        2
-    #define   R_OK        4

 #elif (defined(__WXSTUBS__))
     // Have to ifdef this for different environments
     #include <io.h>
 #elif (defined(__WXSTUBS__))
     // Have to ifdef this for different environments
     #include <io.h>


@@ -75,25 +85,37 @@
 #endif
     char* mktemp( char * path ) { return path ;}
     #include <stat.h>
 #endif
     char* mktemp( char * path ) { return path ;}
     #include <stat.h>

-    #define   W_OK        2
-    #define   R_OK        4

     #include  <unistd.h>
 #else
     #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX
 
 #include  <stdio.h>       // SEEK_xxx constants
     #include  <unistd.h>
 #else
     #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX
 
 #include  <stdio.h>       // SEEK_xxx constants

+
+#ifndef __WXWINCE__

 #include  <fcntl.h>       // O_RDONLY &c
 #include  <fcntl.h>       // O_RDONLY &c

+#endif

 
 

-#ifndef __MWERKS__
+#ifdef __WXWINCE__
+// Nothing
+#elif !defined(__MWERKS__)
+    #include  <sys/types.h>   // needed for stat
+    #include  <sys/stat.h>    // stat
+#elif defined(__MWERKS__) && ( defined(__WXMSW__) || defined(__MACH__) )

     #include  <sys/types.h>   // needed for stat
     #include  <sys/stat.h>    // stat
 #endif
 
     #include  <sys/types.h>   // needed for stat
     #include  <sys/stat.h>    // stat
 #endif
 

-#if defined(__BORLANDC__) || defined(_MSC_VER)
-    #define   W_OK        2
-    #define   R_OK        4
-#endif
+// Windows compilers don't have these constants
+#ifndef W_OK
+    enum
+    {
+        F_OK = 0,   // test for existence
+        X_OK = 1,   //          execute permission
+        W_OK = 2,   //          write
+        R_OK = 4    //          read
+    };
+#endif // W_OK

 
 // there is no distinction between text and binary files under Unix, so define
 // O_BINARY as 0 if the system headers don't do it already
 
 // there is no distinction between text and binary files under Unix, so define
 // O_BINARY as 0 if the system headers don't do it already


@@ -118,10 +140,23 @@
 #endif // Salford C
 
 // wxWindows
 #endif // Salford C
 
 // wxWindows

-#include  "wx/string.h"
-#include  "wx/intl.h"
+#ifndef WX_PRECOMP
+    #include  "wx/string.h"
+    #include  "wx/intl.h"
+    #include  "wx/log.h"
+#endif // !WX_PRECOMP
+
+#include  "wx/filename.h"

 #include  "wx/file.h"
 #include  "wx/file.h"

-#include  "wx/log.h"
+#include  "wx/filefn.h"
+
+#ifdef __WXMSW__
+    #include "wx/msw/mslu.h"
+#endif
+
+#ifdef __WXWINCE__
+    #include "wx/msw/private.h"
+#endif

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


@@ -130,28 +165,22 @@
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------

+

 bool wxFile::Exists(const wxChar *name)
 {
 bool wxFile::Exists(const wxChar *name)
 {

-    wxStructStat st;
-#if wxUSE_UNICODE && wxMBFILES
-    wxCharBuffer fname = wxConvFile.cWC2MB(name);
-
-    return !wxAccess(fname, 0) &&
-           !wxStat(wxMBSTRINGCAST fname, &st) &&
-           (st.st_mode & S_IFREG);
-
-#else
-    return !wxAccess(name, 0) &&
-           !wxStat(name, &st) &&
-           (st.st_mode & S_IFREG);
-#endif
+    return wxFileExists(name);

 }
 
 bool wxFile::Access(const wxChar *name, OpenMode mode)
 {
 }
 
 bool wxFile::Access(const wxChar *name, OpenMode mode)
 {

-    int how = 0;
+    int how;
+
+    switch ( mode )
+    {
+        default:
+            wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
+            // fall through

 
 

-    switch ( mode ) {

         case read:
             how = R_OK;
             break;
         case read:
             how = R_OK;
             break;


@@ -160,11 +189,17 @@ bool wxFile::Access(const wxChar *name, OpenMode mode)
             how = W_OK;
             break;
 
             how = W_OK;
             break;
 

-        default:
-            wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
+        case read_write:
+            how = R_OK | W_OK;
+            break;

     }
 
     }
 

-    return wxAccess(wxFNCONV(name), how) == 0;
+#ifdef __WXWINCE__
+    // FIXME: use CreateFile with 0 access to query the file
+    return TRUE;
+#else
+    return wxAccess(name, how) == 0;
+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -185,21 +220,34 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
 {
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists
 {
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists

-#if defined(__WXMAC__) && !defined(__UNIX__)
-  // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace
-  // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
-  int fd = creat( szFileName , accessMode);
+#if defined(__WXMAC__) && !defined(__UNIX__) && !wxUSE_UNICODE
+    // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace
+    // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
+    int fd = creat( szFileName , accessMode);
+#else
+#ifdef __WXWINCE__
+    HANDLE fileHandle = ::CreateFile(szFileName, GENERIC_WRITE, 0, NULL,
+        bOverwrite ? CREATE_ALWAYS : CREATE_NEW, FILE_ATTRIBUTE_NORMAL,
+        0);
+    int fd = 0;
+    if (fileHandle == INVALID_HANDLE_VALUE)
+        fd = (int) fileHandle;
+    else
+        fd = -1;

 #else
 #else

-    int fd = wxOpen(wxFNCONV(szFileName),
-                    O_BINARY | O_WRONLY | O_CREAT |
-                    (bOverwrite ? O_TRUNC : O_EXCL)
-                    ACCESS(accessMode));
+    int fd = wxOpen( szFileName,
+                     O_BINARY | O_WRONLY | O_CREAT |
+                     (bOverwrite ? O_TRUNC : O_EXCL)
+                     ACCESS(accessMode) );
+#endif

 #endif
 #endif

-    if ( fd == -1 ) {
+    if ( fd == -1 )
+    {

         wxLogSysError(_("can't create file '%s'"), szFileName);
         return FALSE;
     }
         wxLogSysError(_("can't create file '%s'"), szFileName);
         return FALSE;
     }

-    else {
+    else
+    {

         Attach(fd);
         return TRUE;
     }
         Attach(fd);
         return TRUE;
     }


@@ -208,9 +256,63 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
 // open the file
 bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
 {
 // open the file
 bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
 {

+#ifdef __WXWINCE__
+    DWORD access = 0;
+    DWORD shareMode = 0;
+    DWORD disposition = 0;
+

     int flags = O_BINARY;
 
     int flags = O_BINARY;
 

-    switch ( mode ) {
+    switch ( mode )
+    {
+        case read:
+            access = GENERIC_READ;
+            shareMode = FILE_SHARE_READ|FILE_SHARE_WRITE;
+            disposition = OPEN_EXISTING;
+            break;
+
+        case write_append:
+            if ( wxFile::Exists(szFileName) )
+            {
+                access = GENERIC_READ|GENERIC_WRITE;
+                shareMode = FILE_SHARE_READ;
+                disposition = 0;
+                break;
+            }
+            //else: fall through as write_append is the same as write if the
+            //      file doesn't exist
+
+        case write:
+            access = GENERIC_WRITE;
+            shareMode = 0;
+            disposition = TRUNCATE_EXISTING;
+            break;
+
+        case write_excl:
+            access = GENERIC_WRITE;
+            shareMode = 0;
+            disposition = TRUNCATE_EXISTING;
+            break;
+
+        case read_write:
+            access = GENERIC_READ|GENERIC_WRITE;
+            shareMode = 0;
+            disposition = 0;
+            break;
+    }
+
+    int fd = 0;
+    HANDLE fileHandle = ::CreateFile(szFileName, access, shareMode, NULL,
+        disposition, FILE_ATTRIBUTE_NORMAL, 0);
+    if (fileHandle == INVALID_HANDLE_VALUE)
+        fd = -1;
+    else
+        fd = (int) fileHandle;
+#else
+    int flags = O_BINARY;
+
+    switch ( mode )
+    {

         case read:
             flags |= O_RDONLY;
             break;
         case read:
             flags |= O_RDONLY;
             break;


@@ -228,13 +330,19 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
             flags |= O_WRONLY | O_CREAT | O_TRUNC;
             break;
 
             flags |= O_WRONLY | O_CREAT | O_TRUNC;
             break;
 

+        case write_excl:
+            flags |= O_WRONLY | O_CREAT | O_EXCL;
+            break;
+

         case read_write:
             flags |= O_RDWR;
             break;
     }
 
         case read_write:
             flags |= O_RDWR;
             break;
     }
 

-    int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode));
-    if ( fd == -1 ) {
+    int fd = wxOpen( szFileName, flags ACCESS(accessMode));
+#endif
+    if ( fd == -1 )
+    {

         wxLogSysError(_("can't open file '%s'"), szFileName);
         return FALSE;
     }
         wxLogSysError(_("can't open file '%s'"), szFileName);
         return FALSE;
     }


@@ -248,7 +356,12 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
 bool wxFile::Close()
 {
     if ( IsOpened() ) {
 bool wxFile::Close()
 {
     if ( IsOpened() ) {

-        if ( close(m_fd) == -1 ) {
+#ifdef __WXWINCE__
+        if (!CloseHandle((HANDLE) m_fd))
+#else
+        if ( close(m_fd) == -1 )
+#endif
+        {

             wxLogSysError(_("can't close file descriptor %d"), m_fd);
             m_fd = fd_invalid;
             return FALSE;
             wxLogSysError(_("can't close file descriptor %d"), m_fd);
             m_fd = fd_invalid;
             return FALSE;


@@ -269,7 +382,14 @@ off_t wxFile::Read(void *pBuf, off_t nCount)
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 

-#ifdef __MWERKS__
+#ifdef __WXWINCE__
+    DWORD bytesRead = 0;
+    int iRc = 0;
+    if (ReadFile((HANDLE) m_fd, pBuf, (DWORD) nCount, & bytesRead, NULL))
+        iRc = bytesRead;
+    else
+        iRc = -1;
+#elif defined(__MWERKS__)

     int iRc = ::read(m_fd, (char*) pBuf, nCount);
 #else
     int iRc = ::read(m_fd, pBuf, nCount);
     int iRc = ::read(m_fd, (char*) pBuf, nCount);
 #else
     int iRc = ::read(m_fd, pBuf, nCount);


@@ -287,7 +407,14 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 

-#ifdef __MWERKS__
+#ifdef __WXWINCE__
+    DWORD bytesRead = 0;
+    int iRc = 0;
+    if (WriteFile((HANDLE) m_fd, pBuf, (DWORD) nCount, & bytesRead, NULL))
+        iRc = bytesRead;
+    else
+        iRc = -1;
+#elif defined(__MWERKS__)

 #if __MSL__ >= 0x6000
     int iRc = ::write(m_fd, (void*) pBuf, nCount);
 #else
 #if __MSL__ >= 0x6000
     int iRc = ::write(m_fd, (void*) pBuf, nCount);
 #else


@@ -309,7 +436,9 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
 bool wxFile::Flush()
 {
     if ( IsOpened() ) {
 bool wxFile::Flush()
 {
     if ( IsOpened() ) {

-#if defined(__VISUALC__) || wxHAVE_FSYNC
+#ifdef __WXWINCE__
+        // Do nothing
+#elif defined(__VISUALC__) || wxHAVE_FSYNC

         if ( wxFsync(m_fd) == -1 )
         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);
         if ( wxFsync(m_fd) == -1 )
         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);


@@ -332,6 +461,34 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

+#ifdef __WXWINCE__
+    int origin;
+    switch ( mode ) {
+        default:
+            wxFAIL_MSG(_("unknown seek origin"));
+
+        case wxFromStart:
+            origin = FILE_BEGIN;
+            break;
+
+        case wxFromCurrent:
+            origin = FILE_CURRENT;
+            break;
+
+        case wxFromEnd:
+            origin = FILE_END;
+            break;
+    }
+
+    DWORD res = SetFilePointer((HANDLE) m_fd, ofs, 0, origin) ;
+    if (res == 0xFFFFFFFF && GetLastError() != NO_ERROR)
+    {
+        wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
+        return wxInvalidOffset;
+    }
+    else
+        return (off_t)res;
+#else

     int origin;
     switch ( mode ) {
         default:
     int origin;
     switch ( mode ) {
         default:


@@ -357,6 +514,7 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
     }
     else
         return (off_t)iRc;
     }
     else
         return (off_t)iRc;

+#endif

 }
 
 // get current off_t
 }
 
 // get current off_t


@@ -364,6 +522,16 @@ off_t wxFile::Tell() const
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

+#ifdef __WXWINCE__
+    DWORD res = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_CURRENT) ;
+    if (res == 0xFFFFFFFF && GetLastError() != NO_ERROR)
+    {
+        wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
+        return wxInvalidOffset;
+    }
+    else
+        return (off_t)res;
+#else

     int iRc = wxTell(m_fd);
     if ( iRc == -1 ) {
         wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
     int iRc = wxTell(m_fd);
     if ( iRc == -1 ) {
         wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);


@@ -371,6 +539,7 @@ off_t wxFile::Tell() const
     }
     else
         return (off_t)iRc;
     }
     else
         return (off_t)iRc;

+#endif

 }
 
 // get current file length
 }
 
 // get current file length


@@ -378,6 +547,15 @@ off_t wxFile::Length() const
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

+#ifdef __WXWINCE__
+    DWORD off0 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_CURRENT);
+    DWORD off1 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_END);
+    off_t len = off1;
+
+    // Restore position
+    SetFilePointer((HANDLE) m_fd, off0, 0, FILE_BEGIN);
+    return len;
+#else

 #ifdef __VISUALC__
     int iRc = _filelength(m_fd);
 #else // !VC++
 #ifdef __VISUALC__
     int iRc = _filelength(m_fd);
 #else // !VC++


@@ -403,6 +581,7 @@ off_t wxFile::Length() const
     }
     else
         return (off_t)iRc;
     }
     else
         return (off_t)iRc;

+#endif

 }
 
 // is end of file reached?
 }
 
 // is end of file reached?


@@ -410,9 +589,20 @@ bool wxFile::Eof() const
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

+#ifdef __WXWINCE__
+    DWORD off0 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_CURRENT);
+    DWORD off1 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_END);
+    if (off0 == off1)
+        return TRUE;
+    else
+    {
+        SetFilePointer((HANDLE) m_fd, off0, 0, FILE_BEGIN);
+        return FALSE;
+    }
+#else

     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();


@@ -440,6 +630,7 @@ bool wxFile::Eof() const
     }
 
     return TRUE;
     }
 
     return TRUE;

+#endif

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -449,6 +640,7 @@ bool wxFile::Eof() const
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------

+

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


@@ -456,78 +648,54 @@ wxTempFile::wxTempFile(const wxString& strName)
 
 bool wxTempFile::Open(const wxString& strName)
 {
 
 bool wxTempFile::Open(const wxString& strName)
 {

-    m_strName = strName;
-
-    // we want to create the file in the same directory as strName because
-    // otherwise rename() in Commit() might not work (if the files are on
-    // different partitions for example). Unfortunately, the only standard
-    // (POSIX) temp file creation function tmpnam() can't do it.
-#if defined(__UNIX__) || defined(__WXSTUBS__)|| defined( __WXMAC__ )
-    static const wxChar *szMktempSuffix = wxT("XXXXXX");
-    m_strTemp << strName << szMktempSuffix;
-    // can use the cast because length doesn't change
-    mktemp(wxMBSTRINGCAST m_strTemp.mb_str());
-#elif  defined(__WXPM__)
-    // for now just create a file
-    // future enhancements can be to set some extended attributes for file systems
-    // OS/2 supports that have them (HPFS, FAT32) and security (HPFS386)
-    static const wxChar *szMktempSuffix = wxT("XXX");
-    m_strTemp << strName << szMktempSuffix;
-    ::DosCreateDir(m_strTemp.GetWriteBuf(MAX_PATH), NULL);
-#else // Windows
-    wxString strPath;
-    wxSplitPath(strName, &strPath, NULL, NULL);
-    if ( strPath.IsEmpty() )
-        strPath = wxT('.');  // GetTempFileName will fail if we give it empty string
-#ifdef __WIN32__
-    if ( !GetTempFileName(strPath, wxT("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
-#else
-        // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug?
-        if ( !GetTempFileName((BYTE) (DWORD)(const wxChar*) strPath, wxT("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
-#endif
-            wxLogLastError(wxT("GetTempFileName"));
-    m_strTemp.UngetWriteBuf();
-#endif  // Windows/Unix
+    // 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);
+    }

 
 

-    int access = wxS_DEFAULT;
-#ifdef __UNIX__
-    // create the file with the same mode as the original one under Unix
-    mode_t umaskOld = 0; // just to suppress compiler warning
-    bool changedUmask;
+    m_strName = fn.GetFullPath();
+
+    m_strTemp = wxFileName::CreateTempFileName(m_strName, &m_file);
+
+    if ( m_strTemp.empty() )
+    {
+        // CreateTempFileName() failed
+        return FALSE;
+    }

 
 

+#ifdef __UNIX__
+    // the temp file should have the same permissions as the original one
+    mode_t mode;
+    

     wxStructStat st;
     wxStructStat st;

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

     {
     {

-        // this assumes that only lower bits of st_mode contain the access
-        // rights, but it's true for at least all Unices which have S_IXXXX()
-        // macros, so should not be less portable than using (not POSIX)
-        // S_IFREG &c
-        access = st.st_mode & 0777;
-
-        // we want to create the file with exactly the same access rights as
-        // the original one, so disable the user's umask for the moment
-        umaskOld = umask(0);
-        changedUmask = TRUE;
+        mode = st.st_mode;

     }
     else
     {
     }
     else
     {

-        // file probably didn't exist, just create with default mode _using_
-        // user's umask (new files creation should respet umask)
-        changedUmask = FALSE;
+        // file probably didn't exist, just give it the default mode _using_
+        // user's umask (new files creation should respect umask)
+        mode_t mask = umask(0777);
+        mode = 0666 & ~mask;
+        umask(mask);

     }
     }

-#endif // Unix

 
 

-    bool ok = m_file.Open(m_strTemp, wxFile::write, access);
-
-#ifdef __UNIX__
-    if ( changedUmask )
+    if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )

     {
     {

-        // restore umask now that the file is created
-        (void)umask(umaskOld);
+        wxLogSysError(_("Failed to set temporary file permissions"));

     }
 #endif // Unix
 
     }
 #endif // Unix
 

-    return ok;
+    return TRUE;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -549,7 +717,7 @@ bool wxTempFile::Commit()
         return FALSE;
     }
 
         return FALSE;
     }
 

-    if ( wxRename(m_strTemp, m_strName) != 0 ) {
+    if ( !wxRenameFile(m_strTemp, m_strName)  ) {

         wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
         return FALSE;
     }
         wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
         return FALSE;
     }


@@ -564,5 +732,5 @@ void wxTempFile::Discard()
         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
 }
 
         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
 }
 

-#endif
+#endif // wxUSE_FILE