-#if WXDEBUG && USE_MEMORY_TRACING
- void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
- void operator delete (void * buf);
-
- // Cause problems for VC++
-#ifndef _MSC_VER
- void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
- void operator delete[] (void * buf);
-#endif
-
-#endif
-
-#if WXDEBUG || USE_DEBUG_CONTEXT
- virtual void Dump(ostream& str);
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
+ void * operator new (size_t size, wxChar * fileName = NULL, int lineNum = 0);
+# 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
+
+ // 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
+
+#endif // Debug & memory tracing
+
+#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
+ virtual void Dump(wxSTD ostream& str);