X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14ca93a0d9a025c6620eaa94ac0687e44c31e234..acd32ffcdb319f162633c20e0202db3f8542998a:/src/common/object.cpp diff --git a/src/common/object.cpp b/src/common/object.cpp index 605eb33b43..c6e4f241a8 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -10,28 +10,22 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "object.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP - #include "wx/hash.h" #include "wx/object.h" + #include "wx/hash.h" + #include "wx/memory.h" + #include "wx/crt.h" #endif #include -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT -#include "wx/memory.h" -#endif - #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT #if defined(__VISAGECPP__) #define DEBUG_PRINTF(NAME) { static int raz=0; \ @@ -59,7 +53,7 @@ const wxClassInfo* wxObject::ms_classParents[] = { NULL } ; wxClassInfo wxObject::ms_classInfo(ms_classParents , wxEmptyString , wxT("wxObject"), (int) sizeof(wxObject), \ (wxObjectConstructorFn) 0 , - (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 , + NULL,NULL,0 , 0 , 0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject); template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;} template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;} @@ -81,23 +75,31 @@ wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0, wxClassInfo* wxClassInfo::sm_first = NULL; wxHashTable* wxClassInfo::sm_classTable = NULL; +// when using XTI, this method is already implemented inline inside +// DECLARE_DYNAMIC_CLASS but otherwise we intentionally make this function +// non-inline because this allows us to have a non-inline virtual function in +// all wx classes and this solves linking problems for HP-UX native toolchain +// and possibly others (we could make dtor non-inline as well but it's more +// useful to keep it inline than this function) +#if !wxUSE_EXTENDED_RTTI + wxClassInfo *wxObject::GetClassInfo() const { return &wxObject::ms_classInfo; } -// These are here so we can avoid 'always true/false' warnings -// by referring to these instead of true/false -const bool wxTrue = true; +#endif // wxUSE_EXTENDED_RTTI + +// this variable exists only so that we can avoid 'always true/false' warnings const bool wxFalse = false; // Is this object a kind of (a subclass of) 'info'? // E.g. is wxWindow a kind of wxObject? // Go from this class to superclass, taking into account // two possible base classes. -bool wxObject::IsKindOf(wxClassInfo *info) const +bool wxObject::IsKindOf(const wxClassInfo *info) const { - wxClassInfo *thisInfo = GetClassInfo(); + const wxClassInfo *thisInfo = GetClassInfo(); return (thisInfo) ? thisInfo->IsKindOf(info) : false ; } @@ -186,7 +188,7 @@ wxClassInfo::~wxClassInfo() Unregister(); } -wxClassInfo *wxClassInfo::FindClass(const wxChar *className) +wxClassInfo *wxClassInfo::FindClass(const wxString& className) { if ( sm_classTable ) { @@ -196,7 +198,7 @@ wxClassInfo *wxClassInfo::FindClass(const wxChar *className) { for ( wxClassInfo *info = sm_first; info ; info = info->m_next ) { - if ( wxStrcmp(info->GetClassName(), className) == 0 ) + if ( className == info->GetClassName() ) return info; } @@ -204,31 +206,49 @@ wxClassInfo *wxClassInfo::FindClass(const wxChar *className) } } -void wxClassInfo::CleanUp() -{ - if ( sm_classTable ) - { - delete sm_classTable; - sm_classTable = NULL; - } -} +// This function wasn't written to be reentrant but there is a possiblity of +// reentrance if something it does causes a shared lib to load and register +// classes. On Solaris this happens when the wxHashTable is newed, so the first +// part of the function has been modified to handle it, and a wxASSERT checks +// against reentrance in the remainder of the function. void wxClassInfo::Register() { if ( !sm_classTable ) { - sm_classTable = new wxHashTable(wxKEY_STRING); + wxHashTable *classTable = new wxHashTable(wxKEY_STRING); + + // check for reentrance + if ( sm_classTable ) + delete classTable; + else + sm_classTable = classTable; } - // using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you - // link any object module twice mistakenly) will break this function - // because it will enter an infinite loop and eventually die with "out of - // memory" - as this is quite hard to detect if you're unaware of this, - // try to do some checks here +#ifdef __WXDEBUG__ + // reentrance guard - see note above + static int entry = 0; + wxASSERT_MSG(++entry == 1, _T("wxClassInfo::Register() reentrance")); +#endif + + // Using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you + // link any object module twice mistakenly, or link twice against wx shared + // library) will break this function because it will enter an infinite loop + // and eventually die with "out of memory" - as this is quite hard to + // detect if you're unaware of this, try to do some checks here. wxASSERT_MSG( sm_classTable->Get(m_className) == NULL, - _T("class already in RTTI table - have you used IMPLEMENT_DYNAMIC_CLASS() twice (may be by linking some object module(s) twice)?") ); + wxString::Format + ( + _T("Class \"%s\" already in RTTI table - have you used IMPLEMENT_DYNAMIC_CLASS() multiple times or linked some object file twice)?"), + m_className + ) + ); sm_classTable->Put(m_className, (wxObject *)this); + +#ifdef __WXDEBUG__ + --entry; +#endif } void wxClassInfo::Unregister() @@ -244,7 +264,7 @@ void wxClassInfo::Unregister() } } -wxObject *wxCreateDynamicObject(const wxChar *name) +wxObject *wxCreateDynamicObject(const wxString& name) { #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT DEBUG_PRINTF(wxObject *wxCreateDynamicObject) @@ -269,20 +289,53 @@ wxObject *wxCreateDynamicObject(const wxChar *name) } } +// iterator interface +wxClassInfo::const_iterator::value_type +wxClassInfo::const_iterator::operator*() const +{ + return (wxClassInfo*)m_node->GetData(); +} + +wxClassInfo::const_iterator& wxClassInfo::const_iterator::operator++() +{ + m_node = m_table->Next(); + return *this; +} + +const wxClassInfo::const_iterator wxClassInfo::const_iterator::operator++(int) +{ + wxClassInfo::const_iterator tmp = *this; + m_node = m_table->Next(); + return tmp; +} + +wxClassInfo::const_iterator wxClassInfo::begin_classinfo() +{ + sm_classTable->BeginFind(); + + return const_iterator(sm_classTable->Next(), sm_classTable); +} + +wxClassInfo::const_iterator wxClassInfo::end_classinfo() +{ + return const_iterator(NULL, NULL); +} // ---------------------------------------------------------------------------- -// wxObject +// wxObjectRefData // ---------------------------------------------------------------------------- -// Initialize ref data from another object (needed for copy constructor and -// assignment operator) -void wxObject::InitFrom(const wxObject& other) +void wxObjectRefData::DecRef() { - m_refData = other.m_refData; - if ( m_refData ) - m_refData->m_count++; + if ( --m_count == 0 ) + delete this; } + +// ---------------------------------------------------------------------------- +// wxObject +// ---------------------------------------------------------------------------- + void wxObject::Ref(const wxObject& clone) { #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT @@ -300,7 +353,7 @@ void wxObject::Ref(const wxObject& clone) if ( clone.m_refData ) { m_refData = clone.m_refData; - ++(m_refData->m_count); + m_refData->IncRef(); } } @@ -310,8 +363,7 @@ void wxObject::UnRef() { wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") ); - if ( !--m_refData->m_count ) - delete m_refData; + m_refData->DecRef(); m_refData = NULL; } }