X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea57084d103187771c0306a6e1684e32244d6101..29f538cea2cfcbb272ca724f8dbf778207530033:/include/wx/debug.h?ds=inline diff --git a/include/wx/debug.h b/include/wx/debug.h index 5ccea5af0f..99d01d268a 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -14,6 +14,13 @@ #include +#include "wx/wxchar.h" + +#ifndef __TFILE__ +#define __XFILE__(x) _T(x) +#define __TFILE__ __XFILE__(__FILE__) +#endif + // ---------------------------------------------------------------------------- /** @name Debugging macros @@ -51,12 +58,20 @@ @param szFile and nLine - file name and line number of the ASSERT szMsg - optional message explaining the reason */ - void WXDLLEXPORT wxOnAssert(const char *szFile, int nLine, const char *szMsg = (const char *) NULL); + void WXDLLEXPORT wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg = (const wxChar *) NULL); /// generic assert macro - #define wxASSERT(cond) if ( !(cond) ) wxOnAssert(__FILE__, __LINE__) - /// assert with additional message explaining it's cause - #define wxASSERT_MSG(x, m) if ( !(x) ) wxOnAssert(__FILE__, __LINE__, m) + #define wxASSERT(cond) if ( !(cond) ) wxOnAssert(__TFILE__, __LINE__) + +#if 0 // defined(__BORLANDC__) && defined(__WIN16__) + // Too much text, so make wxASSERT_MSG the same as wxASSERT, + // thus removing the text from the program. + #define wxASSERT_MSG(x, m) if ( !(x) ) wxOnAssert(__TFILE__, __LINE__) +#else + /// assert with additional message explaining it's cause + #define wxASSERT_MSG(x, m) if ( !(x) ) wxOnAssert(__TFILE__, __LINE__, m) +#endif + #else // nothing to do in release modes (hopefully at this moment there are // no more bugs ;-) @@ -66,8 +81,15 @@ /// special form of assert: always triggers it (in debug mode) #define wxFAIL wxASSERT(wxFalse) + +#if 0 // defined(__BORLANDC__) && defined(__WIN16__) + // Too much text, so make wxFAIL_MSG the same as wxFAIL, + // thus removing the text from the program. +#define wxFAIL_MSG(msg) wxASSERT(wxFalse) +#else /// FAIL with some message #define wxFAIL_MSG(msg) wxASSERT_MSG(wxFalse, msg) +#endif //@} // NB: these macros work also in release mode! @@ -100,4 +122,3 @@ //@} #endif // _WX_DEBUG_H_ -