info, or to be a straight call to the new operator.
*/
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#include <stddef.h>
-#if USE_IOSTREAMH
-#include <iostream.h>
+#if wxUSE_IOSTREAMH
+# include <ostream.h>
#else
-#include <iostream>
+# include <ostream>
+# ifdef _MSC_VER
+ using namespace std;
+# endif
#endif
#include "wx/string.h"
-#ifndef WXDEBUG_NEW
-#define WXDEBUG_NEW new(__FILE__,__LINE__)
-#endif
-
#if 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);
// 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 USE_GLOBAL_MEMORY_OPERATORS
+#if wxUSE_GLOBAL_MEMORY_OPERATORS
#ifdef new
#undef new
void * operator new (size_t size, char * fileName, int lineNum);
void operator delete (void * buf);
-#if !( defined (_MSC_VER) && (_MSC_VER <= 1000) )
+// 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
-#define new WXDEBUG_NEW
-
#endif
#endif
#define WXTRACE TRUE ? (void)0 : wxTrace
#define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
-#define WXDEBUG_NEW new
+// #define WXDEBUG_NEW new
#endif // WXDEBUG