bump date on 'easter egg' dialog.

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index cd4f7c7a010f1fe7179a10798e6051373447f9e1..b662a72b34428070b4c1539b6d3a4f4572f236b6 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -28,7 +28,7 @@
 #if wxUSE_FILE
 
 // standard
 #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__
   #include  <io.h>
 
 #ifndef __SALFORDC__


@@ -68,12 +68,16 @@
     // Have to ifdef this for different environments
     #include <io.h>
 #elif (defined(__WXMAC__))
     // Have to ifdef this for different environments
     #include <io.h>
 #elif (defined(__WXMAC__))

+#if __MSL__ < 0x6000

     int access( const char *path, int mode ) { return 0 ; }
     int access( const char *path, int mode ) { return 0 ; }

+#else
+    int _access( const char *path, int mode ) { return 0 ; }
+#endif

     char* mktemp( char * path ) { return path ;}
     char* mktemp( char * path ) { return path ;}

-    #include  <unistd.h>
-    #include  <unix.h>
+    #include <stat.h>

     #define   W_OK        2
     #define   R_OK        4
     #define   W_OK        2
     #define   R_OK        4

+    #include  <unistd.h>

 #else
     #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX
 #else
     #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX


@@ -132,22 +136,15 @@ bool wxFile::Exists(const wxChar *name)
 #if wxUSE_UNICODE && wxMBFILES
     wxCharBuffer fname = wxConvFile.cWC2MB(name);
 
 #if wxUSE_UNICODE && wxMBFILES
     wxCharBuffer fname = wxConvFile.cWC2MB(name);
 

-#ifdef __WXMAC__
-  return !access(wxUnix2MacFilename( name ) , 0) && !stat(wxUnix2MacFilename( name ), &st) && (st.st_mode & S_IFREG);
-#else

     return !wxAccess(fname, 0) &&
            !wxStat(wxMBSTRINGCAST fname, &st) &&
            (st.st_mode & S_IFREG);
     return !wxAccess(fname, 0) &&
            !wxStat(wxMBSTRINGCAST fname, &st) &&
            (st.st_mode & S_IFREG);

-#endif
-#else
-#ifdef __WXMAC__
-  return !access(wxUnix2MacFilename( name ) , 0) && !stat(wxUnix2MacFilename( name ), &st) && (st.st_mode & S_IFREG);
+

 #else
     return !wxAccess(name, 0) &&
            !wxStat(name, &st) &&
            (st.st_mode & S_IFREG);
 #endif
 #else
     return !wxAccess(name, 0) &&
            !wxStat(name, &st) &&
            (st.st_mode & S_IFREG);
 #endif

-#endif

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


@@ -188,8 +185,10 @@ 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

-#ifdef __WXMAC__
-    int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
+#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);

 #else
     int fd = wxOpen(wxFNCONV(szFileName),
                     O_BINARY | O_WRONLY | O_CREAT |
 #else
     int fd = wxOpen(wxFNCONV(szFileName),
                     O_BINARY | O_WRONLY | O_CREAT |


@@ -234,11 +233,7 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
             break;
     }
 
             break;
     }
 

-#ifdef __WXMAC__
-    int fd = open(wxUnix2MacFilename( szFileName ), flags, access);
-#else

     int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode));
     int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode));

-#endif

     if ( fd == -1 ) {
         wxLogSysError(_("can't open file '%s'"), szFileName);
         return FALSE;
     if ( fd == -1 ) {
         wxLogSysError(_("can't open file '%s'"), szFileName);
         return FALSE;


@@ -293,7 +288,11 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 #ifdef __MWERKS__
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 #ifdef __MWERKS__

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

     int iRc = ::write(m_fd, (const char*) pBuf, nCount);
     int iRc = ::write(m_fd, (const char*) pBuf, nCount);

+#endif

 #else
     int iRc = ::write(m_fd, pBuf, nCount);
 #endif
 #else
     int iRc = ::write(m_fd, pBuf, nCount);
 #endif


@@ -545,7 +544,6 @@ bool wxTempFile::Commit()
 {
     m_file.Close();
 
 {
     m_file.Close();
 

-#ifndef __WXMAC__

     if ( wxFile::Exists(m_strName) && wxRemove(m_strName) != 0 ) {
         wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
         return FALSE;
     if ( wxFile::Exists(m_strName) && wxRemove(m_strName) != 0 ) {
         wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
         return FALSE;


@@ -555,17 +553,6 @@ bool wxTempFile::Commit()
         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;
     }

-#else
-  if ( wxFile::Exists(m_strName) && remove(wxUnix2MacFilename( m_strName )) != 0 ) {
-    wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
-    return FALSE;
-  }
-
-  if ( rename(wxUnix2MacFilename( m_strTemp ), wxUnix2MacFilename( m_strName )) != 0 ) {
-    wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
-    return FALSE;
-  }
-#endif

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -573,13 +560,8 @@ bool wxTempFile::Commit()
 void wxTempFile::Discard()
 {
     m_file.Close();
 void wxTempFile::Discard()
 {
     m_file.Close();

-#ifndef __WXMAC__

     if ( wxRemove(m_strTemp) != 0 )
         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
     if ( wxRemove(m_strTemp) != 0 )
         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());

-#else
-    if ( remove( wxUnix2MacFilename(m_strTemp.fn_str())) != 0 )
-        wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
-#endif

 }
 
 #endif
 }
 
 #endif