diff --git a/include/wx/debug.h b/include/wx/debug.h index 851b405597..f1a4d9b4e8 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -178,18 +178,18 @@ inline void wxDisableAsserts() { wxSetAssertHandler(NULL); } // // also notice that these functions can't be inline as wxString is not defined // yet (and can't be as wxString code itself may use assertions) -extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const char *file, +extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file, int line, const char *func, const char *cond); -extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const char *file, +extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file, int line, const char *func, const char *cond, const char *msg); -extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const char *file, +extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file, int line, const char *func, const char *cond, @@ -199,7 +199,7 @@ extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const char *file, // this version is for compatibility with wx 2.8 Unicode build only, we don't // use it ourselves any more except in ANSI-only build in which case it is all // we need -extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const wxChar *file, +extern WXDLLIMPEXP_BASE void wxOnAssert(const wxChar *file, int line, const char *func, const wxChar *cond, @@ -208,24 +208,24 @@ extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const wxChar *file // these overloads work when msg passed to debug macro is a string and we // also have to provide wxCStrData overload to resolve ambiguity which would // otherwise arise from wxASSERT( s.c_str() ) -extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file, +extern WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file, int line, const wxString& func, const wxString& cond, const wxString& msg); -extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file, +extern WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file, int line, const wxString& func, const wxString& cond); -extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const char *file, +extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file, int line, const char *func, const char *cond, const wxCStrData& msg); -extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const char *file, +extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file, int line, const char *func, const char *cond,