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

new wxASSERT implementation using wxAssert() helper function

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-06-13 19:37:43 +00:00
parent b7b35e5063
commit aad65f130d
6 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/common/appcmn.cpp
View File

@@ -424,23 +424,22 @@ void wxTrap()
// show the assert modal dialog
static
void ShowAssertDialog(const wxChar *szFile, int nLine, const wxChar *szMsg)
void ShowAssertDialog(const wxChar *szFile,
int nLine,
const wxChar *szCond,
const wxChar *szMsg)
{
// this variable can be set to true to suppress "assert failure" messages
static bool s_bNoAsserts = FALSE;
wxChar szBuf[4096];
// make life easier for people using VC++ IDE: clicking on the message
// will take us immediately to the place of the failed assert
// make life easier for people using VC++ IDE by using this format: like
// this, clicking on the message will take us immediately to the place of
// the failed assert
wxSnprintf(szBuf, WXSIZEOF(szBuf),
#ifdef __VISUALC__
wxT("%s(%d): assert failed"),
#else // !VC++
// make the error message more clear for all the others
wxT("Assert failed in file %s at line %d"),
#endif // VC/!VC
szFile, nLine);
wxT("%s(%d): assert \"%s\" failed"),
szFile, nLine, szCond);
if ( szMsg != NULL )
{
@@ -501,7 +500,10 @@ void ShowAssertDialog(const wxChar *szFile, int nLine, const wxChar *szMsg)
}
// this function is called when an assert fails
void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
void wxOnAssert(const wxChar *szFile,
int nLine,
const wxChar *szCond,
const wxChar *szMsg)
{
// FIXME MT-unsafe
static bool s_bInAssert = FALSE;
@@ -522,20 +524,23 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
{
// by default, show the assert dialog box - we can't customize this
// behaviour
ShowAssertDialog(szFile, nLine, szMsg);
ShowAssertDialog(szFile, nLine, szCond, szMsg);
}
else
{
// let the app process it as it wants
wxTheApp->OnAssert(szFile, nLine, szMsg);
wxTheApp->OnAssert(szFile, nLine, szCond, szMsg);
}
s_bInAssert = FALSE;
}
void wxAppBase::OnAssert(const wxChar *file, int line, const wxChar *msg)
void wxAppBase::OnAssert(const wxChar *file,
int line,
const wxChar *cond,
const wxChar *msg)
{
ShowAssertDialog(file, line, msg);
ShowAssertDialog(file, line, cond, msg);
}
#endif //WXDEBUG