Corrected OnAssert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -75,7 +75,7 @@ public:
|
|||||||
virtual bool ProcessXEvent(WXEvent* event);
|
virtual bool ProcessXEvent(WXEvent* event);
|
||||||
|
|
||||||
#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);
|
||||||
#endif // __WXDEBUG__
|
#endif // __WXDEBUG__
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@@ -1221,12 +1221,12 @@ bool wxApp::Yield(bool onlyIfNeeded)
|
|||||||
|
|
||||||
#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)
|
||||||
{
|
{
|
||||||
// While the GUI isn't working that well, just print out the
|
// While the GUI isn't working that well, just print out the
|
||||||
// message.
|
// message.
|
||||||
#if 1
|
#if 1
|
||||||
wxAppBase::OnAssert(file, line, msg);
|
wxAppBase::OnAssert(file, line, cond, msg);
|
||||||
#else
|
#else
|
||||||
wxString msg2;
|
wxString msg2;
|
||||||
msg2.Printf("At file %s:%d: %s", file, line, msg);
|
msg2.Printf("At file %s:%d: %s", file, line, msg);
|
||||||
|
Reference in New Issue
Block a user