// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#ifndef __DEBUGH__
-#define __DEBUGH__
+#ifndef _WX_DEBUG_H_
+#define _WX_DEBUG_H_
#include <assert.h>
<BR>
<BR>
Extensive use of these macros is recommended! Remember that ASSERTs are
- disabled in final (without DEBUG defined) build, so they add strictly
+ disabled in final (without __WXDEBUG__ defined) build, so they add strictly
nothing to your program's code. On the other hand, CHECK macros do stay
even in release builds, but in general are not much of a burden, while
a judicious use of them might increase your program's stability.
/** @name Macros which are completely disabled in 'release' mode */
//@{
-#ifdef __DEBUG__
+#ifdef __WXDEBUG__
/**
this function may be redefined to do something non trivial and is called
whenever one of debugging macros fails (i.e. condition is false in an
@param szFile and nLine - file name and line number of the ASSERT
szMsg - optional message explaining the reason
*/
- void wxOnAssert(const char *szFile, int nLine, const char *szMsg = NULL);
+ void WXDLLEXPORT wxOnAssert(const char *szFile, int nLine, const char *szMsg = (const char *) NULL);
/// generic assert macro
#define wxASSERT(cond) if ( !(cond) ) wxOnAssert(__FILE__, __LINE__)
- /// assert with additional message explaining it's cause
+
+#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(__FILE__, __LINE__)
+#else
+ /// assert with additional message explaining it's cause
#define wxASSERT_MSG(x, m) if ( !(x) ) wxOnAssert(__FILE__, __LINE__, m)
+#endif
+
#else
// nothing to do in release modes (hopefully at this moment there are
// no more bugs ;-)
#define wxASSERT(cond)
#define wxASSERT_MSG(x, m)
-#endif //DEBUG
+#endif //__WXDEBUG__
/// special form of assert: always triggers it (in debug mode)
-#define wxFAIL wxASSERT(0)
+#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(0, msg)
+#define wxFAIL_MSG(msg) wxASSERT_MSG(wxFalse, msg)
+#endif
//@}
// NB: these macros work also in release mode!
//@}
-#endif // __DEBUGH__
+#endif // _WX_DEBUG_H_