Had changed the prototype of wxOnAssert after the discovery of __TFILE__

but had forgotten to change the implementation too.

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index cf99a8b954db07a1f1fc7fc18de14f5a9008a3aa..0a3e9bdd92fa117bf4ac3a6e9dd62a6f6a3248c0 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -989,7 +989,7 @@ void Trap()
 }
 
 // this function is called when an assert fails
 }
 
 // this function is called when an assert fails

-void wxOnAssert(const char *szFile, int nLine, const wxChar *szMsg)
+void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)

 {
     // this variable can be set to true to suppress "assert failure" messages
     static bool s_bNoAsserts = FALSE;
 {
     // this variable can be set to true to suppress "assert failure" messages
     static bool s_bNoAsserts = FALSE;


@@ -1014,11 +1014,7 @@ void wxOnAssert(const char *szFile, int nLine, const wxChar *szMsg)
     wxSprintf(szBuf, _T("%s(%d): assert failed"), szFile, nLine);
 #else  // !VC++
     // make the error message more clear for all the others
     wxSprintf(szBuf, _T("%s(%d): assert failed"), szFile, nLine);
 #else  // !VC++
     // make the error message more clear for all the others

-#ifdef wxSprintf

     wxSprintf(szBuf, _T("Assert failed in file %s at line %d"), szFile, nLine);
     wxSprintf(szBuf, _T("Assert failed in file %s at line %d"), szFile, nLine);

-#else
-    wxSprintf(szBuf, _T("Assert failed in file %hs at line %d"), szFile, nLine);
-#endif

 #endif // VC/!VC
 
     if ( szMsg != NULL ) {
 #endif // VC/!VC
 
     if ( szMsg != NULL ) {