wxRegConfig now works correctly again

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 468acdfabfb03ca6b2e850c12d5679e066498a6f..9a17ad3ac99fc896b5be307f8ef0930b0eca221a 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MEMORYH__
-#define __MEMORYH__
+#ifndef _WX_MEMORYH__
+#define _WX_MEMORYH__
 
 #ifdef __GNUG__
 #pragma interface "memory.h"
@@ -23,7 +23,7 @@
   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>
 
@@ -39,7 +39,7 @@
 #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);
 
@@ -56,7 +56,7 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 
-#if !( defined (_MSC_VER) && (_MSC_VER <= 800) )
+#if !( defined (_MSC_VER) && (_MSC_VER <= 1000) )
 void * operator new[] (size_t size, char * fileName, int lineNum);
 void operator delete[] (void * buf);
 #endif
@@ -263,7 +263,7 @@ void WXDLLEXPORT wxTraceLevel(int level, const char *fmt ...);
 #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)) {}
@@ -272,8 +272,8 @@ inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
 #define WXDEBUG_NEW new
 
-#endif // DEBUG
+#endif // WXDEBUG
 
 #endif
-    // __MEMORYH__
+    // _WX_MEMORYH__