some warnings fixed for compilation of lib/dll with VC++ 6 in release mode

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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__
@@ -58,15 +62,8 @@
   /// 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)
-#endif
-
 #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__
 
-  /// special form of assert: always triggers it (in debug mode)
+/// special form of assert: always triggers it (in debug mode)
 #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)
-#endif
 //@}
 
 // NB: these macros work also in release mode!

include/wx/defs.h

@@ -455,8 +455,12 @@ class WXDLLEXPORT wxEvent;
 #define wxNOT_FOUND       (-1)
 
 // ----------------------------------------------------------------------------
-/** @name Very common macros */
+// Very common macros
 // ----------------------------------------------------------------------------
+
+// everybody gets the assert and other debug macros
+#include "wx/debug.h"
+
 //@{
 /// delete pointer if it is not NULL and NULL it afterwards
 // (checking that it's !NULL before passing it to delete is just a
@@ -488,10 +492,6 @@ class WXDLLEXPORT wxEvent;
 /// size of statically declared array
 #define WXSIZEOF(array)   (sizeof(array)/sizeof(array[0]))
 
-// Use of these suppresses some compiler warnings
-WXDLLEXPORT_DATA(extern const bool) wxTrue;
-WXDLLEXPORT_DATA(extern const bool) wxFalse;
-
 // ----------------------------------------------------------------------------
 // compiler specific settings
 // ----------------------------------------------------------------------------

include/wx/dynarray.h

@@ -17,7 +17,6 @@
 #endif
 
 #include "wx/defs.h"
-#include "wx/debug.h"
 
 /** @name Dynamic arrays and object arrays (array which own their elements)
     @memo Arrays which grow on demand and do range checking (only in debug)

include/wx/list.h

@@ -34,7 +34,6 @@
 // -----------------------------------------------------------------------------
 
 #include "wx/defs.h"
-#include "wx/debug.h"
 #include "wx/object.h"
 #include "wx/string.h"
 

include/wx/longlong.h

@@ -21,7 +21,6 @@
 
 #include "wx/defs.h"
 #include "wx/wxchar.h"
-#include "wx/debug.h"
 
 #include <limits.h>     // for LONG_MAX
 

include/wx/string.h

@@ -66,7 +66,6 @@
 #endif // AIX
 
 #include "wx/defs.h"        // everybody should include this
-#include "wx/debug.h"       // for wxASSERT()
 #include "wx/wxchar.h"      // for wxChar
 #include "wx/buffer.h"      // for wxCharBuffer
 #include "wx/strconv.h"     // for wxConvertXXX() macros and wxMBConv classes