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

Fixed wxApp::OnAssert signature.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-06-15 01:43:03 +00:00
parent 238d33aa53
commit be88a6ade9
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
include/wx/gtk1/app.h
View File

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

4
src/gtk/app.cpp
View File

@@ -848,11 +848,11 @@ int wxEntry( int argc, char *argv[] )
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
{ {
m_isInAssert = TRUE; m_isInAssert = TRUE;
wxAppBase::OnAssert(file, line, msg); wxAppBase::OnAssert(file, line, cond, msg);
m_isInAssert = FALSE; m_isInAssert = FALSE;
} }

4
src/gtk1/app.cpp
View File

@@ -848,11 +848,11 @@ int wxEntry( int argc, char *argv[] )
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
{ {
m_isInAssert = TRUE; m_isInAssert = TRUE;
wxAppBase::OnAssert(file, line, msg); wxAppBase::OnAssert(file, line, cond, msg);
m_isInAssert = FALSE; m_isInAssert = FALSE;
} }