vwVERIFY macro non-executing issue fixed

2016-05-06 12:09:10 +02:00 · 2016-05-06 12:09:10 +02:00 · 63e206a7ab
commit 63e206a7ab
parent 5a372f955b
1 changed files with 13 additions and 2 deletions
--- 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