X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6f6393c3f42fc0d14b6815fb7a4cf5549b53501..f5abe9111b4f425bc2430111b2b77844e87b2f29:/include/wx/filefn.h diff --git a/include/wx/filefn.h b/include/wx/filefn.h index c9c7cd721c..3ce7a54ac2 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -23,12 +23,20 @@ // ---------------------------------------------------------------------------- // define off_t +#ifndef __WXMAC__ #include +#else +typedef long off_t; +#endif #ifdef _MSC_VER #define off_t _off_t #endif +#if defined(__BORLANDC__) && defined(__WIN16__) +typedef long off_t; +#endif + const off_t wxInvalidOffset = (off_t)-1; typedef enum { @@ -37,6 +45,8 @@ typedef enum { wxFromEnd } wxSeekMode; +WXDLLEXPORT_DATA(extern const char*) wxEmptyString; + // ---------------------------------------------------------------------------- // functions // ---------------------------------------------------------------------------- @@ -71,6 +81,11 @@ WXDLLEXPORT void wxDos2UnixFilename(char *s); WXDLLEXPORT void wxUnix2DosFilename(char *s); #define Unix2DosFilename wxUnix2DosFilename +#ifdef __WXMAC__ + WXDLLEXPORT void wxMacPathToFSSpec( const char *path , FSSpec *spec ) ; + WXDLLEXPORT void wxMac2UnixFilename(char *s); + WXDLLEXPORT void wxUnix2MacFilename(char *s); +#endif // Strip the extension, in situ WXDLLEXPORT void wxStripExtension(char *buffer); WXDLLEXPORT void wxStripExtension(wxString& buffer); @@ -85,7 +100,7 @@ WXDLLEXPORT char* wxExpandPath(char *dest, const char *path); // and make (if under the home tree) relative to home // [caller must copy-- volatile] WXDLLEXPORT char* wxContractPath (const wxString& filename, - const wxString& envname = "", const wxString& user = ""); + const wxString& envname = wxEmptyString, const wxString& user = wxEmptyString); // Destructive removal of /./ and /../ stuff WXDLLEXPORT char* wxRealPath(char *path);