X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70862fa81b7ca80ecabac1f4c646e8048d022050..94e2ed3b8db0220160c0b939782cd46914ec073a:/include/wx/filefn.h?ds=sidebyside

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index f983b7e93a..1ffa54f836 100644
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -25,7 +25,7 @@
 // ----------------------------------------------------------------------------
 
 // define off_t
-#ifndef __WXMAC__
+#if !defined(__WXMAC__) || defined(__UNIX__)
     #include  <sys/types.h>
 #else
     typedef long off_t;
@@ -60,6 +60,80 @@ enum wxSeekMode
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
+// ----------------------------------------------------------------------------
+// declare our versions of low level file functions: some compilers prepend
+// underscores to the usual names, some also have Unicode versions of them
+// ----------------------------------------------------------------------------
+
+// Microsoft compiler loves underscores, feed them to it
+#if defined( __VISUALC__ ) || wxCHECK_W32API_VERSION( 0, 5 )
+    // functions
+    #define   wxClose      _close
+    #define   wxRead       _read
+    #define   wxWrite      _write
+    #define   wxLseek      _lseek
+    #define   wxFsync      _commit
+    #define   wxEof        _eof
+
+    #define   wxTell       _tell
+
+    #if wxUSE_UNICODE
+        #define   wxOpen       _wopen
+        #define   wxAccess     _waccess
+
+        #define   wxMkDir      _wmkdir
+        #define   wxRmDir      _wrmdir
+
+        #define   wxStat       _wstat
+    #else // !wxUSE_UNICODE
+        #define   wxOpen       _open
+        #define   wxAccess     _access
+
+        #define   wxMkDir      _mkdir
+        #define   wxRmDir      _rmdir
+
+        #define   wxStat       _stat
+    #endif
+
+    // types
+    #define   wxStructStat struct _stat
+
+    // constants (unless already defined by the user code)
+    #ifndef O_RDONLY
+        #define   O_RDONLY    _O_RDONLY
+        #define   O_WRONLY    _O_WRONLY
+        #define   O_RDWR      _O_RDWR
+        #define   O_EXCL      _O_EXCL
+        #define   O_CREAT     _O_CREAT
+        #define   O_BINARY    _O_BINARY
+
+        #define   S_IFMT      _S_IFMT
+        #define   S_IFDIR     _S_IFDIR
+        #define   S_IFREG     _S_IFREG
+    #endif // O_RDONLY
+#else
+    // functions
+    #define   wxOpen       open
+    #define   wxClose      close
+    #define   wxRead       read
+    #define   wxWrite      write
+    #define   wxLseek      lseek
+    #define   wxFsync      commit
+    #define   wxAccess     access
+    #define   wxEof        eof
+
+    #define   wxMkDir      mkdir
+    #define   wxRmDir      rmdir
+
+    #define   wxTell(fd)   lseek(fd, 0, SEEK_CUR)
+
+    #define   wxStat       stat
+
+    // types
+    #define   wxStructStat struct stat
+
+#endif  // VC++
+
 // ----------------------------------------------------------------------------
 // functions
 // ----------------------------------------------------------------------------
@@ -93,11 +167,11 @@ WXDLLEXPORT void wxDos2UnixFilename(wxChar *s);
 WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);
 #define Unix2DosFilename wxUnix2DosFilename
 
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)
   WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
+  WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
   WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
   WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
-  WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
   WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ;
   WXDLLEXPORT wxString wxUnix2MacFilename( const char *s);
 #endif
@@ -146,7 +220,8 @@ WXDLLEXPORT bool wxMatchWild(const wxString& pattern,  const wxString& text, boo
 WXDLLEXPORT bool wxConcatFiles(const wxString& file1, const wxString& file2, const wxString& file3);
 
 // Copy file1 to file2
-WXDLLEXPORT bool wxCopyFile(const wxString& file1, const wxString& file2);
+WXDLLEXPORT bool wxCopyFile(const wxString& file1, const wxString& file2,
+                            bool overwrite = TRUE);
 
 // Remove file
 WXDLLEXPORT bool wxRemoveFile(const wxString& file);
@@ -178,16 +253,23 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 #define wxFILE_SEP_DSK        wxT(':')
 #define wxFILE_SEP_PATH_DOS   wxT('\\')
 #define wxFILE_SEP_PATH_UNIX  wxT('/')
+#define wxFILE_SEP_PATH_MAC   wxT(':')
 
 // separator in the path list (as in PATH environment variable)
+// there is no PATH variable in Classic Mac OS so just use the
+// semicolon (it must be different from the file name separator)
 // NB: these are strings and not characters on purpose!
 #define wxPATH_SEP_DOS        wxT(";")
 #define wxPATH_SEP_UNIX       wxT(":")
+#define wxPATH_SEP_MAC        wxT(";")
 
 // platform independent versions
 #ifdef  __UNIX__
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_UNIX
   #define wxPATH_SEP          wxPATH_SEP_UNIX
+#elif defined(__MAC__)
+  #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_MAC
+  #define wxPATH_SEP          wxPATH_SEP_DOS
 #else   // Windows and OS/2
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_DOS
   #define wxPATH_SEP          wxPATH_SEP_DOS