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

fixed Assign(fullpath, fullname)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-12-04 01:14:09 +00:00
parent a8e6bf8ae2
commit 81f256328c
4 changed files with 64 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/common/filename.cpp
View File

@@ -247,27 +247,46 @@ void wxFileName::Assign(const wxString& fullpath,
Assign(volume, path, name, ext, format);
}
void wxFileName::Assign(const wxString& fullpath,
void wxFileName::Assign(const wxString& fullpathOrig,
const wxString& fullname,
wxPathFormat format)
{
// always recognize fullpath as directory, even if it doesn't end with a
// slash
wxString fullpath = fullpathOrig;
if ( !wxEndsWithPathSeparator(fullpath) )
{
fullpath += GetPathSeparators(format)[0u];
}
wxString volume, path, name, ext;
// do some consistency checks in debug mode: the name should be really just
// the filename and the path should be realyl just a path
#ifdef __WXDEBUG__
wxString pathDummy, nameDummy, extDummy;
SplitPath(fullname, &pathDummy, &name, &ext, format);
wxASSERT_MSG( pathDummy.empty(),
_T("the file name shouldn't contain the path") );
SplitPath(fullpath, &volume, &path, &nameDummy, &extDummy, format);
wxASSERT_MSG( nameDummy.empty() && extDummy.empty(),
_T("the path shouldn't contain file name nor extension") );
#else // !__WXDEBUG__
SplitPath(fullname, NULL /* no path */, &name, &ext, format);
SplitPath(fullpath, &volume, &path, NULL, NULL, format);
#endif // __WXDEBUG__/!__WXDEBUG__
Assign(volume, path, name, ext, format);
}
void wxFileName::AssignDir(const wxString& dir, wxPathFormat format)
{
// always recognize dir as directory, even if it doesn't end with a slash
wxString dirname = dir;
if ( !wxEndsWithPathSeparator(dirname) )
{
dirname += GetPathSeparators(format)[0u];
}
Assign(dirname, _T(""), format);
Assign(dir, _T(""), format);
}
void wxFileName::Clear()