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

fixed GetPath() trailing separator bug, rewrote GetFullPath() in terms of GetPath()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-04-11 12:20:27 +00:00
parent 62dcaed6ba
commit 4175794e03
1 changed files with 19 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
src/common/filename.cpp
View File

@@ -1171,46 +1171,38 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
for ( size_t i = 0; i < dirCount; i++ ) for ( size_t i = 0; i < dirCount; i++ )
{ {
// TODO: What to do with ".." under VMS
switch (format) switch (format)
{ {
case wxPATH_MAC: case wxPATH_MAC:
{
if (m_dirs[i] == wxT(".")) if (m_dirs[i] == wxT("."))
break; break;
if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing
fullpath += m_dirs[i]; fullpath += m_dirs[i];
fullpath += wxT(':');
break; break;
}
default:
wxFAIL_MSG( wxT("unexpected path format") );
// still fall through
case wxPATH_DOS: case wxPATH_DOS:
{
fullpath += m_dirs[i];
fullpath += wxT('\\');
break;
}
case wxPATH_UNIX: case wxPATH_UNIX:
{
fullpath += m_dirs[i]; fullpath += m_dirs[i];
fullpath += wxT('/');
break; break;
}
case wxPATH_VMS: case wxPATH_VMS:
{ // TODO: What to do with ".." under VMS
if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing
fullpath += m_dirs[i]; fullpath += m_dirs[i];
if (i == dirCount-1)
fullpath += wxT(']');
else
fullpath += wxT('.');
break; break;
}
default:
{
wxFAIL_MSG( wxT("error") );
}
} }
if ( i != dirCount - 1 )
fullpath += GetPathSeparator(format);
}
if ( format == wxPATH_VMS )
{
fullpath += wxT(']');
} }
} }
@@ -1224,91 +1216,11 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
wxString wxFileName::GetFullPath( wxPathFormat format ) const wxString wxFileName::GetFullPath( wxPathFormat format ) const
{ {
format = GetFormat(format); // we already have a function to get the path
wxString fullpath = GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR,
format);
// first put the volume // now just add the file name and extension to it
wxString fullpath = wxGetVolumeString(m_volume, format);
// the leading character
if ( format == wxPATH_MAC )
{
if ( m_relative )
fullpath += wxFILE_SEP_PATH_MAC;
}
else if ( format == wxPATH_DOS )
{
if ( !m_relative )
fullpath += wxFILE_SEP_PATH_DOS;
}
else if ( format == wxPATH_UNIX )
{
if ( !m_relative )
{
// 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
size_t dirCount = m_dirs.GetCount();
if ( dirCount )
{
if ( format == wxPATH_VMS )
{
fullpath += wxT('[');
}
for ( size_t i = 0; i < dirCount; i++ )
{
// TODO: What to do with ".." under VMS
switch (format)
{
case wxPATH_MAC:
{
if (m_dirs[i] == wxT("."))
break;
if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing
fullpath += m_dirs[i];
fullpath += wxT(':');
break;
}
case wxPATH_DOS:
{
fullpath += m_dirs[i];
fullpath += wxT('\\');
break;
}
case wxPATH_UNIX:
{
fullpath += m_dirs[i];
fullpath += wxT('/');
break;
}
case wxPATH_VMS:
{
if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing
fullpath += m_dirs[i];
if (i == dirCount-1)
fullpath += wxT(']');
else
fullpath += wxT('.');
break;
}
default:
{
wxFAIL_MSG( wxT("error") );
}
}
}
}
// finally add the file name and extension
fullpath += GetFullName(); fullpath += GetFullName();
return fullpath; return fullpath;