Applied some of the SGI fixes. Don't know about the

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index ac9c0b214361b2dbb8580502cb46e0114a50d434..d30fc10ee8b8e9b54e5539fbffc0d65fb48c78d0 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -35,7 +35,7 @@
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"
 #endif
 

-#include <wx/log.h>
+#include "wx/log.h"

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


@@ -46,7 +46,8 @@
     #include <fstream>
 #endif
 
     #include <fstream>
 #endif
 

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

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


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

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

   PrintNode ();
 
 //         << m_fileName << ' ' << m_lineNum << endl;
   PrintNode ();
 
 //         << m_fileName << ' ' << m_lineNum << endl;


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

-  wxLogDebug(_T("wxWindows over/underwrite memory error:"));
+  wxLogDebug(wxT("wxWindows over/underwrite memory error:"));

   PrintNode ();
 
 //    cerr << m_fileName << ' ' << m_lineNum << endl;
   PrintNode ();
 
 //    cerr << m_fileName << ' ' << m_lineNum << endl;


@@ -329,18 +330,18 @@ 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(_T(""));
+    wxString msg(wxT(""));

 
     if (m_fileName)
 
     if (m_fileName)

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

 
     if (info && info->GetClassName())
       msg += info->GetClassName();
     else
 
     if (info && info->GetClassName())
       msg += info->GetClassName();
     else

-      msg += _T("object");
+      msg += wxT("object");

 
     wxString msg2;
 
     wxString msg2;

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

     msg += msg2;
 
     wxLogDebug(msg);
     msg += msg2;
 
     wxLogDebug(msg);


@@ -350,10 +351,10 @@ void wxMemStruct::PrintNode ()
     wxString msg("");
 
     if (m_fileName)
     wxString msg("");
 
     if (m_fileName)

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

     wxString msg2;
     wxString msg2;

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

     msg += msg2;
 
     wxLogDebug(msg);
     msg += msg2;
 
     wxLogDebug(msg);


@@ -368,9 +369,9 @@ void wxMemStruct::Dump ()
   {
     wxObject *obj = (wxObject *)m_actualData;
 
   {
     wxObject *obj = (wxObject *)m_actualData;
 

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

     if (m_fileName)
     if (m_fileName)

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

 
 
     /* TODO: We no longer have a stream (using wxLogDebug) so we can't dump it.
 
 
     /* TODO: We no longer have a stream (using wxLogDebug) so we can't dump it.


@@ -383,22 +384,22 @@ void wxMemStruct::Dump ()
     if (obj->GetClassInfo() && obj->GetClassInfo()->GetClassName())
       msg += obj->GetClassInfo()->GetClassName();
     else
     if (obj->GetClassInfo() && obj->GetClassInfo()->GetClassName())
       msg += obj->GetClassInfo()->GetClassName();
     else

-      msg += _T("unknown object class");
+      msg += wxT("unknown object class");

 
     wxString msg2("");
 
     wxString msg2("");

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

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

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

     if (m_fileName)
     if (m_fileName)

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

 
     wxString msg2("");
 
     wxString msg2("");

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

     msg += msg2;
     wxLogDebug(msg);
   }
     msg += msg2;
     wxLogDebug(msg);
   }


@@ -418,7 +419,7 @@ int wxMemStruct::ValidateNode ()
         else {
             // Can't use the error routines as we have no recognisable object.
 #ifndef __WXGTK__
         else {
             // Can't use the error routines as we have no recognisable object.
 #ifndef __WXGTK__

-             wxLogDebug(_T("Can't verify memory struct - all bets are off!"));
+             wxLogDebug(wxT("Can't verify memory struct - all bets are off!"));

 #endif
         }
         return 0;
 #endif
         }
         return 0;


@@ -666,23 +667,23 @@ bool wxDebugContext::Dump(void)
 
 //  if (TRUE)
   {
 
 //  if (TRUE)
   {

-    wxChar* appName = _T("application");
+    wxChar* appName = wxT("application");

     wxString appNameStr("");
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
         appName = WXSTRINGCAST appNameStr;
     wxString appNameStr("");
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
         appName = WXSTRINGCAST appNameStr;

-        wxLogDebug(_T("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+        wxLogDebug(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );

     }
     else
     {
     }
     else
     {

-      wxLogDebug( _T("----- Memory dump -----") );
+      wxLogDebug( wxT("----- Memory dump -----") );

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

-  wxLogDebug( _T("") );
-  wxLogDebug( _T("") );
+  wxLogDebug( wxT("") );
+  wxLogDebug( wxT("") );

 
   return TRUE;
 #else
 
   return TRUE;
 #else


@@ -723,17 +724,17 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 
 //  if (TRUE)
   {
 
 //  if (TRUE)
   {

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

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

-        wxLogDebug(_T("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+        wxLogDebug(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );

     }
     else
     {
     }
     else
     {

-      wxLogDebug( _T("----- Memory statistics -----") );
+      wxLogDebug( wxT("----- Memory statistics -----") );

     }
   }
 
     }
   }
 


@@ -757,7 +758,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 //    if (detailed && (data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
       if (detailed && (data != (void*) wxLog::GetActiveTarget()))
     {
 //    if (detailed && (data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
       if (detailed && (data != (void*) wxLog::GetActiveTarget()))
     {

-      wxChar *className = _T("nonobject");
+      wxChar *className = wxT("nonobject");

       if (st->m_isObject && st->GetActualData())
       {
         wxObject *obj = (wxObject *)st->GetActualData();
       if (st->m_isObject && st->GetActualData())
       {
         wxObject *obj = (wxObject *)st->GetActualData();


@@ -792,22 +793,22 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   {
     while (list)
     {
   {
     while (list)
     {

-      wxLogDebug(_T("%ld objects of class %s, total size %ld"),
+      wxLogDebug(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);
     }

-    wxLogDebug(_T(""));
+    wxLogDebug(wxT(""));

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

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

 
   return TRUE;
 #else
 
   return TRUE;
 #else


@@ -822,13 +823,13 @@ bool wxDebugContext::PrintClasses(void)
 
 //  if (TRUE)
   {
 
 //  if (TRUE)
   {

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

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

-        wxLogDebug(_T("----- Classes in %s -----"), appName);
+        wxLogDebug(wxT("----- Classes in %s -----"), appName);

     }
   }
 
     }
   }
 


@@ -844,32 +845,32 @@ bool wxDebugContext::PrintClasses(void)
     if (info->GetClassName())
     {
         wxString msg(info->GetClassName());
     if (info->GetClassName())
     {
         wxString msg(info->GetClassName());

-        msg += _T(" ");
+        msg += wxT(" ");

 
         if (info->GetBaseClassName1() && !info->GetBaseClassName2())
         {
 
         if (info->GetBaseClassName1() && !info->GetBaseClassName2())
         {

-            msg += _T("is a ");
+            msg += wxT("is a ");

             msg += info->GetBaseClassName1();
         }
         else if (info->GetBaseClassName1() && info->GetBaseClassName2())
         {
             msg += info->GetBaseClassName1();
         }
         else if (info->GetBaseClassName1() && info->GetBaseClassName2())
         {

-            msg += _T("is a ");
+            msg += wxT("is a ");

             msg += info->GetBaseClassName1() ;
             msg += info->GetBaseClassName1() ;

-            msg += _T(", ");
+            msg += wxT(", ");

             msg += info->GetBaseClassName2() ;
         }
         if (info->GetConstructor())
             msg += info->GetBaseClassName2() ;
         }
         if (info->GetConstructor())

-            msg += _T(": dynamic");
+            msg += wxT(": dynamic");

 
         wxLogDebug(msg);
     }
     node = wxClassInfo::sm_classTable->Next();
     n ++;
   }
 
         wxLogDebug(msg);
     }
     node = wxClassInfo::sm_classTable->Next();
     n ++;
   }

-  wxLogDebug(_T(""));
-  wxLogDebug(_T("There are %d classes derived from wxObject."), n);
-  wxLogDebug(_T(""));
-  wxLogDebug(_T(""));
+  wxLogDebug(wxT(""));
+  wxLogDebug(wxT("There are %d classes derived from wxObject."), n);
+  wxLogDebug(wxT(""));
+  wxLogDebug(wxT(""));

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -988,6 +989,7 @@ void * operator new[] (size_t size, wxChar * fileName, int lineNum)
 }
 #endif
 
 }
 #endif
 

+#if !defined(__VISAGECPP__) // already defines this by default

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


@@ -996,13 +998,12 @@ void operator delete (void * buf)
   wxDebugFree(buf);
 #endif
 }
   wxDebugFree(buf);
 #endif
 }

+#endif

 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
 {
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
 {

-// ::operator delete(pData);
-  // JACS 21/11/1998: surely we need to call wxDebugFree?

   wxDebugFree(pData, FALSE);
 }
 // New operator 21/11/1998
   wxDebugFree(pData, FALSE);
 }
 // New operator 21/11/1998


@@ -1040,7 +1041,7 @@ void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject,
     int totSize = wxDebugContext::TotSize (size);
     char * buf = (char *) malloc(totSize);
     if (!buf) {
     int totSize = wxDebugContext::TotSize (size);
     char * buf = (char *) malloc(totSize);
     if (!buf) {

-        wxLogDebug(_T("Call to malloc (%ld) failed."), (long)size);
+        wxLogDebug(wxT("Call to malloc (%ld) failed."), (long)size);

         return 0;
     }
     wxMemStruct * st = (wxMemStruct *)buf;
         return 0;
     }
     wxMemStruct * st = (wxMemStruct *)buf;


@@ -1146,7 +1147,11 @@ void wxTrace(const wxChar *fmt ...)
   }
   else
 #ifdef __WXMSW__
   }
   else
 #ifdef __WXMSW__

+#ifdef __WIN32__

     OutputDebugString((LPCTSTR)buffer) ;
     OutputDebugString((LPCTSTR)buffer) ;

+#else
+    OutputDebugString((const char*) buffer) ;
+#endif

 #else
     fprintf(stderr, buffer);
 #endif
 #else
     fprintf(stderr, buffer);
 #endif


@@ -1178,7 +1183,11 @@ void wxTraceLevel(int level, const wxChar *fmt ...)
   }
   else
 #ifdef __WXMSW__
   }
   else
 #ifdef __WXMSW__

+#ifdef __WIN32__

     OutputDebugString((LPCTSTR)buffer) ;
     OutputDebugString((LPCTSTR)buffer) ;

+#else
+    OutputDebugString((const char*) buffer) ;
+#endif

 #else
     fprintf(stderr, buffer);
 #endif
 #else
     fprintf(stderr, buffer);
 #endif