another attempt to fix strconv.cpp compilation

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index ee71e7fd3aff2fc940c127fd96b545fbec25a695..6679675ab01afbb47204daa03455087ab520c692 100644 (file)
--- 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
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -35,21 +35,19 @@
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"
 #endif
 

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

 #include <stdlib.h>
 
 #include <stdlib.h>
 

+#include "wx/ioswrap.h"
+

 #if wxUSE_IOSTREAMH
 #if wxUSE_IOSTREAMH

-#include <iostream.h>
-#include <fstream.h>
+    #include <fstream.h>

 #else
 #else

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

 #endif
 
 #endif
 

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

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


@@ -78,8 +76,8 @@
 // wxDebugContext wxTheDebugContext;
 /*
   Redefine new and delete so that we can pick up situations where:
 // 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
   Only do this in debug mode.
 
   We change new to get enough memory to allocate a struct, followed


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

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

   PrintNode ();
 
   PrintNode ();
 

-//      << m_fileName << ' ' << m_lineNum << endl;
+//         << m_fileName << ' ' << m_lineNum << endl;

 }
 
 /*
 }
 
 /*


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

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

   PrintNode ();
   PrintNode ();

-    
+

 //    cerr << m_fileName << ' ' << m_lineNum << endl;
 }
 
 //    cerr << m_fileName << ' ' << m_lineNum << endl;
 }
 


@@ -141,9 +139,9 @@ void wxMemStruct::ErrorMsg ()
 int wxMemStruct::AssertList ()
 {
     if (wxDebugContext::GetHead () != 0 && ! (wxDebugContext::GetHead ())->AssertIt () ||
 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;
 }
     }
     return 1;
 }


@@ -163,8 +161,8 @@ int wxMemStruct::AssertList ()
 int wxMemStruct::AssertIt ()
 {
     return (m_id == MemStructId &&
 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));

 }
 
 
 }
 
 


@@ -175,19 +173,19 @@ int wxMemStruct::AssertIt ()
 int wxMemStruct::Append ()
 {
     if (! AssertList ())
 int wxMemStruct::Append ()
 {
     if (! AssertList ())

-       return 0;
+        return 0;

 
     if (wxDebugContext::GetHead () == 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 {
     } 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;
 }
     }
     return 1;
 }


@@ -201,51 +199,51 @@ int wxMemStruct::Append ()
 int wxMemStruct::Unlink ()
 {
     if (! AssertList ())
 int wxMemStruct::Unlink ()
 {
     if (! AssertList ())

-       return 0;
+        return 0;

 
     if (wxDebugContext::GetHead () == 0 || wxDebugContext::GetTail () == 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) {
     }
 
     // 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 {
     } 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) {
     }
 
     // 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 {
     } 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;
     }
 
     return 1;


@@ -262,22 +260,22 @@ int wxMemStruct::CheckBlock ()
     int nFailures = 0;
 
     if (m_firstMarker != MemStartCheck) {
     int nFailures = 0;
 
     if (m_firstMarker != MemStartCheck) {

-       nFailures++;
-       ErrorMsg ();
+        nFailures++;
+        ErrorMsg ();

     }
     }

-    
+

     char * pointer = wxDebugContext::MidMarkerPos ((char *) this);
     if (* (wxMarkerType *) pointer != MemMidCheck) {
     char * pointer = wxDebugContext::MidMarkerPos ((char *) this);
     if (* (wxMarkerType *) pointer != MemMidCheck) {

-       nFailures++;
-       ErrorMsg ();
+        nFailures++;
+        ErrorMsg ();

     }
     }

-    
+

     pointer = wxDebugContext::EndMarkerPos ((char *) this, RequestSize ());
     if (* (wxMarkerType *) pointer != MemEndCheck) {
     pointer = wxDebugContext::EndMarkerPos ((char *) this, RequestSize ());
     if (* (wxMarkerType *) pointer != MemEndCheck) {

-       nFailures++;
-       ErrorMsg ();
+        nFailures++;
+        ErrorMsg ();

     }
     }

-    
+

     return nFailures;
 }
 
     return nFailures;
 }
 


@@ -288,12 +286,12 @@ int wxMemStruct::CheckBlock ()
 int wxMemStruct::CheckAllPrevious ()
 {
     int nFailures = 0;
 int wxMemStruct::CheckAllPrevious ()
 {
     int nFailures = 0;

-    
+

     for (wxMemStruct * st = this->m_prev; st != 0; st = st->m_prev) {
     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;
     }
 
     return nFailures;


@@ -332,48 +330,48 @@ 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("");
+    wxString msg(wxT(""));

 
     if (m_fileName)
 
     if (m_fileName)

-      msg.Printf("%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 += "object";
+      msg += wxT("object");

 
     wxString msg2;
 
     wxString msg2;

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

     msg += msg2;
 
     msg += msg2;
 

-    wxLogDebug(msg);
+    wxLogMessage(msg);

   }
   else
   {
     wxString msg("");
 
     if (m_fileName)
   }
   else
   {
     wxString msg("");
 
     if (m_fileName)

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

     wxString msg2;
     wxString msg2;

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

     msg += msg2;
 
     msg += msg2;
 

-    wxLogDebug(msg);
+    wxLogMessage(msg);

   }
 }
 
 void wxMemStruct::Dump ()
 {
   if (!ValidateNode()) return;
   }
 }
 
 void wxMemStruct::Dump ()
 {
   if (!ValidateNode()) return;

-  
+

   if (m_isObject)
   {
     wxObject *obj = (wxObject *)m_actualData;
 
   if (m_isObject)
   {
     wxObject *obj = (wxObject *)m_actualData;
 

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

     if (m_fileName)
     if (m_fileName)

-      msg.Printf("%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.


@@ -386,24 +384,24 @@ 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 += "unknown object class";
+      msg += wxT("unknown object class");

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

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

     msg += msg2;
 
     msg += msg2;
 

-    wxLogDebug(msg);
+    wxLogMessage(msg);

   }
   else
   {
   }
   else
   {

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

     if (m_fileName)
     if (m_fileName)

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

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

-    msg2.Printf("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;
     msg += msg2;

-    wxLogDebug(msg);
+    wxLogMessage(msg);

   }
 }
 
   }
 }
 


@@ -416,15 +414,15 @@ int wxMemStruct::ValidateNode ()
 {
     char * startPointer = (char *) this;
     if (!AssertIt ()) {
 {
     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__
 #ifndef __WXGTK__

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

 #endif
 #endif

-       }
-       return 0;
+        }
+        return 0;

     }
 
 /*
     }
 
 /*


@@ -438,20 +436,20 @@ int wxMemStruct::ValidateNode ()
     if (* (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer) != MemMidCheck)
       ErrorMsg ();
     if (* (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
     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 ||
       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;
     }
 
     return 1;


@@ -463,22 +461,27 @@ int wxMemStruct::ValidateNode ()
 
 wxMemStruct *wxDebugContext::m_head = NULL;
 wxMemStruct *wxDebugContext::m_tail = NULL;
 
 wxMemStruct *wxDebugContext::m_head = NULL;
 wxMemStruct *wxDebugContext::m_tail = NULL;

-// ostream *wxDebugContext::m_debugStream = NULL;
-// streambuf *wxDebugContext::m_streamBuf = NULL;
+// wxSTD ostream *wxDebugContext::m_debugStream = NULL;
+// wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;

 
 // Must initialise these in wxEntry, and then delete them just before wxEntry exits
 
 // Must initialise these in wxEntry, and then delete them just before wxEntry exits

-streambuf *wxDebugContext::m_streamBuf = NULL;
-ostream *wxDebugContext::m_debugStream = NULL;
+wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;
+wxSTD ostream *wxDebugContext::m_debugStream = NULL;

 
 bool wxDebugContext::m_checkPrevious = FALSE;
 int wxDebugContext::debugLevel = 1;
 bool wxDebugContext::debugOn = TRUE;
 wxMemStruct *wxDebugContext::checkPoint = NULL;
 
 
 bool wxDebugContext::m_checkPrevious = FALSE;
 int wxDebugContext::debugLevel = 1;
 bool wxDebugContext::debugOn = TRUE;
 wxMemStruct *wxDebugContext::checkPoint = NULL;
 

+// For faster alignment calculation
+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;
+

 wxDebugContext::wxDebugContext(void)
 {
 //  m_streamBuf = new wxDebugStreamBuf;
 wxDebugContext::wxDebugContext(void)
 {
 //  m_streamBuf = new wxDebugStreamBuf;

-//  m_debugStream = new ostream(m_streamBuf);
+//  m_debugStream = new wxSTD ostream(m_streamBuf);

 }
 
 wxDebugContext::~wxDebugContext(void)
 }
 
 wxDebugContext::~wxDebugContext(void)


@@ -491,7 +494,7 @@ wxDebugContext::~wxDebugContext(void)
  * between SetFile and SetStream.
  */
 
  * between SetFile and SetStream.
  */
 

-void wxDebugContext::SetStream(ostream *str, streambuf *buf)
+void wxDebugContext::SetStream(wxSTD ostream *str, wxSTD streambuf *buf)

 {
   if (m_debugStream)
   {
 {
   if (m_debugStream)
   {


@@ -505,7 +508,7 @@ void wxDebugContext::SetStream(ostream *str, streambuf *buf)
 #ifndef __WATCOMC__
   if (m_streamBuf)
   {
 #ifndef __WATCOMC__
   if (m_streamBuf)
   {

-    streambuf* oldBuf = m_streamBuf;
+    wxSTD streambuf* oldBuf = m_streamBuf;

     m_streamBuf = NULL;
     delete oldBuf;
   }
     m_streamBuf = NULL;
     delete oldBuf;
   }


@@ -516,7 +519,7 @@ void wxDebugContext::SetStream(ostream *str, streambuf *buf)
 
 bool wxDebugContext::SetFile(const wxString& file)
 {
 
 bool wxDebugContext::SetFile(const wxString& file)
 {

-  ofstream *str = new ofstream((char *) (const char *)file);
+  wxSTD ofstream *str = new wxSTD ofstream(file.mb_str());

 
   if (str->bad())
   {
 
   if (str->bad())
   {


@@ -532,14 +535,18 @@ bool wxDebugContext::SetFile(const wxString& file)
 
 bool wxDebugContext::SetStandardError(void)
 {
 
 bool wxDebugContext::SetStandardError(void)
 {

+    // Obsolete
+#if 0

 #if !defined(_WINDLL)
   wxDebugStreamBuf *buf = new wxDebugStreamBuf;
 #if !defined(_WINDLL)
   wxDebugStreamBuf *buf = new wxDebugStreamBuf;

-  ostream *stream = new ostream(m_streamBuf);
+  wxSTD ostream *stream = new wxSTD ostream(m_streamBuf);

   SetStream(stream, buf);
   return TRUE;
 #else
   return FALSE;
 #endif
   SetStream(stream, buf);
   return TRUE;
 #else
   return FALSE;
 #endif

+#endif
+  return FALSE;

 }
 
 
 }
 
 


@@ -584,7 +591,7 @@ char * wxDebugContext::EndMarkerPos (const char * buf, const size_t size)
 char * wxDebugContext::StartPos (const char * caller)
 {
     return ((char *) (caller - wxDebugContext::PaddedSize (sizeof(wxMarkerType)) -
 char * wxDebugContext::StartPos (const char * caller)
 {
     return ((char *) (caller - wxDebugContext::PaddedSize (sizeof(wxMarkerType)) -

-           wxDebugContext::PaddedSize (sizeof (wxMemStruct))));
+            wxDebugContext::PaddedSize (sizeof (wxMemStruct))));

 }
 
 /*
 }
 
 /*


@@ -594,6 +601,9 @@ char * wxDebugContext::StartPos (const char * caller)
 
   I don't know how portable this stuff is, but it seems to work for me at
   the moment. It would be real nice if I knew more about this!
 
   I don't know how portable this stuff is, but it seems to work for me at
   the moment. It would be real nice if I knew more about this!

+
+  // Note: this function is now obsolete (along with CalcAlignment)
+  // because the calculations are done statically, for greater speed.

 */
 size_t wxDebugContext::GetPadding (const size_t size)
 {
 */
 size_t wxDebugContext::GetPadding (const size_t size)
 {


@@ -601,11 +611,22 @@ size_t wxDebugContext::GetPadding (const size_t size)
     return (pad) ? sizeof(wxMarkerType) - pad : 0;
 }
 
     return (pad) ? sizeof(wxMarkerType) - pad : 0;
 }
 

-
-

 size_t wxDebugContext::PaddedSize (const size_t size)
 {
 size_t wxDebugContext::PaddedSize (const size_t size)
 {

+    // Added by Terry Farnham <TJRT@pacbell.net> to replace
+    // slow GetPadding call.
+    int padb;
+
+    padb = size & m_balignmask;
+    if(padb)
+        return(size + m_balign - padb);
+    else
+        return(size);
+
+// Old (slow) code
+#if 0

     return size + GetPadding (size);
     return size + GetPadding (size);

+#endif

 }
 
 /*
 }
 
 /*


@@ -616,7 +637,7 @@ size_t wxDebugContext::PaddedSize (const size_t size)
 size_t wxDebugContext::TotSize (const size_t reqSize)
 {
     return (PaddedSize (sizeof (wxMemStruct)) + PaddedSize (reqSize) +
 size_t wxDebugContext::TotSize (const size_t reqSize)
 {
     return (PaddedSize (sizeof (wxMemStruct)) + PaddedSize (reqSize) +

-           2 * sizeof(wxMarkerType));
+            2 * sizeof(wxMarkerType));

 }
 
 
 }
 
 


@@ -627,8 +648,9 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
 {
   if (!from)
     from = wxDebugContext::GetHead ();
 {
   if (!from)
     from = wxDebugContext::GetHead ();

-    
-  for (wxMemStruct * st = from; st != 0; st = st->m_next)
+
+  wxMemStruct * st = NULL;
+  for (st = from; st != 0; st = st->m_next)

   {
       void* data = st->GetActualData();
 //      if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
   {
       void* data = st->GetActualData();
 //      if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))


@@ -663,25 +685,25 @@ bool wxDebugContext::Dump(void)
 //  if (!HasStream())
 //    return FALSE;
 
 //  if (!HasStream())
 //    return FALSE;
 

-  if (TRUE)
+//  if (TRUE)

   {
   {

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

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

-        appName = (char*) (const char*) appNameStr;
-        wxLogDebug("----- Memory dump of %s at %s -----", appName, WXSTRINGCAST wxNow() );
+        appName = WXSTRINGCAST appNameStr;
+        wxLogMessage(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );

     }
     else
     {
     }
     else
     {

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

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

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

 
   return TRUE;
 #else
 
   return TRUE;
 #else


@@ -689,19 +711,20 @@ bool wxDebugContext::Dump(void)
 #endif
 }
 
 #endif
 }
 

+#ifdef __WXDEBUG__

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

-  char *instanceClass;
+  wxChar *instanceClass;

   wxDebugStatsStruct *next;
 };
 
   wxDebugStatsStruct *next;
 };
 

-static wxDebugStatsStruct *FindStatsStruct(wxDebugStatsStruct *st, char *name)
+static wxDebugStatsStruct *FindStatsStruct(wxDebugStatsStruct *st, wxChar *name)

 {
   while (st)
   {
 {
   while (st)
   {

-    if (strcmp(st->instanceClass, name) == 0)
+    if (wxStrcmp(st->instanceClass, name) == 0)

       return st;
     st = st->next;
   }
       return st;
     st = st->next;
   }


@@ -713,6 +736,7 @@ 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)
 {


@@ -720,25 +744,25 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 //  if (!HasStream())
 //    return FALSE;
 
 //  if (!HasStream())
 //    return FALSE;
 

-  if (TRUE)
+//  if (TRUE)

   {
   {

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

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

-        appName = (char*) (const char*) appNameStr;
-        wxLogDebug("----- Memory statistics of %s at %s -----", appName, WXSTRINGCAST wxNow() );
+        appName = WXSTRINGCAST appNameStr;
+        wxLogMessage(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );

     }
     else
     {
     }
     else
     {

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

     }
   }
     }
   }

-  
+

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

-  
+

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


@@ -749,19 +773,19 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   if (!from)
     from = wxDebugContext::GetHead ();
 
   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*) wxLog::GetActiveTarget()))
     {
   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*) wxLog::GetActiveTarget()))
     {

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

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

-          className = obj->GetClassInfo()->GetClassName();
+          className = (wxChar*)obj->GetClassInfo()->GetClassName();

       }
       wxDebugStatsStruct *stats = FindStatsStruct(list, className);
       if (!stats)
       }
       wxDebugStatsStruct *stats = FindStatsStruct(list, className);
       if (!stats)


@@ -791,43 +815,44 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   {
     while (list)
     {
   {
     while (list)
     {

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

   }
   }

-  
+

   SetDebugMode(currentMode);
 
   SetDebugMode(currentMode);
 

-  wxLogDebug("Number of object items: %ld", noObjectNodes);
-  wxLogDebug("Number of non-object items: %ld", noNonObjectNodes);
-  wxLogDebug("Total allocated size: %ld", totalSize);
-  wxLogDebug("");
-  wxLogDebug("");
+  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(""));

 
   return TRUE;
 #else
 
   return TRUE;
 #else

+  (void)detailed;

   return FALSE;
 #endif
   return FALSE;
 #endif

-}    
+}

 
 bool wxDebugContext::PrintClasses(void)
 {
 //  if (!HasStream())
 //    return FALSE;
 
 
 bool wxDebugContext::PrintClasses(void)
 {
 //  if (!HasStream())
 //    return FALSE;
 

-  if (TRUE)
+//  if (TRUE)

   {
   {

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

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

-        appName = (char*) (const char*) appNameStr;
-        wxLogDebug("----- Classes in %s -----", appName);
+        appName = WXSTRINGCAST appNameStr;
+        wxLogMessage(wxT("----- Classes in %s -----"), appName);

     }
   }
 
     }
   }
 


@@ -843,34 +868,34 @@ bool wxDebugContext::PrintClasses(void)
     if (info->GetClassName())
     {
         wxString msg(info->GetClassName());
     if (info->GetClassName())
     {
         wxString msg(info->GetClassName());

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

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

-            msg += "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 += "is a ";
+            msg += wxT("is a ");

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

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

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

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

 
 

-        wxLogDebug(msg);
+        wxLogMessage(msg);

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

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

   return TRUE;
   return TRUE;

-}    
+}

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


@@ -884,7 +909,7 @@ void wxDebugContext::SetCheckpoint(bool all)
 int wxDebugContext::Check(bool checkAll)
 {
   int nFailures = 0;
 int wxDebugContext::Check(bool checkAll)
 {
   int nFailures = 0;

-    
+

   wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
   if (!from || checkAll)
     from = wxDebugContext::GetHead ();
   wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
   if (!from || checkAll)
     from = wxDebugContext::GetHead ();


@@ -909,7 +934,7 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
   wxMemStruct *from = NULL;
   if (sinceCheckpoint && checkPoint)
     from = checkPoint->m_next;
   wxMemStruct *from = NULL;
   if (sinceCheckpoint && checkPoint)
     from = checkPoint->m_next;

-  if (from == (wxMemStruct*) NULL)
+  else

     from = wxDebugContext::GetHead () ;
 
   for (wxMemStruct * st = from; st != 0; st = st->m_next)
     from = wxDebugContext::GetHead () ;
 
   for (wxMemStruct * st = from; st != 0; st = st->m_next)


@@ -923,123 +948,26 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
   return n ;
 }
 
   return n ;
 }
 

-/*
-  The global operator new used for everything apart from getting
-  dynamic storage within this function itself.
-*/
-
-// We'll only do malloc and free for the moment: leave the interesting
-// stuff for the wxObject versions.
-
-#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS
-
-#ifdef new
-#undef new
-#endif
-
-// Seems OK all of a sudden. Maybe to do with linking with multithreaded library?
-#if 0 // def _MSC_VER
-#define NO_DEBUG_ALLOCATION
-#endif
-
-// Unfortunately ~wxDebugStreamBuf doesn't work (VC++ 5) when we enable the debugging
-// code. I have no idea why. In BC++ 4.5, we have a similar problem the debug
-// stream myseriously changing pointer address between being passed from SetFile to SetStream.
-// See docs/msw/issues.txt.
-void * operator new (size_t size, char * fileName, int lineNum)
-{
-#ifdef NO_DEBUG_ALLOCATION
-  return malloc(size);
-#else
-  return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE);
-#endif
-}
-
-// 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
-  return malloc(size);
-#else
-  return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE);
-#endif
-}
-#endif
-
-void operator delete (void * buf)
-{
-#ifdef NO_DEBUG_ALLOCATION
-  free((char*) buf);
-#else
-  wxDebugFree(buf);
-#endif
-}
-
-// VC++ 6.0
-#if _MSC_VER >= 1200
-void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
-{
-// ::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 wxUSE_ARRAY_MEMORY_OPERATORS
-
-void operator delete[] (void * buf)
-{
-#ifdef NO_DEBUG_ALLOCATION
-  free((char*) buf);
-#else
-  wxDebugFree(buf, TRUE);
-#endif
-}
-#endif
-
-#endif
-

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

-void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
+void * wxDebugAlloc(size_t size, wxChar * 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.
 

+#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
+// VA 3.0 still has trouble in here
+  return (void *)malloc(size);
+#endif

   if (!wxDebugContext::GetDebugMode())
   {
     return (void *)malloc(size);
   }
   if (!wxDebugContext::GetDebugMode())
   {
     return (void *)malloc(size);
   }

-  
-    char * buf = (char *) malloc(wxDebugContext::TotSize (size));
+
+    int totSize = wxDebugContext::TotSize (size);
+    char * buf = (char *) malloc(totSize);

     if (!buf) {
     if (!buf) {

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

     }
     wxMemStruct * st = (wxMemStruct *)buf;
     st->m_firstMarker = MemStartCheck;
     }
     wxMemStruct * st = (wxMemStruct *)buf;
     st->m_firstMarker = MemStartCheck;


@@ -1053,15 +981,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) {
 
     // 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 (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;
     // Set up the extra markers at the middle and end.
     char * ptr = wxDebugContext::MidMarkerPos (buf);
     * (wxMarkerType *) ptr = MemMidCheck;


@@ -1081,7 +1009,11 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
 {
   if (!buf)
     return;
 {
   if (!buf)
     return;

-    
+
+#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
+// VA 3.0 still has trouble in here
+  free((char *)buf);
+#endif

   // 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())
   // 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())


@@ -1096,7 +1028,7 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     wxMemStruct * st = (wxMemStruct *) wxDebugContext::StructPos (startPointer);
 
     if (! st->ValidateNode ())
     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
 
     // If this is the current checkpoint, we need to
     // move the checkpoint back so it points to a valid


@@ -1108,12 +1040,12 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     {
       st->ErrorMsg ("Unlinking deleted node");
     }
     {
       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,
     // 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())
 
     // Don't allow delayed freeing of memory in this version
 //    if (!wxDebugContext::GetDelayFree())


@@ -1122,10 +1054,13 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
 }
 
 // Trace: send output to the current debugging stream
 }
 
 // Trace: send output to the current debugging stream

-void wxTrace(const char *fmt ...)
+void wxTrace(const wxChar * ...)

 {
 {

-  va_list ap;
-  static char buffer[512];
+#if 1
+    wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead."));
+#else
+    va_list ap;
+  static wxChar buffer[512];

 
   va_start(ap, fmt);
 
 
   va_start(ap, fmt);
 


@@ -1144,25 +1079,33 @@ void wxTrace(const char *fmt ...)
   }
   else
 #ifdef __WXMSW__
   }
   else
 #ifdef __WXMSW__

-    OutputDebugString((LPCSTR)buffer) ;
+#ifdef __WIN32__
+    OutputDebugString((LPCTSTR)buffer) ;
+#else
+    OutputDebugString((const char*) buffer) ;
+#endif

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

+#endif

 }
 
 // Trace with level
 }
 
 // Trace with level

-void wxTraceLevel(int level, const char *fmt ...)
+void wxTraceLevel(int, const wxChar * ...)

 {
 {

+#if 1
+    wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead."));
+#else

   if (wxDebugContext::GetLevel() < level)
     return;
   if (wxDebugContext::GetLevel() < level)
     return;

-    
+

   va_list ap;
   va_list ap;

-  static char buffer[512];
+  static wxChar buffer[512];

 
   va_start(ap, fmt);
 
 #ifdef __WXMSW__
 
   va_start(ap, fmt);
 
 #ifdef __WXMSW__

-  wvsprintf(buffer,fmt,ap) ;
+  wxWvsprintf(buffer,fmt,ap) ;

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


@@ -1176,10 +1119,15 @@ void wxTraceLevel(int level, const char *fmt ...)
   }
   else
 #ifdef __WXMSW__
   }
   else
 #ifdef __WXMSW__

-    OutputDebugString((LPCSTR)buffer) ;
+#ifdef __WIN32__
+    OutputDebugString((LPCTSTR)buffer) ;
+#else
+    OutputDebugString((const char*) buffer) ;
+#endif

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

+#endif

 }
 
 #else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
 }
 
 #else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)