X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f358732e44d89af3d83c4b77e19d0963afa7c7e..c71c744a5764596f392f6912eb32221109f11c60:/src/common/memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 1b89cd78be..7cac322e8d 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -35,20 +35,18 @@
 #include "wx/app.h"
 #endif
 
+#include <wx/log.h>
 #include <stdlib.h>
 
+#include "wx/ioswrap.h"
+
 #if wxUSE_IOSTREAMH
-#include <iostream.h>
-#include <fstream.h>
+    #include <fstream.h>
 #else
-#include <iostream>
-#include <fstream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+    #include <fstream>
 #endif
 
-#if !defined(__WATCOMC__) && !defined(__VMS__)
+#if !defined(__WATCOMC__) && !defined(__VMS__) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
 #include <memory.h>
 #endif
 
@@ -77,8 +75,8 @@
 // wxDebugContext wxTheDebugContext;
 /*
   Redefine new and delete so that we can pick up situations where:
-	- we overwrite or underwrite areas of malloc'd memory.
-	- we use uninitialise variables
+        - we overwrite or underwrite areas of malloc'd memory.
+        - we use uninitialise variables
   Only do this in debug mode.
 
   We change new to get enough memory to allocate a struct, followed
@@ -112,10 +110,10 @@
 */
 void wxMemStruct::ErrorMsg (const char * mesg)
 {
-  wxTrace("wxWindows memory checking error: %s\n", mesg);
+  wxLogDebug("wxWindows memory checking error: %s", mesg);
   PrintNode ();
 
-//	 << m_fileName << ' ' << m_lineNum << endl;
+//         << m_fileName << ' ' << m_lineNum << endl;
 }
 
 /*
@@ -123,9 +121,9 @@ void wxMemStruct::ErrorMsg (const char * mesg)
 */
 void wxMemStruct::ErrorMsg ()
 {
-  wxTrace("wxWindows over/underwrite memory error: \n");
+  wxLogDebug("wxWindows over/underwrite memory error:");
   PrintNode ();
-    
+
 //    cerr << m_fileName << ' ' << m_lineNum << endl;
 }
 
@@ -140,9 +138,9 @@ void wxMemStruct::ErrorMsg ()
 int wxMemStruct::AssertList ()
 {
     if (wxDebugContext::GetHead () != 0 && ! (wxDebugContext::GetHead ())->AssertIt () ||
-	wxDebugContext::GetTail () != 0 && ! wxDebugContext::GetTail ()->AssertIt ()) {
-	ErrorMsg ("Head or tail pointers trashed");
-	return 0;
+        wxDebugContext::GetTail () != 0 && ! wxDebugContext::GetTail ()->AssertIt ()) {
+        ErrorMsg ("Head or tail pointers trashed");
+        return 0;
     }
     return 1;
 }
@@ -162,8 +160,8 @@ int wxMemStruct::AssertList ()
 int wxMemStruct::AssertIt ()
 {
     return (m_id == MemStructId &&
-	    (m_prev == 0 || m_prev->m_id == MemStructId) &&
-	    (m_next == 0 || m_next->m_id == MemStructId));
+            (m_prev == 0 || m_prev->m_id == MemStructId) &&
+            (m_next == 0 || m_next->m_id == MemStructId));
 }
 
 
@@ -174,19 +172,19 @@ int wxMemStruct::AssertIt ()
 int wxMemStruct::Append ()
 {
     if (! AssertList ())
-	return 0;
+        return 0;
 
     if (wxDebugContext::GetHead () == 0) {
-	if (wxDebugContext::GetTail () != 0) {
-	    ErrorMsg ("Null list should have a null tail pointer");
-	    return 0;
-	}
-	(void) wxDebugContext::SetHead (this);
-	(void) wxDebugContext::SetTail (this);
+        if (wxDebugContext::GetTail () != 0) {
+            ErrorMsg ("Null list should have a null tail pointer");
+            return 0;
+        }
+        (void) wxDebugContext::SetHead (this);
+        (void) wxDebugContext::SetTail (this);
     } else {
-	wxDebugContext::GetTail ()->m_next = this;
-	this->m_prev = wxDebugContext::GetTail ();
-	(void) wxDebugContext::SetTail (this);
+        wxDebugContext::GetTail ()->m_next = this;
+        this->m_prev = wxDebugContext::GetTail ();
+        (void) wxDebugContext::SetTail (this);
     }
     return 1;
 }
@@ -200,51 +198,51 @@ int wxMemStruct::Append ()
 int wxMemStruct::Unlink ()
 {
     if (! AssertList ())
-	return 0;
+        return 0;
 
     if (wxDebugContext::GetHead () == 0 || wxDebugContext::GetTail () == 0) {
-	ErrorMsg ("Trying to remove node from empty list");
-	return 0;
+        ErrorMsg ("Trying to remove node from empty list");
+        return 0;
     }
 
     // Handle the part of the list before this node.
     if (m_prev == 0) {
-	if (this != wxDebugContext::GetHead ()) {
-	    ErrorMsg ("No previous node for non-head node");
-	    return 0;
-	}
-	(void) wxDebugContext::SetHead (m_next);
+        if (this != wxDebugContext::GetHead ()) {
+            ErrorMsg ("No previous node for non-head node");
+            return 0;
+        }
+        (void) wxDebugContext::SetHead (m_next);
     } else {
-	if (! m_prev->AssertIt ()) {
-	    ErrorMsg ("Trashed previous pointer");
-	    return 0;
-	}
-	
-	if (m_prev->m_next != this) {
-	    ErrorMsg ("List is inconsistent");
-	    return 0;
-	}
-	m_prev->m_next = m_next;
+        if (! m_prev->AssertIt ()) {
+            ErrorMsg ("Trashed previous pointer");
+            return 0;
+        }
+
+        if (m_prev->m_next != this) {
+            ErrorMsg ("List is inconsistent");
+            return 0;
+        }
+        m_prev->m_next = m_next;
     }
 
     // Handle the part of the list after this node.
     if (m_next == 0) {
-	if (this != wxDebugContext::GetTail ()) {
-	    ErrorMsg ("No next node for non-tail node");
-	    return 0;
-	}
-	(void) wxDebugContext::SetTail (m_prev);
+        if (this != wxDebugContext::GetTail ()) {
+            ErrorMsg ("No next node for non-tail node");
+            return 0;
+        }
+        (void) wxDebugContext::SetTail (m_prev);
     } else {
-	if (! m_next->AssertIt ()) {
-	    ErrorMsg ("Trashed next pointer");
-	    return 0;
-	}
-
-	if (m_next->m_prev != this) {
-	    ErrorMsg ("List is inconsistent");
-	    return 0;
-	}
-	m_next->m_prev = m_prev;
+        if (! m_next->AssertIt ()) {
+            ErrorMsg ("Trashed next pointer");
+            return 0;
+        }
+
+        if (m_next->m_prev != this) {
+            ErrorMsg ("List is inconsistent");
+            return 0;
+        }
+        m_next->m_prev = m_prev;
     }
 
     return 1;
@@ -261,22 +259,22 @@ int wxMemStruct::CheckBlock ()
     int nFailures = 0;
 
     if (m_firstMarker != MemStartCheck) {
-	nFailures++;
-	ErrorMsg ();
+        nFailures++;
+        ErrorMsg ();
     }
-    
+
     char * pointer = wxDebugContext::MidMarkerPos ((char *) this);
     if (* (wxMarkerType *) pointer != MemMidCheck) {
-	nFailures++;
-	ErrorMsg ();
+        nFailures++;
+        ErrorMsg ();
     }
-    
+
     pointer = wxDebugContext::EndMarkerPos ((char *) this, RequestSize ());
     if (* (wxMarkerType *) pointer != MemEndCheck) {
-	nFailures++;
-	ErrorMsg ();
+        nFailures++;
+        ErrorMsg ();
     }
-    
+
     return nFailures;
 }
 
@@ -287,12 +285,12 @@ int wxMemStruct::CheckBlock ()
 int wxMemStruct::CheckAllPrevious ()
 {
     int nFailures = 0;
-    
+
     for (wxMemStruct * st = this->m_prev; st != 0; st = st->m_prev) {
-	if (st->AssertIt ())
-	    nFailures += st->CheckBlock ();
-	else
-	    return -1;
+        if (st->AssertIt ())
+            nFailures += st->CheckBlock ();
+        else
+            return -1;
     }
 
     return nFailures;
@@ -328,59 +326,81 @@ void wxMemStruct::PrintNode ()
   {
     wxObject *obj = (wxObject *)m_actualData;
     wxClassInfo *info = obj->GetClassInfo();
-/*
-    if (info && info->GetClassName())
-      wxTrace("%s", info->GetClassName());
-    else
-      wxTrace("Object");
-
-    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
+    wxString msg("");
+
     if (m_fileName)
-      wxTrace("%s(%d): ", m_fileName, (int)m_lineNum);
+      msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum);
 
     if (info && info->GetClassName())
-      wxTrace("%s", info->GetClassName());
+      msg += info->GetClassName();
     else
-      wxTrace("object");
+      msg += "object";
 
-    wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+    wxString msg2;
+    msg2.Printf(" at $%lX, size %d", (long)GetActualData(), (int)RequestSize());
+    msg += msg2;
+
+    wxLogDebug(msg);
   }
   else
   {
+    wxString msg("");
+
     if (m_fileName)
-      wxTrace("%s(%d): ", m_fileName, (int)m_lineNum);
-    wxTrace("non-object data");
-    wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+      msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum);
+    msg += ("non-object data");
+    wxString msg2;
+    msg2.Printf(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+    msg += msg2;
+
+    wxLogDebug(msg);
   }
 }
 
 void wxMemStruct::Dump ()
 {
   if (!ValidateNode()) return;
-  
+
   if (m_isObject)
   {
     wxObject *obj = (wxObject *)m_actualData;
 
+    wxString msg("");
     if (m_fileName)
-      wxTrace("%s(%d): ", m_fileName, (int)m_lineNum);
+      msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum);
 
+
+    /* TODO: We no longer have a stream (using wxLogDebug) so we can't dump it.
+     * Instead, do what wxObject::Dump does.
+     * What should we do long-term, eliminate Dumping? Or specify
+     * that MyClass::Dump should use wxLogDebug? Ugh.
     obj->Dump(wxDebugContext::GetStream());
-    wxTrace(" at $%lX, size %d", (long)GetActualData(), (int)RequestSize());
-    wxTrace("\n");
+     */
+
+    if (obj->GetClassInfo() && obj->GetClassInfo()->GetClassName())
+      msg += obj->GetClassInfo()->GetClassName();
+    else
+      msg += "unknown object class";
+
+    wxString msg2("");
+    msg2.Printf(" at $%lX, size %d", (long)GetActualData(), (int)RequestSize());
+    msg += msg2;
+
+    wxLogDebug(msg);
   }
   else
   {
+    wxString msg("");
     if (m_fileName)
-      wxTrace("%s(%d): ", m_fileName, (int)m_lineNum);
-    wxTrace("non-object data");
-    wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+      msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum);
+
+    wxString msg2("");
+    msg2.Printf("non-object data at $%lX, size %d", (long)GetActualData(), (int)RequestSize() );
+    msg += msg2;
+    wxLogDebug(msg);
   }
 }
 
@@ -393,15 +413,15 @@ int wxMemStruct::ValidateNode ()
 {
     char * startPointer = (char *) this;
     if (!AssertIt ()) {
-	if (IsDeleted ())
-	    ErrorMsg ("Object already deleted");
-	else {
-	    // Can't use the error routines as we have no recognisable object.
+        if (IsDeleted ())
+            ErrorMsg ("Object already deleted");
+        else {
+            // Can't use the error routines as we have no recognisable object.
 #ifndef __WXGTK__
-	     wxTrace("Can't verify memory struct - all bets are off!\n");
+             wxLogDebug("Can't verify memory struct - all bets are off!");
 #endif
-	}
-	return 0;
+        }
+        return 0;
     }
 
 /*
@@ -415,20 +435,20 @@ int wxMemStruct::ValidateNode ()
     if (* (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer) != MemMidCheck)
       ErrorMsg ();
     if (* (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
-					      RequestSize ()) !=
-	MemEndCheck)
+                                              RequestSize ()) !=
+        MemEndCheck)
       ErrorMsg ();
 
     // Back to before the extra buffer and check that
     // we can still read what we originally wrote.
     if (Marker () != MemStartCheck ||
-	* (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer)
-	                 != MemMidCheck ||
-	* (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
-					      RequestSize ()) != MemEndCheck)
+        * (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer)
+                         != MemMidCheck ||
+        * (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
+                                              RequestSize ()) != MemEndCheck)
     {
-	ErrorMsg ();
-	return 0;
+        ErrorMsg ();
+        return 0;
     }
 
     return 1;
@@ -470,15 +490,6 @@ wxDebugContext::~wxDebugContext(void)
 
 void wxDebugContext::SetStream(ostream *str, streambuf *buf)
 {
-/*
-  if (str)
-  {
-    char buff[128];
-    sprintf(buff, "SetStream (1): str is %ld", (long) str);
-    MessageBox(NULL, buff, "Memory", MB_OK);
-  }
-*/
-
   if (m_debugStream)
   {
     m_debugStream->flush();
@@ -511,11 +522,6 @@ bool wxDebugContext::SetFile(const wxString& file)
   }
   else
   {
-/*
-  char buf[40];
-  sprintf(buf, "SetFile: str is %ld", (long) str);
-  MessageBox(NULL, buf, "Memory", MB_OK);
-*/
     SetStream(str);
     return TRUE;
   }
@@ -523,6 +529,8 @@ bool wxDebugContext::SetFile(const wxString& file)
 
 bool wxDebugContext::SetStandardError(void)
 {
+    // Obsolete
+#if 0
 #if !defined(_WINDLL)
   wxDebugStreamBuf *buf = new wxDebugStreamBuf;
   ostream *stream = new ostream(m_streamBuf);
@@ -531,6 +539,8 @@ bool wxDebugContext::SetStandardError(void)
 #else
   return FALSE;
 #endif
+#endif
+  return FALSE;
 }
 
 
@@ -575,7 +585,7 @@ char * wxDebugContext::EndMarkerPos (const char * buf, const size_t size)
 char * wxDebugContext::StartPos (const char * caller)
 {
     return ((char *) (caller - wxDebugContext::PaddedSize (sizeof(wxMarkerType)) -
-	    wxDebugContext::PaddedSize (sizeof (wxMemStruct))));
+            wxDebugContext::PaddedSize (sizeof (wxMemStruct))));
 }
 
 /*
@@ -607,7 +617,7 @@ size_t wxDebugContext::PaddedSize (const size_t size)
 size_t wxDebugContext::TotSize (const size_t reqSize)
 {
     return (PaddedSize (sizeof (wxMemStruct)) + PaddedSize (reqSize) +
-	    2 * sizeof(wxMarkerType));
+            2 * sizeof(wxMarkerType));
 }
 
 
@@ -618,11 +628,12 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
 {
   if (!from)
     from = wxDebugContext::GetHead ();
-    
+
   for (wxMemStruct * st = from; st != 0; st = st->m_next)
   {
       void* data = st->GetActualData();
-      if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
+//      if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
+      if (data != (void*) wxLog::GetActiveTarget())
       {
         (st->*func) ();
       }
@@ -636,8 +647,8 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
 bool wxDebugContext::PrintList (void)
 {
 #ifdef __WXDEBUG__
-  if (!HasStream())
-    return FALSE;
+//  if (!HasStream())
+//    return FALSE;
 
   TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
 
@@ -650,8 +661,8 @@ bool wxDebugContext::PrintList (void)
 bool wxDebugContext::Dump(void)
 {
 #ifdef __WXDEBUG__
-  if (!HasStream())
-    return FALSE;
+//  if (!HasStream())
+//    return FALSE;
 
   if (TRUE)
   {
@@ -661,16 +672,17 @@ bool wxDebugContext::Dump(void)
     {
         appNameStr = wxTheApp->GetAppName();
         appName = (char*) (const char*) appNameStr;
-        wxTrace("----- Memory dump of %s at %s -----\n", appName, WXSTRINGCAST wxNow() );
+        wxLogDebug("----- Memory dump of %s at %s -----", appName, WXSTRINGCAST wxNow() );
     }
     else
     {
-      wxTrace( "----- Memory dump -----\n" );
+      wxLogDebug( "----- Memory dump -----" );
     }
   }
   TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
-  
-  wxTrace( "\n\n" );
+
+  wxLogDebug( "" );
+  wxLogDebug( "" );
 
   return TRUE;
 #else
@@ -706,8 +718,8 @@ static wxDebugStatsStruct *InsertStatsStruct(wxDebugStatsStruct *head, wxDebugSt
 bool wxDebugContext::PrintStatistics(bool detailed)
 {
 #ifdef __WXDEBUG__
-  if (!HasStream())
-    return FALSE;
+//  if (!HasStream())
+//    return FALSE;
 
   if (TRUE)
   {
@@ -717,17 +729,17 @@ bool wxDebugContext::PrintStatistics(bool detailed)
     {
         appNameStr = wxTheApp->GetAppName();
         appName = (char*) (const char*) appNameStr;
-        wxTrace("----- Memory statistics of %s at %s -----\n", appName, WXSTRINGCAST wxNow() );
+        wxLogDebug("----- Memory statistics of %s at %s -----", appName, WXSTRINGCAST wxNow() );
     }
     else
     {
-      wxTrace( "----- Memory statistics -----\n" );
+      wxLogDebug( "----- Memory statistics -----" );
     }
   }
-  
+
   bool currentMode = GetDebugMode();
   SetDebugMode(FALSE);
-  
+
   long noNonObjectNodes = 0;
   long noObjectNodes = 0;
   long totalSize = 0;
@@ -738,11 +750,12 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   if (!from)
     from = wxDebugContext::GetHead ();
 
-  wxMemStruct *st;    
+  wxMemStruct *st;
   for (st = from; st != 0; st = st->m_next)
   {
     void* data = st->GetActualData();
-    if (detailed && (data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
+//    if (detailed && (data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
+      if (detailed && (data != (void*) wxLog::GetActiveTarget()))
     {
       char *className = "nonobject";
       if (st->m_isObject && st->GetActualData())
@@ -764,7 +777,8 @@ bool wxDebugContext::PrintStatistics(bool detailed)
       stats->totalSize += st->RequestSize();
     }
 
-    if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
+//    if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
+    if (data != (void*) wxLog::GetActiveTarget())
     {
         totalSize += st->RequestSize();
         if (st->m_isObject)
@@ -778,32 +792,33 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   {
     while (list)
     {
-      wxTrace("%ld objects of class %s, total size %ld\n",
+      wxLogDebug("%ld objects of class %s, total size %ld",
           list->instanceCount, list->instanceClass, list->totalSize);
       wxDebugStatsStruct *old = list;
       list = old->next;
       free((char *)old);
     }
-    wxTrace("\n");
+    wxLogDebug("");
   }
-  
+
   SetDebugMode(currentMode);
 
-  wxTrace("Number of object items: %ld\n", noObjectNodes);
-  wxTrace("Number of non-object items: %ld\n", noNonObjectNodes);
-  wxTrace("Total allocated size: %ld\n", totalSize);
-  wxTrace("\n\n");
+  wxLogDebug("Number of object items: %ld", noObjectNodes);
+  wxLogDebug("Number of non-object items: %ld", noNonObjectNodes);
+  wxLogDebug("Total allocated size: %ld", totalSize);
+  wxLogDebug("");
+  wxLogDebug("");
 
   return TRUE;
 #else
   return FALSE;
 #endif
-}    
+}
 
 bool wxDebugContext::PrintClasses(void)
 {
-  if (!HasStream())
-    return FALSE;
+//  if (!HasStream())
+//    return FALSE;
 
   if (TRUE)
   {
@@ -813,7 +828,7 @@ bool wxDebugContext::PrintClasses(void)
     {
         appNameStr = wxTheApp->GetAppName();
         appName = (char*) (const char*) appNameStr;
-        wxTrace("----- Classes in %s -----\n", appName);
+        wxLogDebug("----- Classes in %s -----", appName);
     }
   }
 
@@ -828,23 +843,35 @@ bool wxDebugContext::PrintClasses(void)
     info = (wxClassInfo *)node->Data();
     if (info->GetClassName())
     {
-      wxTrace("%s ", info->GetClassName());
-
-      if (info->GetBaseClassName1() && !info->GetBaseClassName2())
-        wxTrace("is a %s", info->GetBaseClassName1());
-      else if (info->GetBaseClassName1() && info->GetBaseClassName2())
-        wxTrace("is a %s, %s", info->GetBaseClassName1(), info->GetBaseClassName2());
-      if (info->GetConstructor())
-        wxTrace(": dynamic\n");
-      else
-        wxTrace("\n");
+        wxString msg(info->GetClassName());
+        msg += " ";
+
+        if (info->GetBaseClassName1() && !info->GetBaseClassName2())
+        {
+            msg += "is a ";
+            msg += info->GetBaseClassName1();
+        }
+        else if (info->GetBaseClassName1() && info->GetBaseClassName2())
+        {
+            msg += "is a ";
+            msg += info->GetBaseClassName1() ;
+            msg += ", ";
+            msg += info->GetBaseClassName2() ;
+        }
+        if (info->GetConstructor())
+            msg += ": dynamic";
+
+        wxLogDebug(msg);
     }
     node = wxClassInfo::sm_classTable->Next();
     n ++;
   }
-  wxTrace("\nThere are %d classes derived from wxObject.\n\n\n", n);
+  wxLogDebug("");
+  wxLogDebug("There are %d classes derived from wxObject.", n);
+  wxLogDebug("");
+  wxLogDebug("");
   return TRUE;
-}    
+}
 
 void wxDebugContext::SetCheckpoint(bool all)
 {
@@ -858,7 +885,7 @@ void wxDebugContext::SetCheckpoint(bool all)
 int wxDebugContext::Check(bool checkAll)
 {
   int nFailures = 0;
-    
+
   wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
   if (!from || checkAll)
     from = wxDebugContext::GetHead ();
@@ -876,16 +903,21 @@ int wxDebugContext::Check(bool checkAll)
 
 // Count the number of non-wxDebugContext-related objects
 // that are outstanding
-int wxDebugContext::CountObjectsLeft(void)
+int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
 {
   int n = 0;
-    
-  wxMemStruct *from = wxDebugContext::GetHead ();
+
+  wxMemStruct *from = NULL;
+  if (sinceCheckpoint && checkPoint)
+    from = checkPoint->m_next;
+  else
+    from = wxDebugContext::GetHead () ;
 
   for (wxMemStruct * st = from; st != 0; st = st->m_next)
   {
       void* data = st->GetActualData();
-      if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
+//      if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
+      if (data != (void*) wxLog::GetActiveTarget())
           n ++;
   }
 
@@ -907,7 +939,7 @@ int wxDebugContext::CountObjectsLeft(void)
 #endif
 
 // Seems OK all of a sudden. Maybe to do with linking with multithreaded library?
-#if 0 // def _MSC_VER
+#if 0 // def __VISUALC__
 #define NO_DEBUG_ALLOCATION
 #endif
 
@@ -924,7 +956,28 @@ void * operator new (size_t size, char * fileName, int lineNum)
 #endif
 }
 
-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
+// Added JACS 25/11/98
+void * operator new (size_t size)
+{
+#ifdef NO_DEBUG_ALLOCATION
+  return malloc(size);
+#else
+  return wxDebugAlloc(size, NULL, 0, FALSE);
+#endif
+}
+
+#if wxUSE_ARRAY_MEMORY_OPERATORS
+void * operator new[] (size_t size)
+{
+#ifdef NO_DEBUG_ALLOCATION
+  return malloc(size);
+#else
+  return wxDebugAlloc(size, NULL, 0, FALSE, TRUE);
+#endif
+}
+#endif
+
+#if wxUSE_ARRAY_MEMORY_OPERATORS
 void * operator new[] (size_t size, char * fileName, int lineNum)
 {
 #ifdef NO_DEBUG_ALLOCATION
@@ -945,14 +998,21 @@ void operator delete (void * buf)
 }
 
 // VC++ 6.0
-#if _MSC_VER >= 1200
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
 {
- ::operator delete(pData);
+// ::operator delete(pData);
+  // JACS 21/11/1998: surely we need to call wxDebugFree?
+  wxDebugFree(pData, FALSE);
+}
+// New operator 21/11/1998
+void operator delete[](void* pData, char* /* fileName */, int /* lineNum */)
+{
+  wxDebugFree(pData, TRUE);
 }
 #endif
 
-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
+#if wxUSE_ARRAY_MEMORY_OPERATORS
 
 void operator delete[] (void * buf)
 {
@@ -976,11 +1036,12 @@ void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bo
   {
     return (void *)malloc(size);
   }
-  
-    char * buf = (char *) malloc(wxDebugContext::TotSize (size));
+
+    int totSize = wxDebugContext::TotSize (size);
+    char * buf = (char *) malloc(totSize);
     if (!buf) {
-	wxTrace("Call to malloc (%ld) failed.\n", (long)size);
-	return 0;
+        wxLogDebug("Call to malloc (%ld) failed.", (long)size);
+        return 0;
     }
     wxMemStruct * st = (wxMemStruct *)buf;
     st->m_firstMarker = MemStartCheck;
@@ -994,15 +1055,15 @@ void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bo
 
     // Errors from Append() shouldn't really happen - but just in case!
     if (st->Append () == 0) {
-	st->ErrorMsg ("Trying to append new node");
+        st->ErrorMsg ("Trying to append new node");
     }
-    
+
     if (wxDebugContext::GetCheckPrevious ()) {
-	if (st->CheckAllPrevious () < 0) {
-	    st->ErrorMsg ("Checking previous nodes");
-	}
+        if (st->CheckAllPrevious () < 0) {
+            st->ErrorMsg ("Checking previous nodes");
+        }
     }
-    
+
     // Set up the extra markers at the middle and end.
     char * ptr = wxDebugContext::MidMarkerPos (buf);
     * (wxMarkerType *) ptr = MemMidCheck;
@@ -1022,7 +1083,7 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
 {
   if (!buf)
     return;
-    
+
   // If not in debugging allocation mode, do the normal thing
   // so we don't leave any trace of ourselves in the node list.
   if (!wxDebugContext::GetDebugMode())
@@ -1037,7 +1098,7 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     wxMemStruct * st = (wxMemStruct *) wxDebugContext::StructPos (startPointer);
 
     if (! st->ValidateNode ())
-	return;
+        return;
 
     // If this is the current checkpoint, we need to
     // move the checkpoint back so it points to a valid
@@ -1049,12 +1110,12 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     {
       st->ErrorMsg ("Unlinking deleted node");
     }
-    
+
     // Now put in the fill char into the id slot and the caller requested
     // memory locations.
     st->SetDeleted ();
     (void) memset (wxDebugContext::CallerMemPos (startPointer), MemFillChar,
-		   st->RequestSize ());
+                   st->RequestSize ());
 
     // Don't allow delayed freeing of memory in this version
 //    if (!wxDebugContext::GetDelayFree())
@@ -1096,7 +1157,7 @@ void wxTraceLevel(int level, const char *fmt ...)
 {
   if (wxDebugContext::GetLevel() < level)
     return;
-    
+
   va_list ap;
   static char buffer[512];