Add wxRTTI for the wxFileSystemWatcherEvent class

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 8dab25f747543735e66371f05b16aaae82ab6da0..7480718c9bb3edd2af2b49d8994acf111236602a 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        memory.cpp
+// Name:        src/common/memory.cpp

 // Purpose:     Memory checking implementation
 // Author:      Arthur Seaton, Julian Smart
 // Modified by:
 // Purpose:     Memory checking implementation
 // Author:      Arthur Seaton, Julian Smart
 // Modified by:


@@ -9,66 +9,43 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "memory.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
+    #pragma hdrstop

 #endif
 
 #endif
 

-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#if wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT

 
 

-#ifdef __GNUG__
-// #pragma implementation
-#endif
+#include "wx/memory.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/hash.h"
+    #ifdef __WINDOWS__
+        #include "wx/msw/wrapwin.h"
+    #endif
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/hash.h"
+    #include "wx/log.h"

 #endif
 
 #if wxUSE_THREADS
 #endif
 
 #if wxUSE_THREADS

-#include "wx/thread.h"
+    #include "wx/thread.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include <stdlib.h>
 
 #include "wx/ioswrap.h"
 
 #include <stdlib.h>
 
 #include "wx/ioswrap.h"
 

-#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
-     && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
+#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )

 #include <memory.h>
 #endif
 
 #include <stdarg.h>
 #include <string.h>
 
 #include <memory.h>
 #endif
 
 #include <stdarg.h>
 #include <string.h>
 

-#ifdef __WXMSW__
-#include "wx/msw/wrapwin.h"
-
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-#ifdef GetClassName
-#undef GetClassName
-#endif
-
-#endif
-
-#include "wx/memory.h"
-
-#if wxUSE_THREADS && defined(__WXDEBUG__) && !defined(__WXMAC__)
+#if wxUSE_THREADS

 #define USE_THREADSAFE_MEMORY_ALLOCATION 1
 #else
 #define USE_THREADSAFE_MEMORY_ALLOCATION 0
 #define USE_THREADSAFE_MEMORY_ALLOCATION 1
 #else
 #define USE_THREADSAFE_MEMORY_ALLOCATION 0


@@ -117,7 +94,7 @@
 */
 void wxMemStruct::ErrorMsg (const char * mesg)
 {
 */
 void wxMemStruct::ErrorMsg (const char * mesg)
 {

-  wxLogMessage(wxT("wxWindows memory checking error: %s"), mesg);
+  wxLogMessage(wxT("wxWidgets memory checking error: %s"), mesg);

   PrintNode ();
 }
 
   PrintNode ();
 }
 


@@ -126,7 +103,7 @@ void wxMemStruct::ErrorMsg (const char * mesg)
 */
 void wxMemStruct::ErrorMsg ()
 {
 */
 void wxMemStruct::ErrorMsg ()
 {

-  wxLogMessage(wxT("wxWindows over/underwrite memory error:"));
+  wxLogMessage(wxT("wxWidgets over/underwrite memory error:"));

   PrintNode ();
 }
 
   PrintNode ();
 }
 


@@ -140,8 +117,9 @@ void wxMemStruct::ErrorMsg ()
 */
 int wxMemStruct::AssertList ()
 {
 */
 int wxMemStruct::AssertList ()
 {

-    if (wxDebugContext::GetHead () != 0 && ! (wxDebugContext::GetHead ())->AssertIt () ||
-        wxDebugContext::GetTail () != 0 && ! wxDebugContext::GetTail ()->AssertIt ()) {
+    if ((wxDebugContext::GetHead() && !wxDebugContext::GetHead()->AssertIt()) ||
+        (wxDebugContext::GetTail() && !wxDebugContext::GetTail()->AssertIt()))
+    {

         ErrorMsg ("Head or tail pointers trashed");
         return 0;
     }
         ErrorMsg ("Head or tail pointers trashed");
         return 0;
     }


@@ -332,7 +310,7 @@ void wxMemStruct::PrintNode ()
 
     // Let's put this in standard form so IDEs can load the file at the appropriate
     // line
 
     // Let's put this in standard form so IDEs can load the file at the appropriate
     // line

-    wxString msg(wxT(""));
+    wxString msg;

 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);


@@ -343,20 +321,20 @@ void wxMemStruct::PrintNode ()
       msg += wxT("object");
 
     wxString msg2;
       msg += wxT("object");
 
     wxString msg2;

-    msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
+    msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());

     msg += msg2;
 
     wxLogMessage(msg);
   }
   else
   {
     msg += msg2;
 
     wxLogMessage(msg);
   }
   else
   {

-    wxString msg(wxT(""));
+    wxString msg;

 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
     msg += wxT("non-object data");
     wxString msg2;
 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
     msg += wxT("non-object data");
     wxString msg2;

-    msg2.Printf(wxT(" at $%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
+    msg2.Printf(wxT(" at 0x%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());

     msg += msg2;
 
     wxLogMessage(msg);
     msg += msg2;
 
     wxLogMessage(msg);


@@ -371,7 +349,7 @@ void wxMemStruct::Dump ()
   {
     wxObject *obj = (wxObject *)m_actualData;
 
   {
     wxObject *obj = (wxObject *)m_actualData;
 

-    wxString msg(wxT(""));
+    wxString msg;

     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 


@@ -388,22 +366,22 @@ void wxMemStruct::Dump ()
     else
       msg += wxT("unknown object class");
 
     else
       msg += wxT("unknown object class");
 

-    wxString msg2(wxT(""));
-    msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
+    wxString msg2;
+    msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());

     msg += msg2;
 
     msg += msg2;
 

-    wxLogMessage(msg);
+    wxDebugContext::OutputDumpLine(msg.c_str());

   }
   else
   {
   }
   else
   {

-    wxString msg(wxT(""));
+    wxString msg;

     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 

-    wxString msg2(wxT(""));
-    msg2.Printf(wxT("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
+    wxString msg2;
+    msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() );

     msg += msg2;
     msg += msg2;

-    wxLogMessage(msg);
+    wxDebugContext::OutputDumpLine(msg.c_str());

   }
 }
 
   }
 }
 


@@ -464,9 +442,9 @@ int wxMemStruct::ValidateNode ()
 wxMemStruct *wxDebugContext::m_head = NULL;
 wxMemStruct *wxDebugContext::m_tail = NULL;
 
 wxMemStruct *wxDebugContext::m_head = NULL;
 wxMemStruct *wxDebugContext::m_tail = NULL;
 

-bool wxDebugContext::m_checkPrevious = FALSE;
+bool wxDebugContext::m_checkPrevious = false;

 int wxDebugContext::debugLevel = 1;
 int wxDebugContext::debugLevel = 1;

-bool wxDebugContext::debugOn = TRUE;
+bool wxDebugContext::debugOn = true;

 wxMemStruct *wxDebugContext::checkPoint = NULL;
 
 // For faster alignment calculation
 wxMemStruct *wxDebugContext::checkPoint = NULL;
 
 // For faster alignment calculation


@@ -474,6 +452,9 @@ static wxMarkerType markerCalc[2];
 int wxDebugContext::m_balign = (int)((char *)&markerCalc[1] - (char*)&markerCalc[0]);
 int wxDebugContext::m_balignmask = (int)((char *)&markerCalc[1] - (char*)&markerCalc[0]) - 1;
 
 int wxDebugContext::m_balign = (int)((char *)&markerCalc[1] - (char*)&markerCalc[0]);
 int wxDebugContext::m_balignmask = (int)((char *)&markerCalc[1] - (char*)&markerCalc[0]) - 1;
 

+// Pointer to global function to call at shutdown
+wxShutdownNotifyFunction wxDebugContext::sm_shutdownFn;
+

 wxDebugContext::wxDebugContext(void)
 {
 }
 wxDebugContext::wxDebugContext(void)
 {
 }


@@ -594,45 +575,36 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
   */
 bool wxDebugContext::PrintList (void)
 {
   */
 bool wxDebugContext::PrintList (void)
 {

-#ifdef __WXDEBUG__
-  TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
+  TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : NULL));

 
 

-  return TRUE;
-#else
-  return FALSE;
-#endif
+  return true;

 }
 
 bool wxDebugContext::Dump(void)
 {
 }
 
 bool wxDebugContext::Dump(void)
 {

-#ifdef __WXDEBUG__

   {
   {

-    wxChar* appName = (wxChar*) wxT("application");
-    wxString appNameStr(wxT(""));
+    const wxChar* appName = wxT("application");
+    wxString appNameStr;

     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();

-        appName = WXSTRINGCAST appNameStr;
-        wxLogMessage(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+        appName = appNameStr.c_str();
+        OutputDumpLine(wxT("----- Memory dump of %s at %s -----"), appName, static_cast<const wxChar *>(wxNow().c_str()));

     }
     else
     {
     }
     else
     {

-      wxLogMessage( wxT("----- Memory dump -----") );
+      OutputDumpLine( wxT("----- Memory dump -----") );

     }
   }
 
     }
   }
 

-  TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
+  TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : NULL));

 
 

-  wxLogMessage( wxT("") );
-  wxLogMessage( wxT("") );
+  OutputDumpLine(wxEmptyString);
+  OutputDumpLine(wxEmptyString);

 
 

-  return TRUE;
-#else
-  return FALSE;
-#endif
+  return true;

 }
 
 }
 

-#ifdef __WXDEBUG__

 struct wxDebugStatsStruct
 {
   long instanceCount;
 struct wxDebugStatsStruct
 {
   long instanceCount;


@@ -657,28 +629,26 @@ static wxDebugStatsStruct *InsertStatsStruct(wxDebugStatsStruct *head, wxDebugSt
   st->next = head;
   return st;
 }
   st->next = head;
   return st;
 }

-#endif

 
 bool wxDebugContext::PrintStatistics(bool detailed)
 {
 
 bool wxDebugContext::PrintStatistics(bool detailed)
 {

-#ifdef __WXDEBUG__

   {
   {

-    wxChar* appName = (wxChar*) wxT("application");
-    wxString appNameStr(wxT(""));
+    const wxChar* appName = wxT("application");
+    wxString appNameStr;

     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();

-        appName = WXSTRINGCAST appNameStr;
-        wxLogMessage(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+        appName = appNameStr.c_str();
+        OutputDumpLine(wxT("----- Memory statistics of %s at %s -----"), appName, static_cast<const wxChar *>(wxNow().c_str()));

     }
     else
     {
     }
     else
     {

-      wxLogMessage( wxT("----- Memory statistics -----") );
+      OutputDumpLine( wxT("----- Memory statistics -----") );

     }
   }
 
   bool currentMode = GetDebugMode();
     }
   }
 
   bool currentMode = GetDebugMode();

-  SetDebugMode(FALSE);
+  SetDebugMode(false);

 
   long noNonObjectNodes = 0;
   long noObjectNodes = 0;
 
   long noNonObjectNodes = 0;
   long noObjectNodes = 0;


@@ -686,7 +656,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 
   wxDebugStatsStruct *list = NULL;
 
 
   wxDebugStatsStruct *list = NULL;
 

-  wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
+  wxMemStruct *from = (checkPoint ? checkPoint->m_next : NULL );

   if (!from)
     from = wxDebugContext::GetHead ();
 
   if (!from)
     from = wxDebugContext::GetHead ();
 


@@ -730,52 +700,47 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   {
     while (list)
     {
   {
     while (list)
     {

-      wxLogMessage(wxT("%ld objects of class %s, total size %ld"),
+      OutputDumpLine(wxT("%ld objects of class %s, total size %ld"),

           list->instanceCount, list->instanceClass, list->totalSize);
       wxDebugStatsStruct *old = list;
       list = old->next;
       free((char *)old);
     }
           list->instanceCount, list->instanceClass, list->totalSize);
       wxDebugStatsStruct *old = list;
       list = old->next;
       free((char *)old);
     }

-    wxLogMessage(wxT(""));
+    OutputDumpLine(wxEmptyString);

   }
 
   SetDebugMode(currentMode);
 
   }
 
   SetDebugMode(currentMode);
 

-  wxLogMessage(wxT("Number of object items: %ld"), noObjectNodes);
-  wxLogMessage(wxT("Number of non-object items: %ld"), noNonObjectNodes);
-  wxLogMessage(wxT("Total allocated size: %ld"), totalSize);
-  wxLogMessage(wxT(""));
-  wxLogMessage(wxT(""));
+  OutputDumpLine(wxT("Number of object items: %ld"), noObjectNodes);
+  OutputDumpLine(wxT("Number of non-object items: %ld"), noNonObjectNodes);
+  OutputDumpLine(wxT("Total allocated size: %ld"), totalSize);
+  OutputDumpLine(wxEmptyString);
+  OutputDumpLine(wxEmptyString);

 
 

-  return TRUE;
-#else
-  (void)detailed;
-  return FALSE;
-#endif
+  return true;

 }
 
 bool wxDebugContext::PrintClasses(void)
 {
   {
 }
 
 bool wxDebugContext::PrintClasses(void)
 {
   {

-    wxChar* appName = (wxChar*) wxT("application");
-    wxString appNameStr(wxT(""));
+    const wxChar* appName = wxT("application");
+    wxString appNameStr;

     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();

-        appName = WXSTRINGCAST appNameStr;
+        appName = appNameStr.c_str();

         wxLogMessage(wxT("----- Classes in %s -----"), appName);
     }
   }
 
   int n = 0;
         wxLogMessage(wxT("----- Classes in %s -----"), appName);
     }
   }
 
   int n = 0;

-  wxHashTable::compatibility_iterator node;
-  wxClassInfo *info;
+  const wxClassInfo *info;

 
 

-  wxClassInfo::sm_classTable->BeginFind();
-  node = wxClassInfo::sm_classTable->Next();
-  while (node)
+  for (wxClassInfo::const_iterator node = wxClassInfo::begin_classinfo(),
+                                    end = wxClassInfo::end_classinfo();
+       node != end; ++node)

   {
   {

-    info = (wxClassInfo *)node->GetData();
+    info = *node;

     if (info->GetClassName())
     {
         wxString msg(info->GetClassName());
     if (info->GetClassName())
     {
         wxString msg(info->GetClassName());


@@ -798,14 +763,13 @@ bool wxDebugContext::PrintClasses(void)
 
         wxLogMessage(msg);
     }
 
         wxLogMessage(msg);
     }

-    node = wxClassInfo::sm_classTable->Next();

     n ++;
   }
     n ++;
   }

-  wxLogMessage(wxT(""));
+  wxLogMessage(wxEmptyString);

   wxLogMessage(wxT("There are %d classes derived from wxObject."), n);
   wxLogMessage(wxT("There are %d classes derived from wxObject."), n);

-  wxLogMessage(wxT(""));
-  wxLogMessage(wxT(""));
-  return TRUE;
+  wxLogMessage(wxEmptyString);
+  wxLogMessage(wxEmptyString);
+  return true;

 }
 
 void wxDebugContext::SetCheckpoint(bool all)
 }
 
 void wxDebugContext::SetCheckpoint(bool all)


@@ -821,7 +785,7 @@ int wxDebugContext::Check(bool checkAll)
 {
   int nFailures = 0;
 
 {
   int nFailures = 0;
 

-  wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
+  wxMemStruct *from = (checkPoint ? checkPoint->m_next : NULL );

   if (!from || checkAll)
     from = wxDebugContext::GetHead ();
 
   if (!from || checkAll)
     from = wxDebugContext::GetHead ();
 


@@ -858,22 +822,55 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
   return n ;
 }
 
   return n ;
 }
 

+// This function is used to output the dump
+void wxDebugContext::OutputDumpLine(const wxChar *szFormat, ...)
+{
+    // a buffer of 2048 bytes should be long enough for a file name
+    // and a class name
+    wxChar buf[2048];
+    int count;
+    va_list argptr;
+    va_start(argptr, szFormat);
+    buf[WXSIZEOF(buf)-1] = wxT('\0');
+
+    // keep 3 bytes for a \r\n\0
+    count = wxVsnprintf(buf, WXSIZEOF(buf)-3, szFormat, argptr);
+
+    if ( count < 0 )
+        count = WXSIZEOF(buf)-3;
+    buf[count]=wxT('\r');
+    buf[count+1]=wxT('\n');
+    buf[count+2]=wxT('\0');
+
+    wxMessageOutputDebug dbgout;
+    dbgout.Printf(buf);
+}
+
+void wxDebugContext::SetShutdownNotifyFunction(wxShutdownNotifyFunction shutdownFn)
+{
+    sm_shutdownFn = shutdownFn;
+}
+
+

 #if USE_THREADSAFE_MEMORY_ALLOCATION
 #if USE_THREADSAFE_MEMORY_ALLOCATION

-static bool memSectionOk = FALSE;
+static bool memSectionOk = false;

 
 class MemoryCriticalSection : public wxCriticalSection
 {
 public:
 
 class MemoryCriticalSection : public wxCriticalSection
 {
 public:

-       MemoryCriticalSection() {
-               memSectionOk = TRUE;
-       }
+    MemoryCriticalSection() {
+        memSectionOk = true;
+    }
+    ~MemoryCriticalSection() {
+        memSectionOk = false;
+    }

 };
 
 class MemoryCriticalSectionLocker
 {
 public:
     inline MemoryCriticalSectionLocker(wxCriticalSection& critsect)
 };
 
 class MemoryCriticalSectionLocker
 {
 public:
     inline MemoryCriticalSectionLocker(wxCriticalSection& critsect)

-       : m_critsect(critsect), m_locked(memSectionOk) { if(m_locked) m_critsect.Enter(); }
+    : m_critsect(critsect), m_locked(memSectionOk) { if(m_locked) m_critsect.Enter(); }

     inline ~MemoryCriticalSectionLocker() { if(m_locked) m_critsect.Leave(); }
 
 private:
     inline ~MemoryCriticalSectionLocker() { if(m_locked) m_critsect.Leave(); }
 
 private:


@@ -882,11 +879,49 @@ private:
     MemoryCriticalSectionLocker& operator=(const MemoryCriticalSectionLocker&);
 
     wxCriticalSection& m_critsect;
     MemoryCriticalSectionLocker& operator=(const MemoryCriticalSectionLocker&);
 
     wxCriticalSection& m_critsect;

-       bool    m_locked;
+    bool m_locked;

 };
 
 static MemoryCriticalSection memLocker;
 };
 
 static MemoryCriticalSection memLocker;

-#endif
+
+#endif // USE_THREADSAFE_MEMORY_ALLOCATION
+
+
+#if !(defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
+#if wxUSE_GLOBAL_MEMORY_OPERATORS
+void * operator new (size_t size, wxChar * fileName, int lineNum)
+{
+    return wxDebugAlloc(size, fileName, lineNum, false, false);
+}
+
+void * operator new (size_t size)
+{
+    return wxDebugAlloc(size, NULL, 0, false);
+}
+
+void operator delete (void * buf)
+{
+    wxDebugFree(buf, false);
+}
+
+#if wxUSE_ARRAY_MEMORY_OPERATORS
+void * operator new[] (size_t size)
+{
+    return wxDebugAlloc(size, NULL, 0, false, true);
+}
+
+void * operator new[] (size_t size, wxChar * fileName, int lineNum)
+{
+    return wxDebugAlloc(size, fileName, lineNum, false, true);
+}
+
+void operator delete[] (void * buf)
+{
+  wxDebugFree(buf, true);
+}
+#endif // wxUSE_ARRAY_MEMORY_OPERATORS
+#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
+#endif // !(defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))

 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )


@@ -1009,7 +1044,7 @@ void wxTrace(const wxChar * ...)
 
   va_start(ap, fmt);
 
 
   va_start(ap, fmt);
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

   wvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;
   wvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;


@@ -1023,7 +1058,7 @@ void wxTrace(const wxChar * ...)
     wxDebugContext::GetStream().flush();
   }
   else
     wxDebugContext::GetStream().flush();
   }
   else

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 #ifdef __WIN32__
     OutputDebugString((LPCTSTR)buffer) ;
 #else
 #ifdef __WIN32__
     OutputDebugString((LPCTSTR)buffer) ;
 #else


@@ -1049,7 +1084,7 @@ void wxTraceLevel(int, const wxChar * ...)
 
   va_start(ap, fmt);
 
 
   va_start(ap, fmt);
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

   wxWvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;
   wxWvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;


@@ -1063,7 +1098,7 @@ void wxTraceLevel(int, const wxChar * ...)
     wxDebugContext::GetStream().flush();
   }
   else
     wxDebugContext::GetStream().flush();
   }
   else

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 #ifdef __WIN32__
     OutputDebugString((LPCTSTR)buffer) ;
 #else
 #ifdef __WIN32__
     OutputDebugString((LPCTSTR)buffer) ;
 #else


@@ -1075,16 +1110,43 @@ void wxTraceLevel(int, const wxChar * ...)
 #endif
 }
 
 #endif
 }
 

-#else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
-// Already defined in memory.h
-#if 0
-void wxTrace(const char *WXUNUSED(fmt) ...)
+//----------------------------------------------------------------------------
+// Final cleanup after all global objects in all files have been destroyed
+//----------------------------------------------------------------------------
+
+// Don't set it to 0 by dynamic initialization
+// Some compilers will really do the assignment later
+// All global variables are initialized to 0 at the very beginning, and this is just fine.
+int wxDebugContextDumpDelayCounter::sm_count;
+
+wxDebugContextDumpDelayCounter::wxDebugContextDumpDelayCounter()
+{
+    sm_count++;
+}
+
+wxDebugContextDumpDelayCounter::~wxDebugContextDumpDelayCounter()

 {
 {

+    if ( !--sm_count )
+    {
+        // Notify app if we've been asked to do that
+        if( wxDebugContext::sm_shutdownFn )
+            wxDebugContext::sm_shutdownFn();
+        DoDump();
+    }

 }
 
 }
 

-void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt) ...)
+void wxDebugContextDumpDelayCounter::DoDump()

 {
 {

+    if (wxDebugContext::CountObjectsLeft(true) > 0)
+    {
+        wxDebugContext::OutputDumpLine(wxT("There were memory leaks.\n"));
+        wxDebugContext::Dump();
+        wxDebugContext::PrintStatistics();
+    }

 }
 }

-#endif
-#endif

 
 

+// Even if there is nothing else, make sure that there is at
+// least one cleanup counter object
+static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
+
+#endif // wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT