rewrote wxFileName::Normalize(), added a few methods, general clean up,

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

diff --git a/include/wx/debug.h b/include/wx/debug.h
index c7a69752d3848998fad56eec14308e7dd8f12f38..4cb9dd165d94f1b1b171f0f21708317df8f30e4b 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -43,6 +43,10 @@
 // ----------------------------------------------------------------------------
 //@{
 
 // ----------------------------------------------------------------------------
 //@{
 

+// Use of these suppresses compiler warnings about testing constant expression
+WXDLLEXPORT_DATA(extern const bool) wxTrue;
+WXDLLEXPORT_DATA(extern const bool) wxFalse;
+

 /** @name Macros which are completely disabled in 'release' mode */
 //@{
 #ifdef  __WXDEBUG__
 /** @name Macros which are completely disabled in 'release' mode */
 //@{
 #ifdef  __WXDEBUG__


@@ -58,15 +62,8 @@
   /// generic assert macro
   #define   wxASSERT(cond)   if ( !(cond) ) wxOnAssert(__TFILE__, __LINE__)
 
   /// generic assert macro
   #define   wxASSERT(cond)   if ( !(cond) ) wxOnAssert(__TFILE__, __LINE__)
 

-#if 0 // defined(__BORLANDC__) && defined(__WIN16__)
-  // Too much text, so make wxASSERT_MSG the same as wxASSERT,
-  // thus removing the text from the program.
-  #define   wxASSERT_MSG(x, m)  if ( !(x) ) wxOnAssert(__TFILE__, __LINE__)
-#else

   /// assert with additional message explaining it's cause
   #define   wxASSERT_MSG(x, m)  if ( !(x) ) wxOnAssert(__TFILE__, __LINE__, m)
   /// assert with additional message explaining it's cause
   #define   wxASSERT_MSG(x, m)  if ( !(x) ) wxOnAssert(__TFILE__, __LINE__, m)

-#endif
-

 #else
   // nothing to do in release modes (hopefully at this moment there are
   // no more bugs ;-)
 #else
   // nothing to do in release modes (hopefully at this moment there are
   // no more bugs ;-)


@@ -74,17 +71,11 @@
   #define   wxASSERT_MSG(x, m)
 #endif  //__WXDEBUG__
 
   #define   wxASSERT_MSG(x, m)
 #endif  //__WXDEBUG__
 

-  /// 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(wxFalse)
 

-#if 0 // defined(__BORLANDC__) && defined(__WIN16__)
-  // Too much text, so make wxFAIL_MSG the same as wxFAIL,
-  // thus removing the text from the program.
-#define   wxFAIL_MSG(msg)        wxASSERT(wxFalse)
-#else
-  /// FAIL with some message
+/// FAIL with some message

 #define   wxFAIL_MSG(msg)        wxASSERT_MSG(wxFalse, msg)
 #define   wxFAIL_MSG(msg)        wxASSERT_MSG(wxFalse, msg)

-#endif

 //@}
 
 // NB: these macros work also in release mode!
 //@}
 
 // NB: these macros work also in release mode!