some blind compilation fixes for legacy code (#9698)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 4f593c3de1b5fe89c1112a4714e3a3349898acb0..e141d7a766a6b64e16bf384cfcda9c443ed0ac06 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());

   }
 }
 
   }
 }
 


@@ -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;
+        OutputDumpLine(wxT("----- Memory dump of %s at %s -----"), appName, (const wxChar *)wxNow() );

     }
     else
     {
     }
     else
     {


@@ -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;
+        OutputDumpLine(wxT("----- Memory statistics of %s at %s -----"), appName, (const wxChar *) wxNow() );

     }
     else
     {
     }
     else
     {


@@ -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;

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