X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bedaf53eaf4e2a860b34d4ff5e0b1928ce8fa5c9..0e448231102ecab3ce01647e98ec156f7bf5b8bb:/include/wx/filefn.h

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 8e247c9571..75665d066d 100644
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -66,7 +66,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 // ----------------------------------------------------------------------------
 
 // Microsoft compiler loves underscores, feed them to it
-#ifdef  __VISUALC__
+#if defined( __VISUALC__ ) || wxCHECK_W32API_VERSION( 0, 5 ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
     // functions
     #define   wxClose      _close
     #define   wxRead       _read
@@ -167,15 +168,13 @@ WXDLLEXPORT void wxDos2UnixFilename(wxChar *s);
 WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);
 #define Unix2DosFilename wxUnix2DosFilename
 
-#if defined(__WXMAC__) && !defined(__UNIX__)
+#if defined(__WXMAC__)
   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 wxString wxMac2UnixFilename( const char *s) ;
   WXDLLEXPORT wxString wxUnix2MacFilename( const char *s);
-*/
 #endif
 
 // Strip the extension, in situ
@@ -266,12 +265,12 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 #define wxPATH_SEP_MAC        wxT(";")
 
 // platform independent versions
-#ifdef  __UNIX__
+#if defined(__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
+  #define wxPATH_SEP          wxPATH_SEP_MAC
 #else   // Windows and OS/2
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_DOS
   #define wxPATH_SEP          wxPATH_SEP_DOS
@@ -279,9 +278,9 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 
 // this is useful for wxString::IsSameAs(): to compare two file names use
 // filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE)
-#ifdef  __UNIX__
+#if defined(__UNIX__) && !defined(__DARWIN__)
   #define wxARE_FILENAMES_CASE_SENSITIVE  TRUE
-#else   // Windows and OS/2
+#else   // Windows, Mac OS and OS/2
   #define wxARE_FILENAMES_CASE_SENSITIVE  FALSE
 #endif  // Unix/Windows