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

replace more __WXDEBUG__ occurrences with wxDEBUG_LEVEL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-22 12:53:48 +00:00
parent b16f24dd05
commit 4b6a582bef
68 changed files with 243 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/filename.cpp
View File

@@ -472,9 +472,8 @@ void wxFileName::Assign(const wxString& fullpathOrig,
wxString volume, path, name, ext;
bool hasExt;
// do some consistency checks in debug mode: the name should be really just
// the filename and the path should be really just a path
#ifdef __WXDEBUG__
// do some consistency checks: the name should be really just the filename
// and the path should be really just a path
wxString volDummy, pathDummy, nameDummy, extDummy;
SplitPath(fullname, &volDummy, &pathDummy, &name, &ext, &hasExt, format);
@@ -487,12 +486,6 @@ void wxFileName::Assign(const wxString& fullpathOrig,
wxASSERT_MSG( nameDummy.empty() && extDummy.empty(),
_T("the path shouldn't contain file name nor extension") );
#else // !__WXDEBUG__
SplitPath(fullname, NULL /* no volume */, NULL /* no path */,
&name, &ext, &hasExt, format);
SplitPath(fullpath, &volume, &path, NULL, NULL, format);
#endif // __WXDEBUG__/!__WXDEBUG__
Assign(volume, path, name, ext, hasExt, format);
}