made wxList methods return compatibility_iterator instead of Node * to further reduce...

[wxWidgets.git] / src / common / object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index e7692e7384ab2cfe6526ae73d0c4d57775da0366..87e3dc1ed78bc0977852256aa609a791338cc180 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -10,10 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -96,9 +92,7 @@ wxClassInfo *wxObject::GetClassInfo() const
 
 #endif // wxUSE_EXTENDED_RTTI
 
 
 #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'?
 const bool wxFalse = false;
 
 // Is this object a kind of (a subclass of) 'info'?


@@ -230,13 +224,18 @@ void wxClassInfo::Register()
         sm_classTable = new wxHashTable(wxKEY_STRING);
     }
 
         sm_classTable = new wxHashTable(wxKEY_STRING);
     }
 

-    // 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
+    // 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,
     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);
 }
 
     sm_classTable->Put(m_className, (wxObject *)this);
 }


@@ -284,15 +283,6 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
 // wxObject
 // ----------------------------------------------------------------------------
 
 // 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
 void wxObject::Ref(const wxObject& clone)
 {
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT


@@ -320,7 +310,7 @@ void wxObject::UnRef()
     {
         wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") );
 
     {
         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;
     }
             delete m_refData;
         m_refData = NULL;
     }