RenameEntry/Group() functions added to wxConfig and derivations (not yet

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 0afeaf4ebdeefdd2efa6c43aef3dad6d565d705f..841ea9e410b61642e39944f545766b70d35d4dbf 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/defs.h"
+#include "wx/string.h"
 
 /*
   The macro which will be expanded to include the file and line number
@@ -37,42 +38,53 @@
 #  endif
 #endif
 
-#include "wx/string.h"
-
 #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
 
+#if defined(__SUNCC__)
+#define wxUSE_ARRAY_MEMORY_OPERATORS 0
+#elif !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__)
+#define wxUSE_ARRAY_MEMORY_OPERATORS 1
+#else
+#define wxUSE_ARRAY_MEMORY_OPERATORS 0
+#endif
+
+// Added JACS 25/11/98: needed for some compilers
+void * operator new (size_t size);
+
+#if wxUSE_ARRAY_MEMORY_OPERATORS
+void * operator new[] (size_t size);
+#endif
+
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 
+#if wxUSE_ARRAY_MEMORY_OPERATORS
+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);
-#endif
-
-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
-void * operator new[] (size_t size, char * fileName, int lineNum);
-void operator delete[] (void * buf);
+void operator delete[](void *buf, char*, int);
 #endif
 
 #endif
+  // wxUSE_GLOBAL_MEMORY_OPERATORS
 #endif
+  // __WXDEBUG__
 
 typedef unsigned int wxMarkerType;
 
@@ -251,7 +263,7 @@ public:
 
     // Count the number of non-wxDebugContext-related objects
     // that are outstanding
-    static int CountObjectsLeft(void);
+    static int CountObjectsLeft(bool sinceCheckpoint = FALSE);
 
 private:
     // Store these here to allow access to the list without
@@ -264,14 +276,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)) {}