experimental --inplace flag implementation

[wxWidgets.git] / include / wx / debug.h

diff --git a/include/wx/debug.h b/include/wx/debug.h
index ee32d3a0eb57c01fa604d114526f259cb3906cbb..1c3ab43818f228bf66c42cdac801114a22daed37 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -12,7 +12,9 @@
 #ifndef   _WX_DEBUG_H_
 #define   _WX_DEBUG_H_
 
 #ifndef   _WX_DEBUG_H_
 #define   _WX_DEBUG_H_
 

+#ifndef __WXWINCE__

 #include  <assert.h>
 #include  <assert.h>

+#endif

 #include  <limits.h>            // for CHAR_BIT used below
 
 #include  "wx/wxchar.h"         // for __TFILE__ and wxChar
 #include  <limits.h>            // for CHAR_BIT used below
 
 #include  "wx/wxchar.h"         // for __TFILE__ and wxChar


@@ -90,15 +92,11 @@
   // note using "int" and not "bool" for cond to avoid VC++ warnings about
   // implicit conversions when doing "wxAssert( pointer )" and also use of
   // "!!cond" below to ensure that everything is converted to int
   // note using "int" and not "bool" for cond to avoid VC++ warnings about
   // implicit conversions when doing "wxAssert( pointer )" and also use of
   // "!!cond" below to ensure that everything is converted to int

-  inline void WXDLLEXPORT wxAssert(int cond,
+  extern void WXDLLEXPORT wxAssert(int cond,

                                    const wxChar *szFile,
                                    int nLine,
                                    const wxChar *szCond,
                                    const wxChar *szFile,
                                    int nLine,
                                    const wxChar *szCond,

-                                   const wxChar *szMsg = NULL)
-  {
-      if ( !cond )
-          wxOnAssert(szFile, nLine, szCond, szMsg);
-  }
+                                   const wxChar *szMsg = NULL) ;

 
   // generic assert macro
   #define wxASSERT(cond) wxAssert(!!(cond), __TFILE__, __LINE__, _T(#cond))
 
   // generic assert macro
   #define wxASSERT(cond) wxAssert(!!(cond), __TFILE__, __LINE__, _T(#cond))


@@ -127,12 +125,13 @@
 // Use of wxFalse instead of FALSE suppresses compiler warnings about testing
 // constant expression
 WXDLLEXPORT_DATA(extern const bool) wxFalse;
 // 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)
 
 // special form of assert: always triggers it (in debug mode)

-#define wxFAIL                 wxASSERT(wxFalse)
+#define wxFAIL                 wxASSERT(wxAssertFailure)

 
 // FAIL with some message
 
 // 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!
 
 
 // NB: the following macros work also in release mode!
 


@@ -182,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!).
   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)
  */
 
 #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__)
 #define wxMAKE_UNIQUE_ASSERT_NAME           wxMAKE_ASSERT_NAME(__LINE__)

+#endif

 #define wxMAKE_UNIQUE_ASSERT_NAME2(text)    wxMAKE_ASSERT_NAME(text)
 
 /*
 #define wxMAKE_UNIQUE_ASSERT_NAME2(text)    wxMAKE_ASSERT_NAME(text)
 
 /*