Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some blind compilation fixes for legacy code (#9698)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-09 02:40:30 +00:00
parent 17a043046c
commit aa75d6d98c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/memory.cpp
View File

@@ -370,7 +370,7 @@ void wxMemStruct::Dump ()
msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize()); msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
msg += msg2; msg += msg2;
wxDebugContext::OutputDumpLine(msg); wxDebugContext::OutputDumpLine(msg.c_str());
} }
else else
{ {
@@ -381,7 +381,7 @@ void wxMemStruct::Dump ()
wxString msg2; wxString msg2;
msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() ); msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
msg += msg2; 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; wxString appNameStr;
if (wxTheApp) if (wxTheApp)
{ {
appNameStr = wxTheApp->GetAppName(); appNameStr = wxTheApp->GetAppName();
appName = WXSTRINGCAST appNameStr; appName = appNameStr;
OutputDumpLine(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() ); 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; wxString appNameStr;
if (wxTheApp) if (wxTheApp)
{ {
appNameStr = wxTheApp->GetAppName(); appNameStr = wxTheApp->GetAppName();
appName = WXSTRINGCAST appNameStr; appName = appNameStr;
OutputDumpLine(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() ); 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; wxString appNameStr;
if (wxTheApp) if (wxTheApp)
{ {
appNameStr = wxTheApp->GetAppName(); appNameStr = wxTheApp->GetAppName();
appName = WXSTRINGCAST appNameStr; appName = appNameStr;
wxLogMessage(wxT("----- Classes in %s -----"), appName); wxLogMessage(wxT("----- Classes in %s -----"), appName);
} }
} }