AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed wxIsPathSeparator() to work for Mac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-01-04 01:39:22 +00:00
parent c6b3a07ceb
commit 903b61cc9d
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/filefn.h
View File

@ -303,7 +303,14 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
// 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);

8
src/common/filefn.cpp
View File

@ -1519,11 +1519,9 @@ wxString wxGetOSDirectory()
bool wxEndsWithPathSeparator(const wxChar *pszFileName)
{
size_t len = wxStrlen(pszFileName);
if ( len == 0 )
return FALSE;
else
return wxIsPathSeparator(pszFileName[len - 1]);
size_t len = wxStrlen(pszFileName);
return len && wxIsPathSeparator(pszFileName[len - 1]);
}
// find a file in a list of directories, returns false if not found

4
src/common/filename.cpp
View File

@ -550,9 +550,9 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
{
// default
#ifdef __DOS__
dir = _T(".");
dir = _T(".");
#else
dir = _T("/tmp");
dir = _T("/tmp");
#endif
}
#endif