X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/656fc51cda91ea40154358a6adcd85ded506812a..d7eee191c55687785a2be927fd387d10514cdf1b:/include/wx/filefn.h diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 8021da6a17..1ffa54f836 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -66,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 @@ -169,9 +169,9 @@ WXDLLEXPORT void wxUnix2DosFilename(wxChar *s); #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 @@ -268,10 +268,7 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0); #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