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

fixed compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-12-04 16:29:43 +00:00
parent e562df9b4b
commit ae4d7004d3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/filename.cpp
View File

@@ -24,7 +24,7 @@
There are also UNC names of the form \\share\fullpath There are also UNC names of the form \\share\fullpath
wxPATH_MAC: Mac OS 8/9 and Mac OS X under CodeWarrior 7 format, absolute file wxPATH_MAC: Mac OS 8/9 and Mac OS X under CodeWarrior 7 format, absolute file
names have the form names have the form
volume:dir1:...:dirN:filename volume:dir1:...:dirN:filename
and the relative file names are either and the relative file names are either
@@ -367,7 +367,7 @@ wxString wxFileName::GetCwd(const wxString& volume)
{ {
SetCwd(cwdOld); SetCwd(cwdOld);
} }
return cwd; return cwd;
} }
@@ -629,7 +629,7 @@ bool wxFileName::Normalize(wxPathNormalize flags,
wxFileName curDir; wxFileName curDir;
format = GetFormat(format); format = GetFormat(format);
// make the path absolute // make the path absolute
if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute() ) if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute() )
{ {
@@ -656,7 +656,7 @@ bool wxFileName::Normalize(wxPathNormalize flags,
} }
} }
} }
// handle ~ stuff under Unix only // handle ~ stuff under Unix only
if ( (format == wxPATH_UNIX) && (flags & wxPATH_NORM_TILDE) ) if ( (format == wxPATH_UNIX) && (flags & wxPATH_NORM_TILDE) )
{ {
@@ -709,7 +709,7 @@ bool wxFileName::Normalize(wxPathNormalize flags,
return FALSE; return FALSE;
} }
m_dirs.Remove(m_dirs.GetCount() - 1); m_dirs.RemoveAt(m_dirs.GetCount() - 1);
continue; continue;
} }
} }
@@ -770,8 +770,8 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format)
while ( !m_dirs.IsEmpty() && !fnBase.m_dirs.IsEmpty() && while ( !m_dirs.IsEmpty() && !fnBase.m_dirs.IsEmpty() &&
m_dirs[0u].IsSameAs(fnBase.m_dirs[0u], withCase) ) m_dirs[0u].IsSameAs(fnBase.m_dirs[0u], withCase) )
{ {
m_dirs.Remove(0u); m_dirs.RemoveAt(0);
fnBase.m_dirs.Remove(0u); fnBase.m_dirs.RemoveAt(0);
} }
// add as many ".." as needed // add as many ".." as needed