Unicode compilation fixes

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 120d0afac5ef0ce6f974c193df60197119ad4717..96f54f4277e4f2b8edc3b894b1d7cc66e2dfec8a 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -135,11 +135,20 @@ void wxObject::operator delete[] (void *buf)
 
 wxClassInfo *wxClassInfo::FindClass(const wxChar *className)
 {
-    for(wxClassInfo *info = sm_first; info ; info = info->m_next)
-        if( wxStrcmp(info->GetClassName(), className) == 0 )
-            return info;
+    if ( sm_classTable )
+    {
+        return (wxClassInfo *)wxClassInfo::sm_classTable->Get(className);
+    }
+    else
+    {
+        for ( wxClassInfo *info = sm_first; info ; info = info->m_next )
+        {
+            if ( wxStrcmp(info->GetClassName(), className) == 0 )
+                return info;
+        }
 
-    return 0;
+        return NULL;
+    }
 }
 
     // Set pointers to base class(es) to speed up IsKindOf
@@ -218,14 +227,14 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
 void wxObject::Ref(const wxObject& clone)
 {
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
- DEBUG_PRINTF(wxObject::Ref)
+    DEBUG_PRINTF(wxObject::Ref)
 #endif
 
     // delete reference to old data
     UnRef();
 
     // reference new data
-    if( clone.m_refData )
+    if ( clone.m_refData )
     {
         m_refData = clone.m_refData;
         ++(m_refData->m_count);
@@ -234,16 +243,56 @@ void wxObject::Ref(const wxObject& clone)
 
 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 )
             delete m_refData;
-        m_refData = 0;
+        m_refData = NULL;
+    }
+}
+
+void wxObject::AllocExclusive()
+{
+    if ( !m_refData )
+    {
+        m_refData = CreateRefData();
+    }
+    else if ( m_refData->GetRefCount() > 1 )
+    {
+        // note that ref is not going to be destroyed in this case
+        wxObjectRefData* ref = m_refData;
+        UnRef();
+
+        // ... so we can still access it
+        m_refData = CloneRefData(ref);
     }
+    //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.") );
+}
+
+wxObjectRefData *wxObject::CreateRefData() const
+{
+    // if you use AllocExclusive() you must override this method
+    wxFAIL_MSG( _T("CreateRefData() must be overridden if called!") );
+
+    return NULL;
 }
 
+wxObjectRefData *wxObject::CloneRefData(wxObjectRefData * WXUNUSED(data)) const
+{
+    // if you use AllocExclusive() you must override this method
+    wxFAIL_MSG( _T("CloneRefData() must be overridden if called!") );
+
+    return NULL;
+}
+
+// ----------------------------------------------------------------------------
+// misc
+// ----------------------------------------------------------------------------
 
 #if defined(__DARWIN__) && defined(DYLIB_INIT)