X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e1a3a402da51839343082b88568ff05629a72b2..9b6dbb09746f8f5ee0549a2ff39ae0ac4c725898:/include/wx/memory.h

diff --git a/include/wx/memory.h b/include/wx/memory.h
index b0ab9a02df..c1967741a9 100644
--- 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"
@@ -35,11 +35,12 @@
 
 #include "wx/string.h"
 
-#ifndef WXDEBUG_NEW
-#define WXDEBUG_NEW new(__FILE__,__LINE__)
-#endif
-
 #if WXDEBUG
+
+// #ifndef WXDEBUG_NEW
+// #define WXDEBUG_NEW new(__FILE__,__LINE__)
+// #endif
+
 void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE);
 void wxDebugFree(void * buf, bool isVect = FALSE);
 
@@ -61,8 +62,6 @@ void * operator new[] (size_t size, char * fileName, int lineNum);
 void operator delete[] (void * buf);
 #endif
 
-#define new WXDEBUG_NEW
-
 #endif
 #endif
 
@@ -270,10 +269,10 @@ inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
 
 #define WXTRACE TRUE ? (void)0 : wxTrace
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
-#define WXDEBUG_NEW new
+// #define WXDEBUG_NEW new
 
 #endif // WXDEBUG
 
 #endif
-    // __MEMORYH__
+    // _WX_MEMORYH__