X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7af89395ba79fc2c6bb89037e409a5b46b4ee38d..f8c4475a3e579655f6a962822824596a7a9cfb66:/include/wx/filefn.h diff --git a/include/wx/filefn.h b/include/wx/filefn.h index b1523f117c..b7455424ad 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -29,12 +29,14 @@ typedef long off_t; #endif -#if defined(__VISUALC__) || defined(__MWERKS__) +#if defined(__VISUALC__) || ( defined(__MWERKS__) && defined( __INTEL__) ) typedef _off_t off_t; #elif defined(__BORLANDC__) && defined(__WIN16__) typedef long off_t; #elif defined(__SC__) typedef long off_t; +#elif defined(__MWERKS__) && !defined(__INTEL__) + typedef long off_t; #endif const off_t wxInvalidOffset = (off_t)-1; @@ -46,7 +48,7 @@ enum wxSeekMode wxFromEnd }; -WXDLLEXPORT_DATA(extern const char*) wxEmptyString; +WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; // ---------------------------------------------------------------------------- // functions @@ -55,7 +57,7 @@ WXDLLEXPORT bool wxFileExists(const wxString& filename); #define FileExists wxFileExists // does the path exist? (may have or not '/' or '\\' at the end) -WXDLLEXPORT bool wxPathExists(const char *pszPathName); +WXDLLEXPORT bool wxPathExists(const wxChar *pszPathName); #define wxDirExists wxPathExists #define DirExists wxDirExists @@ -64,7 +66,7 @@ WXDLLEXPORT bool wxIsAbsolutePath(const wxString& filename); #define IsAbsolutePath wxIsAbsolutePath // Get filename -WXDLLEXPORT char* wxFileNameFromPath(char *path); +WXDLLEXPORT wxChar* wxFileNameFromPath(wxChar *path); WXDLLEXPORT wxString wxFileNameFromPath(const wxString& path); #define FileNameFromPath wxFileNameFromPath @@ -75,46 +77,46 @@ WXDLLEXPORT wxString wxPathOnly(const wxString& path); // wxString version WXDLLEXPORT wxString wxRealPath(const wxString& path); -WXDLLEXPORT void wxDos2UnixFilename(char *s); +WXDLLEXPORT void wxDos2UnixFilename(wxChar *s); #define Dos2UnixFilename wxDos2UnixFilename -WXDLLEXPORT void wxUnix2DosFilename(char *s); +WXDLLEXPORT void wxUnix2DosFilename(wxChar *s); #define Unix2DosFilename wxUnix2DosFilename #ifdef __WXMAC__ - WXDLLEXPORT void wxMacPathToFSSpec( const char *path , FSSpec *spec ) ; - WXDLLEXPORT void wxMac2UnixFilename(char *s); - WXDLLEXPORT void wxUnix2MacFilename(char *s); + WXDLLEXPORT void wxMacPathToFSSpec( const wxChar *path , FSSpec *spec ) ; + WXDLLEXPORT void wxMac2UnixFilename(wxChar *s); + WXDLLEXPORT void wxUnix2MacFilename(wxChar *s); #endif // Strip the extension, in situ -WXDLLEXPORT void wxStripExtension(char *buffer); +WXDLLEXPORT void wxStripExtension(wxChar *buffer); WXDLLEXPORT void wxStripExtension(wxString& buffer); // Get a temporary filename, opening and closing the file. -WXDLLEXPORT char* wxGetTempFileName(const wxString& prefix, char *buf = (char *) NULL); +WXDLLEXPORT wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = (wxChar *) NULL); // Expand file name (~/ and ${OPENWINHOME}/ stuff) -WXDLLEXPORT char* wxExpandPath(char *dest, const char *path); +WXDLLEXPORT wxChar* wxExpandPath(wxChar *dest, const wxChar *path); // Contract w.r.t environment ( -> ${OPENWINHOME}/lib) // and make (if under the home tree) relative to home // [caller must copy-- volatile] -WXDLLEXPORT char* wxContractPath(const wxString& filename, - const wxString& envname = wxEmptyString, - const wxString& user = wxEmptyString); +WXDLLEXPORT wxChar* wxContractPath(const wxString& filename, + const wxString& envname = wxEmptyString, + const wxString& user = wxEmptyString); // Destructive removal of /./ and /../ stuff -WXDLLEXPORT char* wxRealPath(char *path); +WXDLLEXPORT wxChar* wxRealPath(wxChar *path); // Allocate a copy of the full absolute path -WXDLLEXPORT char* wxCopyAbsolutePath(const wxString& path); +WXDLLEXPORT wxChar* wxCopyAbsolutePath(const wxString& path); // Get first file name matching given wild card. // Flags are reserved for future use. #define wxFILE 1 #define wxDIR 2 -WXDLLEXPORT wxString wxFindFirstFile(const char *spec, int flags = wxFILE); +WXDLLEXPORT wxString wxFindFirstFile(const wxChar *spec, int flags = wxFILE); WXDLLEXPORT wxString wxFindNextFile(); // Does the pattern contain wildcards? @@ -142,7 +144,7 @@ WXDLLEXPORT bool wxRenameFile(const wxString& file1, const wxString& file2); // copies into buf. // IMPORTANT NOTE getcwd is know not to work under some releases // of Win32s 1.3, according to MS release notes! -WXDLLEXPORT char* wxGetWorkingDirectory(char *buf = (char *) NULL, int sz = 1000); +WXDLLEXPORT wxChar* wxGetWorkingDirectory(wxChar *buf = (wxChar *) NULL, int sz = 1000); // new and preferred version of wxGetWorkingDirectory // NB: can't have the same name because of overloading ambiguity WXDLLEXPORT wxString wxGetCwd(); @@ -151,27 +153,27 @@ WXDLLEXPORT wxString wxGetCwd(); WXDLLEXPORT bool wxSetWorkingDirectory(const wxString& d); // Make directory -WXDLLEXPORT bool wxMkdir(const wxString& dir); +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 -#define wxFILE_SEP_EXT '.' -#define wxFILE_SEP_DSK ':' -#define wxFILE_SEP_PATH_DOS '\\' -#define wxFILE_SEP_PATH_UNIX '/' +#define wxFILE_SEP_EXT _T('.') +#define wxFILE_SEP_DSK _T(':') +#define wxFILE_SEP_PATH_DOS _T('\\') +#define wxFILE_SEP_PATH_UNIX _T('/') // separator in the path list (as in PATH environment variable) // NB: these are strings and not characters on purpose! -#define wxPATH_SEP_DOS ";" -#define wxPATH_SEP_UNIX ":" +#define wxPATH_SEP_DOS _T(";") +#define wxPATH_SEP_UNIX _T(":") // platform independent versions #ifdef __UNIX__ #define wxFILE_SEP_PATH wxFILE_SEP_PATH_UNIX #define wxPATH_SEP wxPATH_SEP_UNIX -#else // Windows +#else // Windows and OS/2 #define wxFILE_SEP_PATH wxFILE_SEP_PATH_DOS #define wxPATH_SEP wxPATH_SEP_DOS #endif // Unix/Windows @@ -180,26 +182,26 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0); // filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE) #ifdef __UNIX__ #define wxARE_FILENAMES_CASE_SENSITIVE TRUE -#else // Windows +#else // Windows and OS/2 #define wxARE_FILENAMES_CASE_SENSITIVE FALSE #endif // Unix/Windows // is the char a path separator? -inline bool wxIsPathSeparator(char c) +inline bool wxIsPathSeparator(wxChar c) { return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX; } // does the string ends with path separator? -WXDLLEXPORT bool wxEndsWithPathSeparator(const char *pszFileName); +WXDLLEXPORT bool wxEndsWithPathSeparator(const wxChar *pszFileName); // split the full path into path (including drive for DOS), name and extension // (understands both '/' and '\\') -WXDLLEXPORT void wxSplitPath(const char *pszFileName, +WXDLLEXPORT void wxSplitPath(const wxChar *pszFileName, wxString *pstrPath, wxString *pstrName, wxString *pstrExt); // find a file in a list of directories, returns false if not found -WXDLLEXPORT bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile); +WXDLLEXPORT bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile); // Get the OS directory if appropriate (such as the Windows directory). // On non-Windows platform, probably just return the empty string. @@ -218,7 +220,7 @@ public: void Add(const wxString& path); // Avoid compiler warning - wxNode *Add(const char *s) { return wxStringList::Add(s); } + wxNode *Add(const wxChar *s) { return wxStringList::Add(s); } // Find the first full path for which the file exists wxString FindValidPath(const wxString& filename); // Find the first full path for which the file exists; ensure it's an @@ -235,4 +237,3 @@ private: #endif // _WX_FILEFN_H_ -