Now dot_special argument in wxMatchWild() is honoured. :-)

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 28256329b4a501e2ed10b231d685c717d738d285..70b4155d09f15c3b4604aee93b61d8263497332a 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 (DEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT

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


@@ -51,7 +51,7 @@
 #include <stdarg.h>
 #include <string.h>
 
 #include <stdarg.h>
 #include <string.h>
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #include <windows.h>
 
 #ifdef GetClassInfo
 #include <windows.h>
 
 #ifdef GetClassInfo


@@ -66,11 +66,9 @@
 
 #include "wx/memory.h"
 
 
 #include "wx/memory.h"
 

-/*

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

-*/

 
 // wxDebugContext wxTheDebugContext;
 /*
 
 // wxDebugContext wxTheDebugContext;
 /*


@@ -387,7 +385,9 @@ int wxMemStruct::ValidateNode ()
            ErrorMsg ("Object already deleted");
        else {
            // Can't use the error routines as we have no recognisable object.
            ErrorMsg ("Object already deleted");
        else {
            // Can't use the error routines as we have no recognisable object.

-           wxTrace("Can't verify memory struct - all bets are off!\n");
+#ifndef __WXGTK__
+            wxTrace("Can't verify memory struct - all bets are off!\n");
+#endif

        }
        return 0;
     }
        }
        return 0;
     }


@@ -623,11 +623,11 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
   */
 bool wxDebugContext::PrintList (void)
 {
   */
 bool wxDebugContext::PrintList (void)
 {

-#if DEBUG
+#if WXDEBUG

   if (!HasStream())
     return FALSE;
 
   if (!HasStream())
     return FALSE;
 

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

 
   return TRUE;
 #else
 
   return TRUE;
 #else


@@ -637,7 +637,7 @@ bool wxDebugContext::PrintList (void)
 
 bool wxDebugContext::Dump(void)
 {
 
 bool wxDebugContext::Dump(void)
 {

-#if DEBUG
+#if WXDEBUG

   if (!HasStream())
     return FALSE;
 
   if (!HasStream())
     return FALSE;
 


@@ -649,10 +649,16 @@ bool wxDebugContext::Dump(void)
     {
         appNameStr = wxTheApp->GetAppName();
         appName = (char*) (const char*) appNameStr;
     {
         appNameStr = wxTheApp->GetAppName();
         appName = (char*) (const char*) appNameStr;

-        wxTrace("Memory dump of %s at %s:\n", appName, wxNow());
+        wxTrace("----- Memory dump of %s at %s -----\n", appName, WXSTRINGCAST wxNow() );
+    }
+    else
+    {
+      wxTrace( "----- Memory dump -----\n" );

     }
   }
     }
   }

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

 
   return TRUE;
 #else
 
   return TRUE;
 #else


@@ -687,10 +693,26 @@ static wxDebugStatsStruct *InsertStatsStruct(wxDebugStatsStruct *head, wxDebugSt
 
 bool wxDebugContext::PrintStatistics(bool detailed)
 {
 
 bool wxDebugContext::PrintStatistics(bool detailed)
 {

-#if DEBUG
+#if WXDEBUG

   if (!HasStream())
     return FALSE;
 
   if (!HasStream())
     return FALSE;
 

+  if (TRUE)
+  {
+    char* appName = "application";
+    wxString appNameStr("");
+    if (wxTheApp)
+    {
+        appNameStr = wxTheApp->GetAppName();
+        appName = (char*) (const char*) appNameStr;
+        wxTrace("----- Memory statistics of %s at %s -----\n", appName, WXSTRINGCAST wxNow() );
+    }
+    else
+    {
+      wxTrace( "----- Memory statistics -----\n" );
+    }
+  }
+  

   bool currentMode = GetDebugMode();
   SetDebugMode(FALSE);
   
   bool currentMode = GetDebugMode();
   SetDebugMode(FALSE);
   


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

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

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


@@ -758,6 +780,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   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("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");

 
   return TRUE;
 #else
 
   return TRUE;
 #else


@@ -778,14 +801,19 @@ bool wxDebugContext::PrintClasses(void)
     {
         appNameStr = wxTheApp->GetAppName();
         appName = (char*) (const char*) appNameStr;
     {
         appNameStr = wxTheApp->GetAppName();
         appName = (char*) (const char*) appNameStr;

-        wxTrace("Classes in %s:\n\n", appName);
+        wxTrace("----- Classes in %s -----\n", appName);

     }
   }
 
   int n = 0;
     }
   }
 
   int n = 0;

-  wxClassInfo *info = wxClassInfo::first;
-  while (info)
+  wxNode *node;
+  wxClassInfo *info;
+
+  wxClassInfo::sm_classTable->BeginFind();
+  node = wxClassInfo::sm_classTable->Next();
+  while (node)

   {
   {

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

     if (info->GetClassName())
     {
       wxTrace("%s ", info->GetClassName());
     if (info->GetClassName())
     {
       wxTrace("%s ", info->GetClassName());


@@ -794,15 +822,15 @@ bool wxDebugContext::PrintClasses(void)
         wxTrace("is a %s", info->GetBaseClassName1());
       else if (info->GetBaseClassName1() && info->GetBaseClassName2())
         wxTrace("is a %s, %s", 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->objectConstructor)
+      if (info->GetConstructor())

         wxTrace(": dynamic\n");
       else
         wxTrace("\n");
     }
         wxTrace(": dynamic\n");
       else
         wxTrace("\n");
     }

-    info = info->next;
+    node = wxClassInfo::sm_classTable->Next();

     n ++;
   }
     n ++;
   }

-  wxTrace("\nThere are %d classes derived from wxObject.\n", n);
+  wxTrace("\nThere are %d classes derived from wxObject.\n\n\n", n);

   return TRUE;
 }    
 
   return TRUE;
 }    
 


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

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

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


@@ -860,7 +888,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 DEBUG && USE_GLOBAL_MEMORY_OPERATORS
+#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS

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


@@ -884,6 +912,7 @@ void * operator new (size_t size, char * fileName, int lineNum)
 #endif
 }
 
 #endif
 }
 

+#if !( defined (_MSC_VER) && (_MSC_VER <= 1000) )

 void * operator new[] (size_t size, char * fileName, int lineNum)
 {
 #ifdef NO_DEBUG_ALLOCATION
 void * operator new[] (size_t size, char * fileName, int lineNum)
 {
 #ifdef NO_DEBUG_ALLOCATION


@@ -892,6 +921,7 @@ void * operator new[] (size_t size, char * fileName, int lineNum)
   return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE);
 #endif
 }
   return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE);
 #endif
 }

+#endif

 
 void operator delete (void * buf)
 {
 
 void operator delete (void * buf)
 {


@@ -902,6 +932,7 @@ void operator delete (void * buf)
 #endif
 }
 
 #endif
 }
 

+#if !( defined (_MSC_VER) && (_MSC_VER <= 1000) )

 void operator delete[] (void * buf)
 {
 #ifdef NO_DEBUG_ALLOCATION
 void operator delete[] (void * buf)
 {
 #ifdef NO_DEBUG_ALLOCATION


@@ -910,11 +941,12 @@ void operator delete[] (void * buf)
   wxDebugFree(buf, TRUE);
 #endif
 }
   wxDebugFree(buf, TRUE);
 #endif
 }

+#endif

 
 #endif
 
 // TODO: store whether this is a vector or not.
 
 #endif
 
 // TODO: store whether this is a vector or not.

-void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect)
+void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )

 {
   // If not in debugging allocation mode, do the normal thing
   // so we don't leave any trace of ourselves in the node list.
 {
   // If not in debugging allocation mode, do the normal thing
   // so we don't leave any trace of ourselves in the node list.


@@ -965,7 +997,7 @@ void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bo
 }
 
 // TODO: check whether was allocated as a vector
 }
 
 // TODO: check whether was allocated as a vector

-void wxDebugFree(void * buf, bool isVect)
+void wxDebugFree(void * buf, bool WXUNUSED(isVect) )

 {
   if (!buf)
     return;
 {
   if (!buf)
     return;


@@ -1017,7 +1049,7 @@ void wxTrace(const char *fmt ...)
 
   va_start(ap, fmt);
 
 
   va_start(ap, fmt);
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

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


@@ -1031,7 +1063,7 @@ void wxTrace(const char *fmt ...)
     wxDebugContext::GetStream().flush();
   }
   else
     wxDebugContext::GetStream().flush();
   }
   else

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

     OutputDebugString((LPCSTR)buffer) ;
 #else
     fprintf(stderr, buffer);
     OutputDebugString((LPCSTR)buffer) ;
 #else
     fprintf(stderr, buffer);


@@ -1049,7 +1081,7 @@ void wxTraceLevel(int level, const char *fmt ...)
 
   va_start(ap, fmt);
 
 
   va_start(ap, fmt);
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

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


@@ -1063,14 +1095,14 @@ void wxTraceLevel(int level, const char *fmt ...)
     wxDebugContext::GetStream().flush();
   }
   else
     wxDebugContext::GetStream().flush();
   }
   else

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

     OutputDebugString((LPCSTR)buffer) ;
 #else
     fprintf(stderr, buffer);
 #endif
 }
 
     OutputDebugString((LPCSTR)buffer) ;
 #else
     fprintf(stderr, buffer);
 #endif
 }
 

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

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