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

override OnAssertFailure(), not OnAssert() which is not called by wxOnAssert() any longer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-08-25 22:48:07 +00:00
parent 543a99218d
commit 2d97237dac
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/app.h
View File

@@ -47,7 +47,11 @@ public:
static bool InitialzeVisual(); static bool InitialzeVisual();
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg); virtual void OnAssertFailure(const wxChar *file,
int line,
const wxChar *func,
const wxChar *cond,
const wxChar *msg);
bool IsInAssert() const { return m_isInAssert; } bool IsInAssert() const { return m_isInAssert; }
#endif // __WXDEBUG__ #endif // __WXDEBUG__

8
src/gtk/app.cpp
View File

@@ -619,11 +619,15 @@ void wxApp::CleanUp()
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) void wxApp::OnAssertFailure(const wxChar *file,
int line,
const wxChar* func,
const wxChar* cond,
const wxChar *msg)
{ {
m_isInAssert = true; m_isInAssert = true;
wxAppBase::OnAssert(file, line, cond, msg); wxAppBase::OnAssertFailure(file, line, func, cond, msg);
m_isInAssert = false; m_isInAssert = false;
} }