Applied #9011: Native wxListCtrl::HitTest on OS X

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 4d9cf5574526cb8b627fe484df02dced6c9b6aa7..c21fdf02f4b9f30de9ad46b00312ec4a81b807c7 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -20,22 +20,20 @@
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/hash.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/hash.h"

+    #include "wx/memory.h"
+    #include "wx/crt.h"

 #endif
 
 #include <string.h>
 
 #endif
 
 #include <string.h>
 

-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-#include "wx/memory.h"
-#endif
-
-#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+#if wxUSE_DEBUG_CONTEXT

     #if defined(__VISAGECPP__)
         #define DEBUG_PRINTF(NAME) { static int raz=0; \
             printf( #NAME " %i\n",raz); fflush(stdout); raz++; }
     #else
         #define DEBUG_PRINTF(NAME)
     #endif
     #if defined(__VISAGECPP__)
         #define DEBUG_PRINTF(NAME) { static int raz=0; \
             printf( #NAME " %i\n",raz); fflush(stdout); raz++; }
     #else
         #define DEBUG_PRINTF(NAME)
     #endif

-#endif // __WXDEBUG__ || wxUSE_DEBUG_CONTEXT
+#endif // wxUSE_DEBUG_CONTEXT

 
 // we must disable optimizations for VC.NET because otherwise its too eager
 // linker discards wxClassInfo objects in release build thus breaking many,
 
 // we must disable optimizations for VC.NET because otherwise its too eager
 // linker discards wxClassInfo objects in release build thus breaking many,


@@ -55,12 +53,12 @@ const wxClassInfo* wxObject::ms_classParents[] = { NULL } ;
  wxClassInfo wxObject::ms_classInfo(ms_classParents , wxEmptyString , wxT("wxObject"),
             (int) sizeof(wxObject),                              \
             (wxObjectConstructorFn) 0   ,
  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);
             0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject);

- template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;}
- template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;}
- template<> void wxStringReadValue(const wxString & , wxObject & ){assert(0) ;}
- template<> void wxStringWriteValue(wxString & , wxObject const & ){assert(0) ;}
+ template<> void wxStringReadValue(const wxString & , wxObject * & ){ wxFAIL_MSG("unreachable"); }
+ template<> void wxStringWriteValue(wxString & , wxObject* const & ){ wxFAIL_MSG("unreachable"); }
+ template<> void wxStringReadValue(const wxString & , wxObject & ){ wxFAIL_MSG("unreachable"); }
+ template<> void wxStringWriteValue(wxString & , wxObject const & ){ wxFAIL_MSG("unreachable"); }

  wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject*).name() ) ;
  wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject).name() ) ;
 #else
  wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject*).name() ) ;
  wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject).name() ) ;
 #else


@@ -99,13 +97,13 @@ const bool wxFalse = false;
 // E.g. is wxWindow a kind of wxObject?
 // Go from this class to superclass, taking into account
 // two possible base classes.
 // 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 ;
 }
 
     return (thisInfo) ? thisInfo->IsKindOf(info) : false ;
 }
 

-#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING && defined( new )
+#if wxUSE_MEMORY_TRACING && defined( new )

     #undef new
 #endif
 
     #undef new
 #endif
 


@@ -190,7 +188,7 @@ wxClassInfo::~wxClassInfo()
     Unregister();
 }
 
     Unregister();
 }
 

-wxClassInfo *wxClassInfo::FindClass(const wxChar *className)
+wxClassInfo *wxClassInfo::FindClass(const wxString& className)

 {
     if ( sm_classTable )
     {
 {
     if ( sm_classTable )
     {


@@ -200,7 +198,7 @@ wxClassInfo *wxClassInfo::FindClass(const wxChar *className)
     {
         for ( wxClassInfo *info = sm_first; info ; info = info->m_next )
         {
     {
         for ( wxClassInfo *info = sm_first; info ; info = info->m_next )
         {

-            if ( wxStrcmp(info->GetClassName(), className) == 0 )
+            if ( className == info->GetClassName() )

                 return info;
         }
 
                 return info;
         }
 


@@ -208,11 +206,37 @@ wxClassInfo *wxClassInfo::FindClass(const wxChar *className)
     }
 }
 
     }
 }
 

+// Reentrance can occur on some platforms (Solaris for one), as the use of hash
+// and string objects can cause other modules to load and register classes
+// before the original call returns. This is handled by keeping the hash table
+// local when it is first created and only assigning it to the global variable
+// when the function is ready to return.
+//
+// That does make the assumption that after the function has completed the
+// first time the problem will no longer happen; all the modules it depends on
+// will have been loaded. The assumption is checked using the 'entry' variable
+// as a reentrance guard, it checks that once the hash table is global it is
+// not accessed multiple times simulateously.
+

 void wxClassInfo::Register()
 {
 void wxClassInfo::Register()
 {

+#if wxDEBUG_LEVEL
+    // reentrance guard - see note above
+    static int entry = 0;
+#endif // wxDEBUG_LEVEL
+
+    wxHashTable *classTable;
+

     if ( !sm_classTable )
     {
     if ( !sm_classTable )
     {

-        sm_classTable = new wxHashTable(wxKEY_STRING);
+        // keep the hash local initially, reentrance is possible
+        classTable = new wxHashTable(wxKEY_STRING);
+    }
+    else
+    {
+        // guard againt reentrance once the global has been created
+        wxASSERT_MSG(++entry == 1, wxT("wxClassInfo::Register() reentrance"));
+        classTable = sm_classTable;

     }
 
     // Using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you
     }
 
     // Using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you


@@ -220,15 +244,36 @@ void wxClassInfo::Register()
     // 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.
     // 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( classTable->Get(m_className) == NULL,

         wxString::Format
         (
         wxString::Format
         (

-            _T("Class \"%s\" already in RTTI table - have you used IMPLEMENT_DYNAMIC_CLASS() multiple times or linked some object file twice)?"),
+            wxT("Class \"%s\" already in RTTI table - have you used IMPLEMENT_DYNAMIC_CLASS() multiple times or linked some object file twice)?"),

             m_className
         )
     );
 
             m_className
         )
     );
 

-    sm_classTable->Put(m_className, (wxObject *)this);
+    classTable->Put(m_className, (wxObject *)this);
+
+    // if we're using a local hash we need to try to make it global
+    if ( sm_classTable != classTable )
+    {
+        if ( !sm_classTable )
+        {
+            // make the hash global
+            sm_classTable = classTable;
+        }
+        else
+        {
+            // the gobal hash has already been created by a reentrant call,
+            // so delete the local hash and try again
+            delete classTable;
+            Register();
+        }
+    }
+
+#if wxDEBUG_LEVEL
+    entry = 0;
+#endif // wxDEBUG_LEVEL

 }
 
 void wxClassInfo::Unregister()
 }
 
 void wxClassInfo::Unregister()


@@ -244,9 +289,9 @@ void wxClassInfo::Unregister()
     }
 }
 
     }
 }
 

-wxObject *wxCreateDynamicObject(const wxChar *name)
+wxObject *wxCreateDynamicObject(const wxString& name)

 {
 {

-#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+#if wxUSE_DEBUG_CONTEXT

     DEBUG_PRINTF(wxObject *wxCreateDynamicObject)
 #endif
 
     DEBUG_PRINTF(wxObject *wxCreateDynamicObject)
 #endif
 


@@ -269,6 +314,50 @@ 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);
+}
+
+// ----------------------------------------------------------------------------
+// wxObjectRefData
+// ----------------------------------------------------------------------------
+
+void wxRefCounter::DecRef()
+{
+    wxASSERT_MSG( m_count > 0, "invalid ref data count" );
+
+    if ( --m_count == 0 )
+        delete this;
+}
+

 
 // ----------------------------------------------------------------------------
 // wxObject
 
 // ----------------------------------------------------------------------------
 // wxObject


@@ -276,7 +365,7 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
 
 void wxObject::Ref(const wxObject& clone)
 {
 
 void wxObject::Ref(const wxObject& clone)
 {

-#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+#if wxUSE_DEBUG_CONTEXT

     DEBUG_PRINTF(wxObject::Ref)
 #endif
 
     DEBUG_PRINTF(wxObject::Ref)
 #endif
 


@@ -291,7 +380,7 @@ void wxObject::Ref(const wxObject& clone)
     if ( clone.m_refData )
     {
         m_refData = clone.m_refData;
     if ( clone.m_refData )
     {
         m_refData = clone.m_refData;

-        ++(m_refData->m_count);
+        m_refData->IncRef();

     }
 }
 
     }
 }
 


@@ -299,10 +388,7 @@ void wxObject::UnRef()
 {
     if ( m_refData )
     {
 {
     if ( m_refData )
     {

-        wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") );
-
-        if ( --m_refData->m_count == 0 )
-            delete m_refData;
+        m_refData->DecRef();

         m_refData = NULL;
     }
 }
         m_refData = NULL;
     }
 }


@@ -325,13 +411,13 @@ void wxObject::AllocExclusive()
     //else: ref count is 1, we are exclusive owners of m_refData anyhow
 
     wxASSERT_MSG( m_refData && m_refData->GetRefCount() == 1,
     //else: ref count is 1, we are exclusive owners of m_refData anyhow
 
     wxASSERT_MSG( m_refData && m_refData->GetRefCount() == 1,

-                  _T("wxObject::AllocExclusive() failed.") );
+                  wxT("wxObject::AllocExclusive() failed.") );

 }
 
 wxObjectRefData *wxObject::CreateRefData() const
 {
     // if you use AllocExclusive() you must override this method
 }
 
 wxObjectRefData *wxObject::CreateRefData() const
 {
     // if you use AllocExclusive() you must override this method

-    wxFAIL_MSG( _T("CreateRefData() must be overridden if called!") );
+    wxFAIL_MSG( wxT("CreateRefData() must be overridden if called!") );

 
     return NULL;
 }
 
     return NULL;
 }


@@ -340,7 +426,7 @@ wxObjectRefData *
 wxObject::CloneRefData(const wxObjectRefData * WXUNUSED(data)) const
 {
     // if you use AllocExclusive() you must override this method
 wxObject::CloneRefData(const wxObjectRefData * WXUNUSED(data)) const
 {
     // if you use AllocExclusive() you must override this method

-    wxFAIL_MSG( _T("CloneRefData() must be overridden if called!") );
+    wxFAIL_MSG( wxT("CloneRefData() must be overridden if called!") );

 
     return NULL;
 }
 
     return NULL;
 }