Add wxDir::GetNameWithSep() and use it to avoid consecutive slashes.

It is wrong to use dir.GetName()+"/" to obtain a slash-terminated directory
name as this results in (usually harmless but at best ugly) double slashes at
at the beginning of the string for the root directory. Add GetNameWithSep() to
obtain the correct result in all cases.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-05-04 20:35:31 +00:00
parent 50cbca27ad
commit c9f6f0a8cd
5 changed files with 54 additions and 4 deletions

View File

@@ -218,11 +218,31 @@ public:
int flags = wxDIR_DEFAULT) const;
/**
Returns the name of the directory itself. The returned string does not
have the trailing path separator (slash or backslash).
Returns the name of the directory itself.
The returned string does not have the trailing path separator (slash or
backslash).
Notice that in spite of this the last character of the returned string
can still be the path separator if this directory is the root one.
Because of this, don't append ::wxFILE_SEP_PATH to the returned value
if you do need a slash-terminated directory name but use
GetNameWithSep() instead to avoid having duplicate consecutive slashes.
*/
wxString GetName() const;
/**
Returns the name of the directory with the path separator appended.
The last character of the returned string is always ::wxFILE_SEP_PATH
unless the string is empty, indicating that this directory is invalid.
@see GetName()
@since 2.9.4
*/
wxString GetNameWithSep() const;
/**
Continue enumerating files which satisfy the criteria specified by the
last call to GetFirst().