don't crash if one of GetAllCommands() parameters is NULL (coverity checker CID 11)

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 01708a2a35b4e5ac6e91eb2e1ff0d93864498c1f..87e3dc1ed78bc0977852256aa609a791338cc180 100644 (file)
--- 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"
 
@@ -287,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
@@ -323,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;
     }