constraints for notebook pages work (again)

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 840d5085ca49f5bc701282f90da99ea994e4fbf2..b0ab9a02df72507a52d2a000572280112aaf7fe0 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -23,7 +23,7 @@
   info, or to be a straight call to the new operator.
 */
 
   info, or to be a straight call to the new operator.
 */
 

-#if (DEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT

 
 #include <stddef.h>
 
 
 #include <stddef.h>
 


@@ -39,7 +39,7 @@
 #define WXDEBUG_NEW new(__FILE__,__LINE__)
 #endif
 
 #define WXDEBUG_NEW new(__FILE__,__LINE__)
 #endif
 

-#if DEBUG
+#if WXDEBUG

 void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE);
 void wxDebugFree(void * buf, bool isVect = FALSE);
 
 void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE);
 void wxDebugFree(void * buf, bool isVect = FALSE);
 


@@ -56,8 +56,10 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 

+#if !( defined (_MSC_VER) && (_MSC_VER <= 1000) )

 void * operator new[] (size_t size, char * fileName, int lineNum);
 void operator delete[] (void * buf);
 void * operator new[] (size_t size, char * fileName, int lineNum);
 void operator delete[] (void * buf);

+#endif

 
 #define new WXDEBUG_NEW
 
 
 #define new WXDEBUG_NEW
 


@@ -261,7 +263,7 @@ void WXDLLEXPORT wxTraceLevel(int level, const char *fmt ...);
 #define WXTRACE wxTrace
 #define WXTRACELEVEL wxTraceLevel
 
 #define WXTRACE wxTrace
 #define WXTRACELEVEL wxTraceLevel
 

-#else // else part for the #if DEBUG
+#else // else part for the #if WXDEBUG

 
 inline void wxTrace(const char *WXUNUSED(fmt)) {}
 inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
 
 inline void wxTrace(const char *WXUNUSED(fmt)) {}
 inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}


@@ -270,7 +272,7 @@ inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
 #define WXDEBUG_NEW new
 
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
 #define WXDEBUG_NEW new
 

-#endif // DEBUG
+#endif // WXDEBUG

 
 #endif
     // __MEMORYH__
 
 #endif
     // __MEMORYH__