X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b781a6729859abc77e6ca5b1f81cbaad974a78f..c9468a241baaa09bbc82eb45da40a1d15c630f4d:/include/wx/filefn.h diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 2502dc1a06..b1df9ded52 100644 --- 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 #else typedef long off_t; @@ -67,7 +66,9 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; // ---------------------------------------------------------------------------- // Microsoft compiler loves underscores, feed them to it -#ifdef __VISUALC__ +#if defined( __VISUALC__ ) \ + || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \ + || ( defined(__MWERKS__) && defined(__WXMSW__) ) // functions #define wxClose _close #define wxRead _read @@ -79,20 +80,24 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; #define wxTell _tell #if wxUSE_UNICODE - #define wxOpen _wopen - #define wxAccess _waccess - - #define wxMkDir _wmkdir - #define wxRmDir _wrmdir - - #define wxStat _wstat + #if wxUSE_UNICODE_MSLU + #define wxOpen wxMSLU__wopen + #define wxAccess wxMSLU__waccess + #define wxMkDir wxMSLU__wmkdir + #define wxRmDir wxMSLU__wrmdir + #define wxStat wxMSLU__wstat + #else + #define wxOpen _wopen + #define wxAccess _waccess + #define wxMkDir _wmkdir + #define wxRmDir _wrmdir + #define wxStat _wstat + #endif #else // !wxUSE_UNICODE #define wxOpen _open #define wxAccess _access - #define wxMkDir _mkdir #define wxRmDir _rmdir - #define wxStat _stat #endif @@ -168,20 +173,11 @@ WXDLLEXPORT void wxDos2UnixFilename(wxChar *s); WXDLLEXPORT void wxUnix2DosFilename(wxChar *s); #define Unix2DosFilename wxUnix2DosFilename -#ifdef __WXMAC__ - WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const 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 - // Strip the extension, in situ WXDLLEXPORT void wxStripExtension(wxChar *buffer); WXDLLEXPORT void wxStripExtension(wxString& buffer); -// Get a temporary filename, opening and closing the file. +// Get a temporary filename WXDLLEXPORT wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = (wxChar *) NULL); WXDLLEXPORT bool wxGetTempFileName(const wxString& prefix, wxString& buf); @@ -193,8 +189,8 @@ WXDLLEXPORT bool wxExpandPath(wxString& dest, const wxChar *path); // and make (if under the home tree) relative to home // [caller must copy-- volatile] WXDLLEXPORT wxChar* wxContractPath(const wxString& filename, - const wxString& envname = wxEmptyString, - const wxString& user = wxEmptyString); + const wxString& envname = wxEmptyString, + const wxString& user = wxEmptyString); // Destructive removal of /./ and /../ stuff WXDLLEXPORT wxChar* wxRealPath(wxChar *path); @@ -221,7 +217,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); @@ -248,29 +245,40 @@ WXDLLEXPORT bool wxMkdir(const wxString& dir, int perm = 0777); // Remove directory. Flags reserved for future use. WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0); +// ---------------------------------------------------------------------------- // separators in file names +// ---------------------------------------------------------------------------- + +// between file name and extension #define wxFILE_SEP_EXT wxT('.') + +// between drive/volume name and the path #define wxFILE_SEP_DSK wxT(':') + +// between the path components #define wxFILE_SEP_PATH_DOS wxT('\\') #define wxFILE_SEP_PATH_UNIX wxT('/') #define wxFILE_SEP_PATH_MAC wxT(':') +#define wxFILE_SEP_PATH_VMS wxT('.') // VMS also uses '[' and ']' // 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__ +#if defined(__UNIX__) && !defined(__CYGWIN__) #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_MAC + #define wxPATH_SEP wxPATH_SEP_MAC +#elif defined(__CYGWIN__) // Cygwin #define wxFILE_SEP_PATH wxFILE_SEP_PATH_DOS - #define wxPATH_SEP wxPATH_SEP_DOS + #define wxPATH_SEP wxPATH_SEP_UNIX #else // Windows and OS/2 #define wxFILE_SEP_PATH wxFILE_SEP_PATH_DOS #define wxPATH_SEP wxPATH_SEP_DOS @@ -278,15 +286,22 @@ 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 // is the char a path separator? inline bool wxIsPathSeparator(wxChar c) - { return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX; } +{ + // under DOS/Windows we should understand both Unix and DOS file separators +#if defined(__UNIX__) || defined(__MAC__) + return c == wxFILE_SEP_PATH; +#else + return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX; +#endif +} // does the string ends with path separator? WXDLLEXPORT bool wxEndsWithPathSeparator(const wxChar *pszFileName);