removed the strange __WXMSW__ test in AddFile(bitmap) -- why should this function...

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index e141d7a766a6b64e16bf384cfcda9c443ed0ac06..f4491a6758cba9297fce9c357c3d3e56f43ba9bc 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -593,8 +593,8 @@ bool wxDebugContext::Dump(void)
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();

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

     }
     else
     {
     }
     else
     {


@@ -649,8 +649,8 @@ bool wxDebugContext::PrintStatistics(bool detailed)
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();

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

     }
     else
     {
     }
     else
     {


@@ -743,7 +743,7 @@ bool wxDebugContext::PrintClasses(void)
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();

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

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