From fbaf7d45138ac5a12aac58774004f247f46b8477 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 21 May 2007 18:24:42 +0000 Subject: [PATCH 1/1] added another needed wxOnAssert overload git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/debug.h | 6 ++++++ src/common/appbase.cpp | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/include/wx/debug.h b/include/wx/debug.h index 146e6d1ab0..69d0b1eb81 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -144,6 +144,12 @@ const wxString& szFunc, const wxString& szCond); + extern void WXDLLIMPEXP_BASE wxOnAssert(const char *szFile, + int nLine, + const char *szFunc, + const char *szCond, + const wxString& szMsg); + /* call this function to break into the debugger unconditionally (assuming */ /* the program is running under debugger, of course) */ extern void WXDLLIMPEXP_BASE wxTrap(); diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index 477935187f..9a4389dd05 100644 --- a/src/common/appbase.cpp +++ b/src/common/appbase.cpp @@ -844,6 +844,15 @@ void wxOnAssert(const wxChar *szFile, wxDoOnAssert(szFile, nLine, szFunc, szCond, szMsg); } +void wxOnAssert(const char *szFile, + int nLine, + const char *szFunc, + const char *szCond, + const wxString& szMsg) +{ + wxDoOnAssert(szFile, nLine, szFunc, szCond, szMsg); +} + #if wxUSE_UNICODE void wxOnAssert(const char *szFile, int nLine, -- 2.45.2