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

fixed 2 bugs which were fixed in GetFullPath() but not GetPath() and which were broken by the last commit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-04-11 18:41:48 +00:00
parent 6aa3ea889a
commit 0ea621cc25
1 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/filename.cpp
View File

@@ -1156,8 +1156,15 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
} }
else if ( format == wxPATH_UNIX ) else if ( format == wxPATH_UNIX )
{ {
if (!m_relative) if ( !m_relative )
fullpath += wxFILE_SEP_PATH_UNIX; {
// normally the absolute file names starts with a slash with one
// exception: file names like "~/foo.bar" don't have it
if ( m_dirs.IsEmpty() || m_dirs[0u] != _T('~') )
{
fullpath += wxFILE_SEP_PATH_UNIX;
}
}
} }
// then concatenate all the path components using the path separator // then concatenate all the path components using the path separator
@@ -1174,9 +1181,15 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
switch (format) switch (format)
{ {
case wxPATH_MAC: case wxPATH_MAC:
if (m_dirs[i] == wxT(".")) if ( m_dirs[i] == wxT(".") )
break; {
if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing // skip appending ':', this shouldn't be done in this
// case as "::" is interpreted as ".." under Unix
continue;
}
// convert back from ".." to nothing
if ( m_dirs[i] != wxT("..") )
fullpath += m_dirs[i]; fullpath += m_dirs[i];
break; break;
@@ -1191,7 +1204,8 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
case wxPATH_VMS: case wxPATH_VMS:
// TODO: What to do with ".." under VMS // TODO: What to do with ".." under VMS
if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing // convert back from ".." to nothing
if ( m_dirs[i] != wxT("..") )
fullpath += m_dirs[i]; fullpath += m_dirs[i];
break; break;
} }