fix compilation without WXDEBUG (includes patch 561458)

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 0a689ed00f08d60f5ac66902b656f5ab35e74eaa..f770198fc6ac6dc2ad6660ec288f5eccee1aeff0 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -74,7 +74,9 @@ public:
     // Processes an X event.
     virtual bool ProcessXEvent(WXEvent* event);
     
     // Processes an X event.
     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 *msg);

+#endif // __WXDEBUG__

     
 protected:
     bool                  m_showOnInit;
     
 protected:
     bool                  m_showOnInit;

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 46eeb9379addc062bb18a660e27565416d125bb4..a1eb5192b5d7f1a243bc7ecb72249883c1818ed0 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -1219,6 +1219,8 @@ bool wxApp::Yield(bool onlyIfNeeded)
     return TRUE;
 }
 
     return TRUE;
 }
 

+#ifdef __WXDEBUG__
+

 void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 {
     // While the GUI isn't working that well, just print out the
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 {
     // While the GUI isn't working that well, just print out the


@@ -1232,3 +1234,5 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 #endif
 }
 
 #endif
 }
 

+#endif // __WXDEBUG__
+