Added DoSetSize and DoMoveWindow to generic wxStaticLine.

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 28256329b4a501e2ed10b231d685c717d738d285..5302fe214d5001cbe450a8589e79bf8ac60db193 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__


@@ -24,7 +24,7 @@
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"
 #endif
 

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

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


@@ -35,23 +35,29 @@
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"
 #endif
 

+#include "wx/log.h"

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

-#if USE_IOSTREAMH
-#include <iostream.h>
+#include "wx/ioswrap.h"
+
+// Obsolete
+#if 0
+#if wxUSE_IOSTREAMH
+    #include <fstream.h>

 #else
 #else

-#include <iostream>
+    #include <fstream>
+#endif

 #endif
 #endif

-#include <fstream.h>

 
 

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

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

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

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


@@ -66,17 +72,15 @@
 
 #include "wx/memory.h"
 
 
 #include "wx/memory.h"
 

-/*

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

-*/

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


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

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

   PrintNode ();
 
   PrintNode ();
 

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

 }
 
 /*
 }
 
 /*


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

-  wxTrace("wxWindows over/underwrite memory error: \n");
+  wxLogMessage(wxT("wxWindows over/underwrite memory error:"));

   PrintNode ();
   PrintNode ();

-    
+

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


@@ -138,9 +142,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;
 }


@@ -160,8 +164,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));

 }
 
 
 }
 
 


@@ -172,19 +176,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;
 }


@@ -198,51 +202,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;


@@ -259,22 +263,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;
 }
 


@@ -285,12 +289,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;


@@ -327,50 +331,80 @@ void wxMemStruct::PrintNode ()
     wxObject *obj = (wxObject *)m_actualData;
     wxClassInfo *info = obj->GetClassInfo();
 
     wxObject *obj = (wxObject *)m_actualData;
     wxClassInfo *info = obj->GetClassInfo();
 

+    // Let's put this in standard form so IDEs can load the file at the appropriate
+    // line
+    wxString msg(wxT(""));
+
+    if (m_fileName)
+      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+

     if (info && info->GetClassName())
     if (info && info->GetClassName())

-      wxTrace("%s", info->GetClassName());
+      msg += info->GetClassName();

     else
     else

-      wxTrace("Object");
+      msg += wxT("object");

 
 

-    if (m_fileName)
-      wxTrace(" (%s %d)", m_fileName, (int)m_lineNum);
+    wxString msg2;
+    msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
+    msg += msg2;

 
 

-    wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+    wxLogMessage(msg);

   }
   else
   {
   }
   else
   {

-    wxTrace("Non-object data");
+    wxString msg("");
+

     if (m_fileName)
     if (m_fileName)

-      wxTrace(" (%s %d)", m_fileName, (int)m_lineNum);
-    wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+      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());
+    msg += msg2;
+
+    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;

-//    wxClassInfo *info = obj->GetClassInfo();

 
 

+    wxString msg(wxT(""));

     if (m_fileName)
     if (m_fileName)

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

 
 

-    wxTrace(" at $%lX, size %d: ", (long)GetActualData(), (int)RequestSize());
-//    wxTrace(info->GetClassName());
+
+    /* 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());
     obj->Dump(wxDebugContext::GetStream());

-    wxTrace("\n");
+     */
+
+    if (obj->GetClassInfo() && obj->GetClassInfo()->GetClassName())
+      msg += obj->GetClassInfo()->GetClassName();
+    else
+      msg += wxT("unknown object class");
+
+    wxString msg2("");
+    msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
+    msg += msg2;
+
+    wxLogMessage(msg);

   }
   else
   {
   }
   else
   {

-    wxTrace("Non-object data");
+    wxString msg(wxT(""));

     if (m_fileName)
     if (m_fileName)

-      wxTrace(" (%s %d)", m_fileName, (int)m_lineNum);
-    wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+
+    wxString msg2("");
+    msg2.Printf(wxT("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
+    msg += msg2;
+    wxLogMessage(msg);

   }
 }
 
   }
 }
 


@@ -383,13 +417,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.
-           wxTrace("Can't verify memory struct - all bets are off!\n");
-       }
-       return 0;
+        if (IsDeleted ())
+            ErrorMsg ("Object already deleted");
+        else {
+            // Can't use the error routines as we have no recognisable object.
+#ifndef __WXGTK__
+             wxLogMessage(wxT("Can't verify memory struct - all bets are off!"));
+#endif
+        }
+        return 0;

     }
 
 /*
     }
 
 /*


@@ -403,20 +439,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;


@@ -428,27 +464,35 @@ 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;
+// Obsolete
+#if 0
+wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;
+wxSTD ostream *wxDebugContext::m_debugStream = NULL;
+#endif

 
 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)
 {

-  SetStream(NULL, NULL);
+//  SetStream(NULL, NULL);

 }
 
 /*
 }
 
 /*


@@ -456,17 +500,10 @@ wxDebugContext::~wxDebugContext(void)
  * between SetFile and SetStream.
  */
 
  * between SetFile and SetStream.
  */
 

-void wxDebugContext::SetStream(ostream *str, streambuf *buf)
+// Obsolete
+#if 0
+void wxDebugContext::SetStream(wxSTD ostream *str, wxSTD 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();
   if (m_debugStream)
   {
     m_debugStream->flush();


@@ -479,7 +516,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;
   }


@@ -490,7 +527,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())
   {


@@ -499,11 +536,6 @@ bool wxDebugContext::SetFile(const wxString& file)
   }
   else
   {
   }
   else
   {

-/*
-  char buf[40];
-  sprintf(buf, "SetFile: str is %ld", (long) str);
-  MessageBox(NULL, buf, "Memory", MB_OK);
-*/

     SetStream(str);
     return TRUE;
   }
     SetStream(str);
     return TRUE;
   }


@@ -511,16 +543,21 @@ 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;

 }
 }

-
+#endif
+    // 0

 
 /*
   Work out the positions of the markers by creating an array of 2 markers
 
 /*
   Work out the positions of the markers by creating an array of 2 markers


@@ -563,7 +600,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))));

 }
 
 /*
 }
 
 /*


@@ -573,6 +610,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)
 {


@@ -580,11 +620,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

 }
 
 /*
 }
 
 /*


@@ -595,7 +646,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));

 }
 
 
 }
 
 


@@ -606,11 +657,13 @@ 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();
   {
       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) ();
       }
       {
         (st->*func) ();
       }


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

-#if DEBUG
-  if (!HasStream())
-    return FALSE;
+#ifdef __WXDEBUG__
+//  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,22 +690,29 @@ bool wxDebugContext::PrintList (void)
 
 bool wxDebugContext::Dump(void)
 {
 
 bool wxDebugContext::Dump(void)
 {

-#if DEBUG
-  if (!HasStream())
-    return FALSE;
+#ifdef __WXDEBUG__
+//  if (!HasStream())
+//    return FALSE;

 
 

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

   {
   {

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

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

-        appName = (char*) (const char*) appNameStr;
-        wxTrace("Memory dump of %s at %s:\n", appName, wxNow());
+        appName = WXSTRINGCAST appNameStr;
+        wxLogMessage(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+    }
+    else
+    {
+      wxLogMessage( wxT("----- Memory dump -----") );

     }
   }
     }
   }

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

 
   return TRUE;
 #else
 
   return TRUE;
 #else


@@ -660,19 +720,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;
   }


@@ -684,38 +745,56 @@ 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)
 {

-#if DEBUG
-  if (!HasStream())
-    return FALSE;
+#ifdef __WXDEBUG__
+//  if (!HasStream())
+//    return FALSE;
+
+//  if (TRUE)
+  {
+    wxChar* appName = (wxChar*) wxT("application");
+    wxString appNameStr(wxT(""));
+    if (wxTheApp)
+    {
+        appNameStr = wxTheApp->GetAppName();
+        appName = WXSTRINGCAST appNameStr;
+        wxLogMessage(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+    }
+    else
+    {
+      wxLogMessage( wxT("----- Memory statistics -----") );
+    }
+  }

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

-  
+

   long noNonObjectNodes = 0;
   long noObjectNodes = 0;
   long totalSize = 0;
 
   wxDebugStatsStruct *list = NULL;
 
   long noNonObjectNodes = 0;
   long noObjectNodes = 0;
   long totalSize = 0;
 
   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 ();
 

-  wxMemStruct *st;    
+  wxMemStruct *st;

   for (st = from; st != 0; st = st->m_next)
   {
     void* data = st->GetActualData();
   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";
+      wxChar *className = (wxChar*) 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)


@@ -730,7 +809,8 @@ bool wxDebugContext::PrintStatistics(bool detailed)
       stats->totalSize += st->RequestSize();
     }
 
       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)
     {
         totalSize += st->RequestSize();
         if (st->m_isObject)


@@ -744,67 +824,87 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   {
     while (list)
     {
   {
     while (list)
     {

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

-    wxTrace("\n");
+    wxLogMessage(wxT(""));

   }
   }

-  
+

   SetDebugMode(currentMode);
 
   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);
+  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)
 {
 
 bool wxDebugContext::PrintClasses(void)
 {

-  if (!HasStream())
-    return FALSE;
+//  if (!HasStream())
+//    return FALSE;

 
 

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

   {
   {

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

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

-        appName = (char*) (const char*) appNameStr;
-        wxTrace("Classes in %s:\n\n", appName);
+        appName = WXSTRINGCAST appNameStr;
+        wxLogMessage(wxT("----- Classes in %s -----"), 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())
     {
     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->objectConstructor)
-        wxTrace(": dynamic\n");
-      else
-        wxTrace("\n");
+        wxString msg(info->GetClassName());
+        msg += wxT(" ");
+
+        if (info->GetBaseClassName1() && !info->GetBaseClassName2())
+        {
+            msg += wxT("is a ");
+            msg += info->GetBaseClassName1();
+        }
+        else if (info->GetBaseClassName1() && info->GetBaseClassName2())
+        {
+            msg += wxT("is a ");
+            msg += info->GetBaseClassName1() ;
+            msg += wxT(", ");
+            msg += info->GetBaseClassName2() ;
+        }
+        if (info->GetConstructor())
+            msg += wxT(": dynamic");
+
+        wxLogMessage(msg);

     }
     }

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

     n ++;
   }
     n ++;
   }

-  wxTrace("\nThere are %d classes derived from wxObject.\n", n);
+  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)
 {


@@ -818,8 +918,8 @@ 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 : NULL);
+
+  wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );

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


@@ -836,98 +936,47 @@ int wxDebugContext::Check(bool checkAll)
 
 // Count the number of non-wxDebugContext-related objects
 // that are outstanding
 
 // Count the number of non-wxDebugContext-related objects
 // that are outstanding

-int wxDebugContext::CountObjectsLeft(void)
+int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)

 {
   int n = 0;
 {
   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();
 
   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 ++;
   }
 
   return n ;
 }
 
           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 DEBUG && USE_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
-}
-
-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
-}
-
-void operator delete (void * buf)
-{
-#ifdef NO_DEBUG_ALLOCATION
-  free((char*) buf);
-#else
-  wxDebugFree(buf);
-#endif
-}
-
-void operator delete[] (void * buf)
-{
-#ifdef NO_DEBUG_ALLOCATION
-  free((char*) buf);
-#else
-  wxDebugFree(buf, TRUE);
-#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 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) {

-       wxTrace("Call to malloc (%ld) failed.\n", (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;


@@ -941,15 +990,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;


@@ -965,11 +1014,15 @@ 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;

-    
+
+#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())


@@ -984,7 +1037,7 @@ void wxDebugFree(void * buf, bool 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


@@ -996,12 +1049,12 @@ void wxDebugFree(void * buf, bool 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())


@@ -1010,14 +1063,17 @@ void wxDebugFree(void * buf, bool 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);
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

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


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

-#ifdef __WINDOWS__
-    OutputDebugString((LPCSTR)buffer) ;
+#ifdef __WXMSW__
+#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);
 
 
   va_start(ap, fmt);
 

-#ifdef __WINDOWS__
-  wvsprintf(buffer,fmt,ap) ;
+#ifdef __WXMSW__
+  wxWvsprintf(buffer,fmt,ap) ;

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


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

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

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

+#endif

 }
 
 }
 

-#else // USE_MEMORY_TRACING && DEBUG
+#else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)

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