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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index ed87ea537b04933cd19c52590f61fc95ee8f1216..adddee2b47ba1a6b62ac53f8bb166d07f52702f7 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -47,7 +47,11 @@ public:
     static bool InitialzeVisual();
 
 #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; }
 #endif // __WXDEBUG__

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 52d8556a65ddf58e44c340306c06190dd780dc0a..160deeaba18e190718417c4de09ff7cb886f999e 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -619,11 +619,15 @@ void wxApp::CleanUp()
 
 #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;
 
-    wxAppBase::OnAssert(file, line, cond, msg);
+    wxAppBase::OnAssertFailure(file, line, func, cond, msg);
 
     m_isInAssert = false;
 }