X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/333e110dab18d80a24f143e3d26103bec255c34f..1542ea396a625766c59d683adbb1d613c1344d50:/include/wx/debug.h

diff --git a/include/wx/debug.h b/include/wx/debug.h
index 9c92739aaa..2a8a9b44bc 100644
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -6,13 +6,15 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_DEBUG_H_
 #define   _WX_DEBUG_H_
 
+#ifndef __WXWINCE__
 #include  <assert.h>
+#endif
 #include  <limits.h>            // for CHAR_BIT used below
 
 #include  "wx/wxchar.h"         // for __TFILE__ and wxChar
@@ -123,12 +125,13 @@
 // Use of wxFalse instead of FALSE suppresses compiler warnings about testing
 // constant expression
 WXDLLEXPORT_DATA(extern const bool) wxFalse;
+#define wxAssertFailure wxFalse
 
 // special form of assert: always triggers it (in debug mode)
-#define wxFAIL                 wxASSERT(wxFalse)
+#define wxFAIL                 wxASSERT(wxAssertFailure)
 
 // FAIL with some message
-#define wxFAIL_MSG(msg)        wxASSERT_MSG(wxFalse, msg)
+#define wxFAIL_MSG(msg)        wxASSERT_MSG(wxAssertFailure, msg)
 
 // NB: the following macros work also in release mode!
 
@@ -178,11 +181,18 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
   particular, this is why we define a struct and not an object (which would
   result in a warning about unused variable) and a named struct (otherwise we'd
   get a warning about an unnamed struct not used to define an object!).
+  The _n__ part is to stop VC++ 7 being confused since it encloses __LINE++ in
+  parentheses. Unfortunately this does not work with other compilers, so
+  we will only enable it when we know the _precise_ symbols to test for.
  */
 
 #define wxMAKE_ASSERT_NAME_HELPER(line)     wxAssert_ ## line
 #define wxMAKE_ASSERT_NAME(line)            wxMAKE_ASSERT_NAME_HELPER(line)
+#if 0
+#define wxMAKE_UNIQUE_ASSERT_NAME           wxMAKE_ASSERT_NAME(_n___ ## __LINE__)
+#else
 #define wxMAKE_UNIQUE_ASSERT_NAME           wxMAKE_ASSERT_NAME(__LINE__)
+#endif
 #define wxMAKE_UNIQUE_ASSERT_NAME2(text)    wxMAKE_ASSERT_NAME(text)
 
 /*