Removed references to DEBUG and WXDEBUG; cured Motif font problem; removed

[wxWidgets.git] / src / common / memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 70b4155d09f15c3b4604aee93b61d8263497332a..785bcde816c11864f07b40afa9cff8e0003adcab 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -24,7 +24,7 @@
 #include "wx/defs.h"
 #endif
 
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
 #ifdef __GNUG__
 // #pragma implementation
@@ -37,12 +37,16 @@
 
 #include <stdlib.h>
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
+#include <fstream.h>
 #else
 #include <iostream>
+#include <fstream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
 #endif
-#include <fstream.h>
 
 #if !defined(__WATCOMC__) && !defined(__VMS__)
 #include <memory.h>
@@ -324,7 +328,7 @@ void wxMemStruct::PrintNode ()
   {
     wxObject *obj = (wxObject *)m_actualData;
     wxClassInfo *info = obj->GetClassInfo();
-
+/*
     if (info && info->GetClassName())
       wxTrace("%s", info->GetClassName());
     else
@@ -333,13 +337,25 @@ void wxMemStruct::PrintNode ()
     if (m_fileName)
       wxTrace(" (%s %d)", m_fileName, (int)m_lineNum);
 
+    wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+*/
+    // Let's put this in standard form so IDEs can load the file at the appropriate
+    // line
+    if (m_fileName)
+      wxTrace("%s(%d): ", m_fileName, (int)m_lineNum);
+
+    if (info && info->GetClassName())
+      wxTrace("%s", info->GetClassName());
+    else
+      wxTrace("object");
+
     wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
   }
   else
   {
-    wxTrace("Non-object data");
     if (m_fileName)
-      wxTrace(" (%s %d)", m_fileName, (int)m_lineNum);
+      wxTrace("%s(%d): ", m_fileName, (int)m_lineNum);
+    wxTrace("non-object data");
     wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
   }
 }
@@ -351,23 +367,19 @@ void wxMemStruct::Dump ()
   if (m_isObject)
   {
     wxObject *obj = (wxObject *)m_actualData;
-//    wxClassInfo *info = obj->GetClassInfo();
 
     if (m_fileName)
-      wxTrace("Item (%s %d)", m_fileName, (int)m_lineNum);
-    else
-      wxTrace("Item");
+      wxTrace("%s(%d): ", m_fileName, (int)m_lineNum);
 
-    wxTrace(" at $%lX, size %d: ", (long)GetActualData(), (int)RequestSize());
-//    wxTrace(info->GetClassName());
     obj->Dump(wxDebugContext::GetStream());
+    wxTrace(" at $%lX, size %d", (long)GetActualData(), (int)RequestSize());
     wxTrace("\n");
   }
   else
   {
-    wxTrace("Non-object data");
     if (m_fileName)
-      wxTrace(" (%s %d)", m_fileName, (int)m_lineNum);
+      wxTrace("%s(%d): ", m_fileName, (int)m_lineNum);
+    wxTrace("non-object data");
     wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
   }
 }
@@ -623,7 +635,7 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
   */
 bool wxDebugContext::PrintList (void)
 {
-#if WXDEBUG
+#ifdef __WXDEBUG__
   if (!HasStream())
     return FALSE;
 
@@ -637,7 +649,7 @@ bool wxDebugContext::PrintList (void)
 
 bool wxDebugContext::Dump(void)
 {
-#if WXDEBUG
+#ifdef __WXDEBUG__
   if (!HasStream())
     return FALSE;
 
@@ -693,7 +705,7 @@ static wxDebugStatsStruct *InsertStatsStruct(wxDebugStatsStruct *head, wxDebugSt
 
 bool wxDebugContext::PrintStatistics(bool detailed)
 {
-#if WXDEBUG
+#ifdef __WXDEBUG__
   if (!HasStream())
     return FALSE;
 
@@ -888,7 +900,7 @@ int wxDebugContext::CountObjectsLeft(void)
 // We'll only do malloc and free for the moment: leave the interesting
 // stuff for the wxObject versions.
 
-#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS
+#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS
 
 #ifdef new
 #undef new
@@ -912,7 +924,7 @@ void * operator new (size_t size, char * fileName, int lineNum)
 #endif
 }
 
-#if !( defined (_MSC_VER) && (_MSC_VER <= 1000) )
+#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
 void * operator new[] (size_t size, char * fileName, int lineNum)
 {
 #ifdef NO_DEBUG_ALLOCATION
@@ -932,7 +944,15 @@ void operator delete (void * buf)
 #endif
 }
 
-#if !( defined (_MSC_VER) && (_MSC_VER <= 1000) )
+// VC++ 6.0
+#if _MSC_VER >= 1200
+void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+{
+ ::operator delete(pData);
+}
+#endif
+
+#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
 void operator delete[] (void * buf)
 {
 #ifdef NO_DEBUG_ALLOCATION
@@ -1102,7 +1122,7 @@ void wxTraceLevel(int level, const char *fmt ...)
 #endif
 }
 
-#else // USE_MEMORY_TRACING && WXDEBUG
+#else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
 void wxTrace(const char *WXUNUSED(fmt) ...)
 {
 }