no message

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 545818510892769427c4b18ba39a7b8092346b3d..30bc2d13d7e1e96dfc6ab2617ae8479b48f8b8d7 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -56,17 +56,29 @@
 #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>

+#elif (defined(__WXMAC__))
+  int access( const char *path, int mode ) { return 0 ; }
+  char* mktemp( char * path ) { return path ;}
+  #include  <unistd.h>
+  #include  <unix.h>
+  #define   W_OK        2
+  #define   R_OK        4

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

+#ifndef __MWERKS__

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

+#endif

 
 // Microsoft compiler loves underscores, feed them to it
 #ifdef    _MSC_VER
 
 // Microsoft compiler loves underscores, feed them to it
 #ifdef    _MSC_VER

+
+  #ifndef __MWERKS__
+

   // functions
   #define   open        _open
   #define   close       _close
   // functions
   #define   open        _open
   #define   close       _close


@@ -81,6 +93,7 @@
   #define   stat        _stat
 
   // constants
   #define   stat        _stat
 
   // constants

+  

   #define   O_RDONLY    _O_RDONLY
   #define   O_WRONLY    _O_WRONLY
   #define   O_RDWR      _O_RDWR
   #define   O_RDONLY    _O_RDONLY
   #define   O_WRONLY    _O_WRONLY
   #define   O_RDWR      _O_RDWR


@@ -90,6 +103,8 @@
 
   #define   S_IFDIR     _S_IFDIR
   #define   S_IFREG     _S_IFREG
 
   #define   S_IFDIR     _S_IFDIR
   #define   S_IFREG     _S_IFREG

+  
+  #endif

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


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

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

   int iRc = ::read(m_fd, pBuf, nCount);
   int iRc = ::read(m_fd, pBuf, nCount);

+#endif

   if ( iRc == -1 ) {
     wxLogSysError(_("can't read from file descriptor %d"), m_fd);
     return wxInvalidOffset;
   if ( iRc == -1 ) {
     wxLogSysError(_("can't read from file descriptor %d"), m_fd);
     return wxInvalidOffset;


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

+#ifdef __MWERKS__
+  int iRc = ::write(m_fd, (const char*) pBuf, nCount);
+#else

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

+#endif

   if ( iRc == -1 ) {
     wxLogSysError(_("can't write to file descriptor %d"), m_fd);
     m_error = TRUE;
   if ( iRc == -1 ) {
     wxLogSysError(_("can't write to file descriptor %d"), m_fd);
     m_error = TRUE;


@@ -341,7 +364,7 @@ off_t wxFile::Length() const
 {
   wxASSERT( IsOpened() );
 
 {
   wxASSERT( IsOpened() );
 

-  #ifdef  _MSC_VER
+  #if defined(  _MSC_VER ) && !defined( __MWERKS__ )

     int iRc = _filelength(m_fd);
   #else
     int iRc = tell(m_fd);
     int iRc = _filelength(m_fd);
   #else
     int iRc = tell(m_fd);


@@ -376,7 +399,7 @@ bool wxFile::Eof() const
 
   int iRc;
 
 
   int iRc;
 

-  #if defined(__UNIX__) || defined(__GNUWIN32__)
+  #if defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ )

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


@@ -427,7 +450,7 @@ bool wxTempFile::Open(const wxString& strName)
   // 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.
   // 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__)
+  #if defined(__UNIX__) || defined(__WXSTUBS__)|| defined( __WXMAC__ )

     static const char *szMktempSuffix = "XXXXXX";
     m_strTemp << strName << szMktempSuffix;
     mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change
     static const char *szMktempSuffix = "XXXXXX";
     m_strTemp << strName << szMktempSuffix;
     mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change