Forgot header with OSX prefix

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 4f593c3de1b5fe89c1112a4714e3a3349898acb0..993b39a7a92a1e08e5fe641df8a8f9ed47136005 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -370,7 +370,7 @@ void wxMemStruct::Dump ()
     msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
     msg += msg2;
 
     msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
     msg += msg2;
 

-    wxDebugContext::OutputDumpLine(msg);
+    wxDebugContext::OutputDumpLine(msg.c_str());

   }
   else
   {
   }
   else
   {


@@ -381,7 +381,7 @@ void wxMemStruct::Dump ()
     wxString msg2;
     msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
     msg += msg2;
     wxString msg2;
     msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
     msg += msg2;

-    wxDebugContext::OutputDumpLine(msg);
+    wxDebugContext::OutputDumpLine(msg.c_str());

   }
 }
 
   }
 }
 


@@ -576,7 +576,7 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
 bool wxDebugContext::PrintList (void)
 {
 #ifdef __WXDEBUG__
 bool wxDebugContext::PrintList (void)
 {
 #ifdef __WXDEBUG__

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

 
   return true;
 #else
 
   return true;
 #else


@@ -588,13 +588,13 @@ bool wxDebugContext::Dump(void)
 {
 #ifdef __WXDEBUG__
   {
 {
 #ifdef __WXDEBUG__
   {

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

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

-        appName = WXSTRINGCAST appNameStr;
-        OutputDumpLine(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+        appName = appNameStr.c_str();
+        OutputDumpLine(wxT("----- Memory dump of %s at %s -----"), appName, static_cast<const wxChar *>(wxNow().c_str()));

     }
     else
     {
     }
     else
     {


@@ -602,7 +602,7 @@ bool wxDebugContext::Dump(void)
     }
   }
 
     }
   }
 

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

 
   OutputDumpLine(wxEmptyString);
   OutputDumpLine(wxEmptyString);
 
   OutputDumpLine(wxEmptyString);
   OutputDumpLine(wxEmptyString);


@@ -644,13 +644,13 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 {
 #ifdef __WXDEBUG__
   {
 {
 #ifdef __WXDEBUG__
   {

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

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

-        appName = WXSTRINGCAST appNameStr;
-        OutputDumpLine(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+        appName = appNameStr.c_str();
+        OutputDumpLine(wxT("----- Memory statistics of %s at %s -----"), appName, static_cast<const wxChar *>(wxNow().c_str()));

     }
     else
     {
     }
     else
     {


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

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

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


@@ -738,12 +738,12 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 bool wxDebugContext::PrintClasses(void)
 {
   {
 bool wxDebugContext::PrintClasses(void)
 {
   {

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

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

-        appName = WXSTRINGCAST appNameStr;
+        appName = appNameStr.c_str();

         wxLogMessage(wxT("----- Classes in %s -----"), appName);
     }
   }
         wxLogMessage(wxT("----- Classes in %s -----"), appName);
     }
   }


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

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

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