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

Had changed the prototype of wxOnAssert after the discovery of __TFILE__

Browse Source 
but had forgotten to change the implementation too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-16 22:59:58 +00:00
parent 7af61b2e18
commit 6f9eb45239
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/log.cpp
View File

@@ -989,7 +989,7 @@ void Trap()
} }
// this function is called when an assert fails // this function is called when an assert fails
void wxOnAssert(const char *szFile, int nLine, const wxChar *szMsg) void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
{ {
// this variable can be set to true to suppress "assert failure" messages // this variable can be set to true to suppress "assert failure" messages
static bool s_bNoAsserts = FALSE; static bool s_bNoAsserts = FALSE;
@@ -1014,11 +1014,7 @@ void wxOnAssert(const char *szFile, int nLine, const wxChar *szMsg)
wxSprintf(szBuf, _T("%s(%d): assert failed"), szFile, nLine); wxSprintf(szBuf, _T("%s(%d): assert failed"), szFile, nLine);
#else // !VC++ #else // !VC++
// make the error message more clear for all the others // make the error message more clear for all the others
#ifdef wxSprintf
wxSprintf(szBuf, _T("Assert failed in file %s at line %d"), szFile, nLine); wxSprintf(szBuf, _T("Assert failed in file %s at line %d"), szFile, nLine);
#else
wxSprintf(szBuf, _T("Assert failed in file %hs at line %d"), szFile, nLine);
#endif
#endif // VC/!VC #endif // VC/!VC
if ( szMsg != NULL ) { if ( szMsg != NULL ) {