From 63e206a7ab38f38daecd2747f3b82fa71dbd2f61 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 6 May 2016 12:09:10 +0200 Subject: [PATCH] vwVERIFY macro non-executing issue fixed --- include/wxex/common.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/include/wxex/common.h b/include/wxex/common.h index e25359e..018b82e 100644 --- a/include/wxex/common.h +++ b/include/wxex/common.h @@ -55,9 +55,20 @@ /// Debug macros /// #if wxDEBUG_LEVEL -#define wxVERIFY(x) wxASSERT((x)) +#define wxVERIFY_MSG(cond, msg) \ + wxSTATEMENT_MACRO_BEGIN \ + if ( !(cond) && wxTheAssertHandler && \ + (wxOnAssert(__FILE__, __LINE__, __WXFUNCTION__, \ + #cond, msg), wxTrapInAssert) ) \ + { \ + wxTrapInAssert = false; \ + wxTrap(); \ + } \ + wxSTATEMENT_MACRO_END + +#define wxVERIFY(cond) wxVERIFY_MSG(cond, (const char*)NULL) #else -#define wxVERIFY(x) (x) +#define wxVERIFY(cond) (cond) #endif