Actually check if the menu should be shown before popping it up

[wxWidgets.git] / src / x11 / app.cpp

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 46eeb9379addc062bb18a660e27565416d125bb4..42749948e2e9a0b0bc52bd78375fc31c815b3b2e 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -1219,12 +1219,14 @@ bool wxApp::Yield(bool onlyIfNeeded)
     return TRUE;
 }
 
-void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+#ifdef __WXDEBUG__
+
+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);
@@ -1232,3 +1234,5 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 #endif
 }
 
+#endif // __WXDEBUG__
+