added another needed wxOnAssert overload

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

diff --git a/include/wx/debug.h b/include/wx/debug.h
index 146e6d1ab0653f251f0ff657a51c3a9a56e1a461..69d0b1eb81bd550f93c22187e58a5029696815c2 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -144,6 +144,12 @@
                                           const wxString& szFunc,
                                           const wxString& szCond);
 
                                           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();
   /*  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 477935187fdcc77878457fe75c4079bc2137f8d4..9a4389dd05b964ac5ec33ee348d3666f61856b06 100644 (file)
--- 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);
 }
 
     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,
 #if wxUSE_UNICODE
 void wxOnAssert(const char *szFile,
                 int nLine,