wxMenuItem::GetLabelFromText() added/documented, bug in wxMenu::FindItem() fixed

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 7cac322e8d7b0ad2e05f810e1011cba17585b6b8..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("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("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("");
+    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;
 
     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("%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;
 
     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("");
+    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.


@@ -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 += "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;
 
     wxLogDebug(msg);
   }
   else
   {
     msg += msg2;
 
     wxLogDebug(msg);
   }
   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;
     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("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;


@@ -513,7 +514,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);
+  ofstream *str = new ofstream(file.fn_str());

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


@@ -664,25 +665,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;
+        wxLogDebug(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );

     }
     else
     {
     }
     else
     {

-      wxLogDebug( "----- 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( "" );
-  wxLogDebug( "" );
+  wxLogDebug( wxT("") );
+  wxLogDebug( wxT("") );

 
   return TRUE;
 #else
 
   return TRUE;
 #else


@@ -694,15 +695,15 @@ struct wxDebugStatsStruct
 {
   long instanceCount;
   long totalSize;
 {
   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;
   }


@@ -721,19 +722,19 @@ 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;
+        wxLogDebug(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );

     }
     else
     {
     }
     else
     {

-      wxLogDebug( "----- 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()))
     {

-      char *className = "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("%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("");
+    wxLogDebug(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("");
+  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


@@ -820,15 +821,15 @@ bool wxDebugContext::PrintClasses(void)
 //  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("----- Classes in %s -----", appName);
+        appName = WXSTRINGCAST appNameStr;
+        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 += " ";
+        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);
     }
     node = wxClassInfo::sm_classTable->Next();
     n ++;
   }
 
         wxLogDebug(msg);
     }
     node = wxClassInfo::sm_classTable->Next();
     n ++;
   }

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

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -947,7 +948,7 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
 // 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.
 // 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)
+void * operator new (size_t size, wxChar * fileName, int lineNum)

 {
 #ifdef NO_DEBUG_ALLOCATION
   return malloc(size);
 {
 #ifdef NO_DEBUG_ALLOCATION
   return malloc(size);


@@ -978,7 +979,7 @@ void * operator new[] (size_t size)
 #endif
 
 #if wxUSE_ARRAY_MEMORY_OPERATORS
 #endif
 
 #if wxUSE_ARRAY_MEMORY_OPERATORS

-void * operator new[] (size_t size, char * fileName, int lineNum)
+void * operator new[] (size_t size, wxChar * fileName, int lineNum)

 {
 #ifdef NO_DEBUG_ALLOCATION
   return malloc(size);
 {
 #ifdef NO_DEBUG_ALLOCATION
   return malloc(size);


@@ -988,6 +989,7 @@ void * operator new[] (size_t size, char * 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)
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)

-void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+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


@@ -1027,7 +1028,7 @@ void operator delete[] (void * buf)
 #endif
 
 // TODO: store whether this is a vector or not.
 #endif
 
 // TODO: store whether this is a vector or not.

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


@@ -1040,7 +1041,7 @@ void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bo
     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("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;


@@ -1124,10 +1125,10 @@ 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 *fmt ...)

 {
   va_list ap;
 {
   va_list ap;

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

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


@@ -1146,20 +1147,24 @@ 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
 }
 
 // Trace with level
 #else
     fprintf(stderr, buffer);
 #endif
 }
 
 // Trace with level

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

 {
   if (wxDebugContext::GetLevel() < level)
     return;
 
   va_list ap;
 {
   if (wxDebugContext::GetLevel() < level)
     return;
 
   va_list ap;

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

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


@@ -1178,7 +1183,11 @@ 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