From: David Webster <Dave.Webster@bhmi.com>
Date: Fri, 20 Apr 2001 15:15:04 +0000 (+0000)
Subject: Fixed the deleteion of VisualAge stuff
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8cfc5426cf50da368022813a04e29cf8ec5478a4?ds=sidebyside

Fixed the deleteion of VisualAge stuff


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/object.h b/include/wx/object.h
index f89b3dbd77..f6b11f8594 100644
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -219,24 +219,30 @@ class WXDLLEXPORT wxObject
 
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
   void * operator new (size_t size, wxChar * fileName = NULL, int lineNum = 0);
-  void operator delete (void * buf);
+#  if defined(__VISAGECPP__)
+#    if __DEBUG_ALLOC__
+       void operator delete (void * buf,const char * _fname, size_t _line);
+#    endif  //__DEBUG_ALLOC__
+#  else // Everybody else
+    void operator delete (void * buf);
+#  endif // end of VISAGECPP
 
 // VC++ 6.0
-#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-  void operator delete(void *buf, wxChar*, int);
-#endif
+#  if defined(__VISUALC__) && (__VISUALC__ >= 1200)
+    void operator delete(void *buf, wxChar*, int);
+#  endif
 
     // Causes problems for VC++
-#if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__) && !defined( __MWERKS__)
-  void * operator new[] (size_t size, wxChar * fileName = NULL, int lineNum = 0);
-  void operator delete[] (void * buf);
-#endif
-
-#ifdef __MWERKS__
-  void * operator new[] (size_t size, wxChar * fileName , int lineNum = 0);
-  void * operator new[] (size_t size) { return operator new[] ( size , NULL , 0 ) ; }
-  void operator delete[] (void * buf);
-#endif
+#  if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__) && !defined( __MWERKS__)
+    void * operator new[] (size_t size, wxChar * fileName = NULL, int lineNum = 0);
+    void operator delete[] (void * buf);
+#  endif
+
+#  ifdef __MWERKS__
+    void * operator new[] (size_t size, wxChar * fileName , int lineNum = 0);
+    void * operator new[] (size_t size) { return operator new[] ( size , NULL , 0 ) ; }
+    void operator delete[] (void * buf);
+#  endif
 
 #endif // Debug & memory tracing