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

[ 1521481 ] wxPathList modernization

Browse Source 
Applied part II.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-09-17 11:58:12 +00:00
parent 5b2acc3a4f
commit 31a8bf3fbf
2 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/filefn.cpp
View File

@@ -146,11 +146,15 @@ WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode )
// wxPathList
// ----------------------------------------------------------------------------
void wxPathList::Add (const wxString& path)
void wxPathList::Add(const wxString& path)
{
// add only the path part of the given string (not the filename, in case it's present)
// add a path separator to force wxFileName to interpret it always as a directory
// (i.e. if we are called with '/home/user' we want to consider it a folder and
// not, as wxFileName would consider, a filename).
wxFileName fn(path + wxFileName::GetPathSeparator());
fn.Normalize(); // add only normalized paths
// add only normalized relative/absolute paths
fn.Normalize(wxPATH_NORM_DOTS|wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS);
wxString toadd = fn.GetPath();
if (Index(toadd) == wxNOT_FOUND)
@@ -211,12 +215,17 @@ bool wxPathList::Member (const wxString& path) const
wxString wxPathList::FindValidPath (const wxString& file) const
{
// normalize the given string as it could be a path + a filename
// and not only a filename
wxFileName fn(file);
wxString strend;
fn.Normalize();
// NB: normalize without making absolute !
fn.Normalize(wxPATH_NORM_DOTS|wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS);
wxASSERT_MSG(!fn.IsDir(), wxT("Cannot search for directories; only for files"));
if (fn.IsAbsolute())
strend = fn.GetFullName();
strend = fn.GetFullName(); // search for the file name and ignore the path part
else
strend = fn.GetFullPath();