Moved the declaration of wxEVT_NULL to event.cpp and made it extern in the header...

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index e7a4d4f2ae0b2bb4cb30e273e752faff035ea00d..8021da6a17631cc41d069812ba21f490dd09ad51 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -25,7 +25,7 @@
 // ----------------------------------------------------------------------------
 
 // define off_t
 // ----------------------------------------------------------------------------
 
 // define off_t

-#ifndef __WXMAC__
+#if !defined(__WXMAC__) || defined(__UNIX__)

     #include  <sys/types.h>
 #else
     typedef long off_t;
     #include  <sys/types.h>
 #else
     typedef long off_t;


@@ -167,7 +167,7 @@ WXDLLEXPORT void wxDos2UnixFilename(wxChar *s);
 WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);
 #define Unix2DosFilename wxUnix2DosFilename
 
 WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);
 #define Unix2DosFilename wxUnix2DosFilename
 

-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)

   WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
   WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
   WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
   WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
   WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
   WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;


@@ -220,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 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);
 
 // Remove file
 WXDLLEXPORT bool wxRemoveFile(const wxString& file);


@@ -255,16 +256,23 @@ 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)
 #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(":")
 // 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__)
 
 // 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
+// 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 wxPATH_SEP          wxPATH_SEP_DOS

 #else   // Windows and OS/2
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_DOS
   #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