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

show the function in which the assert failure occured if the compiler supports it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-21 15:19:53 +00:00
parent bc151e8486
commit dfa0b52f4a
3 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/appbase.cpp
View File

@@ -93,6 +93,7 @@
static
void ShowAssertDialog(const wxChar *szFile,
int nLine,
const wxChar *szFunc,
const wxChar *szCond,
const wxChar *szMsg,
wxAppTraits *traits = NULL);
@@ -434,12 +435,21 @@ bool wxAppConsole::CheckBuildOptions(const char *optionsSignature,
#ifdef __WXDEBUG__
void wxAppConsole::OnAssertFailure(const wxChar *file,
int line,
const wxChar *func,
const wxChar *cond,
const wxChar *msg)
{
ShowAssertDialog(file, line, func, cond, msg, GetTraits());
}
void wxAppConsole::OnAssert(const wxChar *file,
int line,
const wxChar *cond,
const wxChar *msg)
{
ShowAssertDialog(file, line, cond, msg, GetTraits());
OnAssertFailure(file, line, _T(""), cond, msg);
}
#endif // __WXDEBUG__
@@ -590,6 +600,7 @@ void wxTrap()
// this function is called when an assert fails
void wxOnAssert(const wxChar *szFile,
int nLine,
const wxChar *szFunc,
const wxChar *szCond,
const wxChar *szMsg)
{
@@ -612,12 +623,12 @@ void wxOnAssert(const wxChar *szFile,
{
// by default, show the assert dialog box -- we can't customize this
// behaviour
ShowAssertDialog(szFile, nLine, szCond, szMsg);
ShowAssertDialog(szFile, nLine, szFunc, szCond, szMsg);
}
else
{
// let the app process it as it wants
wxTheApp->OnAssert(szFile, nLine, szCond, szMsg);
wxTheApp->OnAssertFailure(szFile, nLine, szFunc, szCond, szMsg);
}
s_bInAssert = false;
@@ -747,6 +758,7 @@ static wxString GetAssertStackTrace()
static
void ShowAssertDialog(const wxChar *szFile,
int nLine,
const wxChar *szFunc,
const wxChar *szCond,
const wxChar *szMsg,
wxAppTraits *traits)
@@ -762,6 +774,11 @@ void ShowAssertDialog(const wxChar *szFile,
// the failed assert
msg.Printf(wxT("%s(%d): assert \"%s\" failed"), szFile, nLine, szCond);
// add the function name, if any
if ( szFunc && *szFunc )
msg << _T(" in ") << szFunc << _T("()");
// and the message itself
if ( szMsg )
{
msg << _T(": ") << szMsg;