X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbdb357ea2613f8aed6fdf3ae00223a29412d75f..af01f1ba0d697c07173f436ab661b4c833258a91:/include/wx/filefn.h?ds=sidebyside diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 537d889e88..e076faacfc 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -185,7 +185,7 @@ WXDLLEXPORT wxString wxUnix2MacFilename( const char *s); 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); @@ -197,8 +197,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); @@ -253,16 +253,21 @@ 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('/') //This is the Unix way, but somtimes - //users will give the VMS native paths - //and than a ']' is needed. - // Jouk +#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