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

More wxMotif work, OGL enhancements, USE_ macro corrections, object.cpp delete

Browse Source 
operator correction for VC++ 6


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-09-28 15:42:54 +00:00
parent 23e09f1115
commit f97c985452
44 changed files with 3439 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/memory.cpp
View File

@@ -324,7 +324,7 @@ void wxMemStruct::PrintNode ()
{
wxObject *obj = (wxObject *)m_actualData;
wxClassInfo *info = obj->GetClassInfo();
/*
if (info && info->GetClassName())
wxTrace("%s", info->GetClassName());
else
@@ -333,13 +333,25 @@ void wxMemStruct::PrintNode ()
if (m_fileName)
wxTrace(" (%s %d)", m_fileName, (int)m_lineNum);
wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
*/
// Let's put this in standard form so IDEs can load the file at the appropriate
// line
if (m_fileName)
wxTrace("%s(%d): ", m_fileName, (int)m_lineNum);
if (info && info->GetClassName())
wxTrace("%s", info->GetClassName());
else
wxTrace("object");
wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
}
else
{
wxTrace("Non-object data");
if (m_fileName)
wxTrace(" (%s %d)", m_fileName, (int)m_lineNum);
wxTrace("%s(%d): ", m_fileName, (int)m_lineNum);
wxTrace("non-object data");
wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
}
}
@@ -351,23 +363,19 @@ void wxMemStruct::Dump ()
if (m_isObject)
{
wxObject *obj = (wxObject *)m_actualData;
// wxClassInfo *info = obj->GetClassInfo();
if (m_fileName)
wxTrace("Item (%s %d)", m_fileName, (int)m_lineNum);
else
wxTrace("Item");
wxTrace("%s(%d): ", m_fileName, (int)m_lineNum);
wxTrace(" at $%lX, size %d: ", (long)GetActualData(), (int)RequestSize());
// wxTrace(info->GetClassName());
obj->Dump(wxDebugContext::GetStream());
wxTrace(" at $%lX, size %d", (long)GetActualData(), (int)RequestSize());
wxTrace("\n");
}
else
{
wxTrace("Non-object data");
if (m_fileName)
wxTrace(" (%s %d)", m_fileName, (int)m_lineNum);
wxTrace("%s(%d): ", m_fileName, (int)m_lineNum);
wxTrace("non-object data");
wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
}
}