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

Got rid of some wierd VisualAge debug nonsense that had appeared in this after the last update????

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-04-20 13:26:05 +00:00
parent abe5726aff
commit 61cca9d24e
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/object.cpp
View File

@@ -57,11 +57,6 @@ wxClassInfo wxObject::sm_classwxObject((wxChar *) wxT("wxObject"), (wxChar *) NU
wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL; wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL;
wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL; wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
#if defined(__WXDEBUG__) && defined(__VISAGECPP__)
int wxObject::N = 0; // total number of objects
int wxObject::Nid = 0;// object serial counter
#endif // __WXDEBUG__
// These are here so we can avoid 'always true/false' warnings // These are here so we can avoid 'always true/false' warnings
// by referring to these instead of TRUE/FALSE // by referring to these instead of TRUE/FALSE
const bool wxTrue = TRUE; const bool wxTrue = TRUE;
@@ -77,12 +72,6 @@ wxObject::wxObject()
#if wxUSE_SERIAL #if wxUSE_SERIAL
m_serialObj = (wxObject_Serialize *)NULL; m_serialObj = (wxObject_Serialize *)NULL;
#endif #endif
#if defined(__WXDEBUG__) && defined(__VISAGECPP__)
id = Nid++;
N++;
// { printf("wxObject %i/%i \t",id,N);
// }
#endif
} }
wxObject::~wxObject() wxObject::~wxObject()
@@ -92,11 +81,6 @@ wxObject::~wxObject()
if (m_serialObj) if (m_serialObj)
delete m_serialObj; delete m_serialObj;
#endif #endif
#if defined(__WXDEBUG__) && defined(__VISAGECPP__)
N--;
// { printf("~wxObject %i/%i \t",id,N);
// }
#endif //__WXDEBUG__
} }
/* /*
@@ -309,7 +293,7 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
DEBUG_PRINTF(wxObject *wxCreateDynamicObject) DEBUG_PRINTF(wxObject *wxCreateDynamicObject)
#endif #endif
if (wxClassInfo::sm_classTable) if (wxClassInfo::sm_classTable)
{ {
wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name); wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name);
@@ -347,7 +331,7 @@ void wxObject::StoreObject( wxObjectOutputStream& stream )
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
DEBUG_PRINTF(wxObject::StoreObject) DEBUG_PRINTF(wxObject::StoreObject)
#endif #endif
wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize"; wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial"); wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
@@ -376,7 +360,7 @@ void wxObject::LoadObject( wxObjectInputStream& stream )
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
DEBUG_PRINTF(wxObject::LoadObject) DEBUG_PRINTF(wxObject::LoadObject)
#endif #endif
wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize"; wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial"); wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");