X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/184b5d99a5382cd7a19888c85aff11f8a21af2f6..3013b6f46099b8cf0d2f9f656e883e4606ca833d:/include/wx/memory.h

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 6216211d25..8f4d7a1270 100644
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -53,10 +53,25 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 #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 !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
+#if wxUSE_ARRAY_MEMORY_OPERATORS
 void * operator new[] (size_t size, char * fileName, int lineNum);
 void operator delete[] (void * buf);
 #endif
@@ -247,7 +262,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