X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea57084d103187771c0306a6e1684e32244d6101..fd3f686c274a264e89ea97505350a82c1134f307:/include/wx/memory.h

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 0afeaf4ebd..6216211d25 100644
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -41,19 +41,14 @@
 
 #ifdef __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);
 
 // Global versions of the new and delete operators.
-// Currently, these merely call malloc and free; only the wxObject
-// operators do something interesting. But this allows WXDEBUG_NEW to
-// work for all 'new's in a file.
 #if wxUSE_GLOBAL_MEMORY_OPERATORS
 
+// Undefine temporarily (new is #defined in object.h) because we want to
+// declare some new operators.
 #ifdef new
 #undef new
 #endif
@@ -61,16 +56,17 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 
-// VC++ 6.0
-#if _MSC_VER >= 1200
-void operator delete(void *buf, char*, int);
-#endif
-
 #if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
 void * operator new[] (size_t size, char * fileName, int lineNum);
 void operator delete[] (void * buf);
 #endif
 
+// VC++ 6.0
+#if _MSC_VER >= 1200
+void operator delete(void *buf, char*, int);
+void operator delete[](void *buf, char*, int);
+#endif
+
 #endif
 #endif
 
@@ -264,14 +260,14 @@ private:
     static bool                 m_checkPrevious;
 };
 
-// Output a debug mess., in a system dependent fashion.
+// Output a debug message, in a system dependent fashion.
 void WXDLLEXPORT wxTrace(const char *fmt ...);
 void WXDLLEXPORT wxTraceLevel(int level, const char *fmt ...);
 
 #define WXTRACE wxTrace
 #define WXTRACELEVEL wxTraceLevel
 
-#else // else part for the #if WXDEBUG
+#else // else part for the #if __WXDEBUG__
 
 inline void wxTrace(const char *WXUNUSED(fmt)) {}
 inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}