Some wxUniv compile fixes

[wxWidgets.git] / include / wx / filefn.h

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 2502dc1a06cd1af81e920d243140f098d8f687e9..1ffa54f8369da1cb7a5167e69639535e05c0d448 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -25,8 +25,7 @@
 // ----------------------------------------------------------------------------
 
 // define off_t
-
-#if !defined(__WXMAC__) || defined(__DARWIN__)
+#if !defined(__WXMAC__) || defined(__UNIX__)
     #include  <sys/types.h>
 #else
     typedef long off_t;
@@ -67,7 +66,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 // ----------------------------------------------------------------------------
 
 // Microsoft compiler loves underscores, feed them to it
-#ifdef  __VISUALC__
+#if defined( __VISUALC__ ) || wxCHECK_W32API_VERSION( 0, 5 )
     // functions
     #define   wxClose      _close
     #define   wxRead       _read
@@ -168,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
@@ -221,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);
@@ -256,20 +256,19 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 #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__)
-
-// TODO find out whether we can really switch back to native file names
-// previously this mac was emulating unix/win filename structures
-//  #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_MAC
-  #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_DOS
+  #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