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

Various fixes for wxFilename.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-12-30 12:47:48 +00:00
parent a35b27b14d
commit 4fdfb5587f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/filename.cpp
View File

@@ -75,12 +75,18 @@ void wxFileName::Assign( const wxString &path, bool dir_only, wxPathFormat forma
seps = ":"; seps = ":";
} }
wxStringTokenizer tn( path, seps ); wxStringTokenizer tn( path, seps, wxTOKEN_RET_EMPTY_ALL );
bool first = TRUE;
while (tn.HasMoreTokens()) while (tn.HasMoreTokens())
{ {
wxString token( tn.GetNextToken() ); wxString token( tn.GetNextToken() );
if (!token.IsEmpty())
// If the path starts with a slash, we need the first
// dir entry to be an empty for later reassembly.
if (first || !token.IsEmpty())
m_dirs.Add( token ); m_dirs.Add( token );
first = FALSE;
} }
if (!dir_only) if (!dir_only)
@@ -344,6 +350,7 @@ void wxFileName::SetFullName( const wxString name, wxPathFormat format )
format = GetFormat( format ); format = GetFormat( format );
m_name = name; m_name = name;
m_ext = wxEmptyString;
if (m_name == wxT(".")) return; if (m_name == wxT(".")) return;
if (m_name == wxT("..")) return; if (m_name == wxT("..")) return;
@@ -409,7 +416,6 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
else else
if (format == wxPATH_UNIX) if (format == wxPATH_UNIX)
{ {
ret = '/'; // FIXME: must be absolute
for (size_t i = 0; i < m_dirs.GetCount(); i++) for (size_t i = 0; i < m_dirs.GetCount(); i++)
{ {
ret += m_dirs[i]; ret += m_dirs[i];
@@ -446,7 +452,6 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const
else else
if (format == wxPATH_UNIX) if (format == wxPATH_UNIX)
{ {
ret = '/'; // FIXME: must be absolute
for (size_t i = 0; i < m_dirs.GetCount(); i++) for (size_t i = 0; i < m_dirs.GetCount(); i++)
{ {
ret += m_dirs[i]; ret += m_dirs[i];