Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes wxDirExists() to accept wxString instead of wxChar*, so that it can be used with any string literals

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-03-02 12:44:52 +00:00
parent 1c8c91463f
commit e960c20e38
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/function.tex
View File

@@ -1114,7 +1114,7 @@ or drive name at the beginning.
\membersection{::wxDirExists}\label{functionwxdirexists} \membersection{::wxDirExists}\label{functionwxdirexists}
\func{bool}{wxDirExists}{\param{const wxChar *}{dirname}} \func{bool}{wxDirExists}{\param{const wxString\& }{dirname}}
Returns true if \arg{dirname} exists and is a directory. Returns true if \arg{dirname} exists and is a directory.

2
include/wx/filefn.h
View File

@@ -452,7 +452,7 @@ const int wxInvalidOffset = -1;
WXDLLIMPEXP_BASE bool wxFileExists(const wxString& filename); WXDLLIMPEXP_BASE bool wxFileExists(const wxString& filename);
// does the path exist? (may have or not '/' or '\\' at the end) // does the path exist? (may have or not '/' or '\\' at the end)
WXDLLIMPEXP_BASE bool wxDirExists(const wxChar *pszPathName); WXDLLIMPEXP_BASE bool wxDirExists(const wxString& pathName);
WXDLLIMPEXP_BASE bool wxIsAbsolutePath(const wxString& filename); WXDLLIMPEXP_BASE bool wxIsAbsolutePath(const wxString& filename);

6
src/common/filefn.cpp
View File

@@ -1280,9 +1280,9 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
} }
// does the path exists? (may have or not '/' or '\\' at the end) // does the path exists? (may have or not '/' or '\\' at the end)
bool wxDirExists(const wxChar *pszPathName) bool wxDirExists(const wxString& pathName)
{ {
wxString strPath(pszPathName); wxString strPath(pathName);
#if defined(__WINDOWS__) || defined(__OS2__) #if defined(__WINDOWS__) || defined(__OS2__)
// Windows fails to find directory named "c:\dir\" even if "c:\dir" exists, // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
@@ -1326,7 +1326,7 @@ bool wxDirExists(const wxChar *pszPathName)
return wxStat(strPath.c_str(), &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR); return wxStat(strPath.c_str(), &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR);
#else #else
// S_IFMT not supported in VA compilers.. st_mode is a 2byte value only // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only
return wxStat(pszPathName, &st) == 0 && (st.st_mode == S_IFDIR); return wxStat(strPath.c_str(), &st) == 0 && (st.st_mode == S_IFDIR);
#endif #endif
#endif // __WIN32__/!__WIN32__ #endif // __WIN32__/!__WIN32__