added wx/defs.h include to correct compilation issues under Mac OS X

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

diff --git a/include/wx/debug.h b/include/wx/debug.h
index 82785eca9b8dab8827d35cfbca8dc766862e87aa..85dee4be293d31cafb38f3579289c54fc8b202f7 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -16,6 +16,32 @@
 
 #include  "wx/wxchar.h"
 
 
 #include  "wx/wxchar.h"
 

+// ----------------------------------------------------------------------------
+// Defines controlling the debugging macros
+// ----------------------------------------------------------------------------
+
+// if _DEBUG is defined (MS VC++ and others use it in debug builds), define
+// __WXDEBUG__ too
+#ifdef _DEBUG
+    #ifndef __WXDEBUG__
+        #define __WXDEBUG__
+    #endif // !__WXDEBUG__
+#endif // _DEBUG
+
+// if NDEBUG is defined (<assert.h> uses it), undef __WXDEBUG__ and WXDEBUG
+#ifdef NDEBUG
+    #undef __WXDEBUG__
+    #undef WXDEBUG
+#endif // NDEBUG
+
+// if __WXDEBUG__ is defined, make sure that WXDEBUG is defined and >= 1
+#ifdef __WXDEBUG__
+    #if !defined(WXDEBUG) || !WXDEBUG
+        #undef WXDEBUG
+        #define WXDEBUG 1
+    #endif // !WXDEBUG
+#endif // __WXDEBUG__
+

 // ----------------------------------------------------------------------------
 // Debugging macros
 //
 // ----------------------------------------------------------------------------
 // Debugging macros
 //


@@ -36,11 +62,9 @@
 // a judicious use of them might increase your program's stability.
 // ----------------------------------------------------------------------------
 
 // a judicious use of them might increase your program's stability.
 // ----------------------------------------------------------------------------
 

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

 // Macros which are completely disabled in 'release' mode
 // Macros which are completely disabled in 'release' mode

+//
+// NB: these functions are implemented in src/common/appcmn.cpp

 #ifdef  __WXDEBUG__
   /*
     this function may be redefined to do something non trivial and is called
 #ifdef  __WXDEBUG__
   /*
     this function may be redefined to do something non trivial and is called


@@ -93,6 +117,10 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
   #define wxASSERT_MSG(x, m)
 #endif  //__WXDEBUG__
 
   #define wxASSERT_MSG(x, m)
 #endif  //__WXDEBUG__
 

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

 // special form of assert: always triggers it (in debug mode)
 #define wxFAIL                 wxASSERT(wxFalse)
 
 // special form of assert: always triggers it (in debug mode)
 #define wxFAIL                 wxASSERT(wxFalse)