no message

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 8f42be65a2df448fed9262a64316c42febf7b808..1d44a664e922b181d95600550817aadcd3e70d06 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -24,7 +24,7 @@
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"
 #endif
 

-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

 
 #ifdef __GNUG__
 // #pragma implementation
 
 #ifdef __GNUG__
 // #pragma implementation


@@ -37,12 +37,16 @@
 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 

-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH

 #include <iostream.h>
 #include <iostream.h>

+#include <fstream.h>

 #else
 #include <iostream>
 #else
 #include <iostream>

+#include <fstream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif

 #endif
 #endif

-#include <fstream.h>

 
 #if !defined(__WATCOMC__) && !defined(__VMS__)
 #include <memory.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();
   {
     wxObject *obj = (wxObject *)m_actualData;
     wxClassInfo *info = obj->GetClassInfo();

-
+/*

     if (info && info->GetClassName())
       wxTrace("%s", info->GetClassName());
     else
     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);
 
     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(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
   }
   else
   {

-    wxTrace("Non-object data");

     if (m_fileName)
     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());
   }
 }
     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;
   if (m_isObject)
   {
     wxObject *obj = (wxObject *)m_actualData;

-//    wxClassInfo *info = obj->GetClassInfo();

 
     if (m_fileName)
 
     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());
     obj->Dump(wxDebugContext::GetStream());

+    wxTrace(" at $%lX, size %d", (long)GetActualData(), (int)RequestSize());

     wxTrace("\n");
   }
   else
   {
     wxTrace("\n");
   }
   else
   {

-    wxTrace("Non-object data");

     if (m_fileName)
     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());
   }
 }
     wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
   }
 }


@@ -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.
 
 // 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 WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS

 
 #ifdef new
 #undef new
 
 #ifdef new
 #undef new


@@ -1110,7 +1122,7 @@ void wxTraceLevel(int level, const char *fmt ...)
 #endif
 }
 
 #endif
 }
 

-#else // USE_MEMORY_TRACING && WXDEBUG
+#else // wxUSE_MEMORY_TRACING && WXDEBUG

 void wxTrace(const char *WXUNUSED(fmt) ...)
 {
 }
 void wxTrace(const char *WXUNUSED(fmt) ...)
 {
 }