]> git.saurik.com Git - wxWidgets.git/commitdiff
fixed wxCHECK in release build
authorVadim Zeitlin <vadim@wxwidgets.org>
Wed, 22 Mar 2006 01:11:52 +0000 (01:11 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Wed, 22 Mar 2006 01:11:52 +0000 (01:11 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/debug.h

index cc217a77b3e92856df248cbf1fdab41057103aa4..7c245131824f72edf8951e67d220a0ca10677730 100644 (file)
   #define wxFAIL wxFAIL_MSG(NULL)
 
   /*  FAIL with some message */
-  #define wxFAIL_MSG(msg)                                                     \
-      wxOnAssert(__TFILE__, __LINE__,  __FUNCTION__, _T("wxAssertFailure"), msg)
+  #define wxFAIL_MSG(msg) wxFAIL_COND_MSG("wxAssertFailure", msg)
+
+  /*  FAIL with some message and a condition */
+  #define wxFAIL_COND_MSG(cond, msg)                                          \
+      wxOnAssert(__TFILE__, __LINE__,  __FUNCTION__, _T(cond), msg)
 
   /*  an assert helper used to avoid warning when testing constant expressions, */
   /*  i.e. wxASSERT( sizeof(int) == 4 ) can generate a compiler warning about */
   #define wxASSERT_MSG(cond, msg)
   #define wxFAIL
   #define wxFAIL_MSG(msg)
+  #define wxFAIL_COND_MSG(cond, msg)
 #endif  /* __WXDEBUG__ */
 
 #ifdef __cplusplus
     else                                                                      \
         do                                                                    \
         {                                                                     \
-            wxOnAssert(__TFILE__, __LINE__, __FUNCTION__, _T(#cond), msg);       \
+            wxFAIL_COND_MSG(#cond, msg);                                      \
             op;                                                               \
         } while ( 0 )