X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f730d32b0fbdab979b3cae1cd000e2233ef7c37e..f01bca89fd89e8b07061f96d4329bf6cebe6232e:/src/common/object.cpp diff --git a/src/common/object.cpp b/src/common/object.cpp index 9dfaeafb62..87e3dc1ed7 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -10,10 +10,6 @@ // 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" @@ -96,9 +92,7 @@ wxClassInfo *wxObject::GetClassInfo() const #endif // wxUSE_EXTENDED_RTTI -// These are here so we can avoid 'always true/false' warnings -// by referring to these instead of true/false -const bool wxTrue = true; +// 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'? @@ -289,15 +283,6 @@ wxObject *wxCreateDynamicObject(const wxChar *name) // wxObject // ---------------------------------------------------------------------------- -// Initialize ref data from another object (needed for copy constructor and -// assignment operator) -void wxObject::InitFrom(const wxObject& other) -{ - m_refData = other.m_refData; - if ( m_refData ) - m_refData->m_count++; -} - void wxObject::Ref(const wxObject& clone) { #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT @@ -325,7 +310,7 @@ void wxObject::UnRef() { wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") ); - if ( !--m_refData->m_count ) + if ( --m_refData->m_count == 0 ) delete m_refData; m_refData = NULL; }