Corrected OnAssert

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index f770198fc6ac6dc2ad6660ec288f5eccee1aeff0..77927b4f49e4c4cfcc6988d12eb80a1f76f4409b 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -75,7 +75,7 @@ public:
     virtual bool ProcessXEvent(WXEvent* event);
     
 #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);
 #endif // __WXDEBUG__
     
 protected:

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index a1eb5192b5d7f1a243bc7ecb72249883c1818ed0..42749948e2e9a0b0bc52bd78375fc31c815b3b2e 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -1221,12 +1221,12 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
 #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)
 {
     // While the GUI isn't working that well, just print out the
     // message.
 #if 1
-    wxAppBase::OnAssert(file, line, msg);
+    wxAppBase::OnAssert(file, line, cond, msg);
 #else
     wxString msg2;
     msg2.Printf("At file %s:%d: %s", file, line, msg);