VA 4.0 fixes

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 734a4d50858720ac34a8d629353dd0d8e905251d..857d89a0da4d89b4875364b9c0432a8981d9f99d 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -44,30 +44,28 @@
     #include "wx/ioswrap.h"
 #endif
 
     #include "wx/ioswrap.h"
 #endif
 

-#if !USE_SHARED_LIBRARY
-wxClassInfo wxObject::sm_classwxObject((char *) "wxObject", (char *) NULL, (char *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
+wxClassInfo wxObject::sm_classwxObject((wxChar *) wxT("wxObject"), (wxChar *) NULL, (wxChar *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);

 wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL;
 wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
 wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL;
 wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;

-#endif

 
 /*
  * wxWindows root object.
  */
 
 
 /*
  * wxWindows root object.
  */
 

-wxObject::wxObject(void)
+wxObject::wxObject()

 {
 {

-  m_refData = (wxObjectRefData *) NULL;
+    m_refData = (wxObjectRefData *) NULL;

 #if wxUSE_SERIAL
 #if wxUSE_SERIAL

-  m_serialObj = (wxObject_Serialize *)NULL;
+    m_serialObj = (wxObject_Serialize *)NULL;

 #endif
 }
 
 #endif
 }
 

-wxObject::~wxObject(void)
+wxObject::~wxObject()

 {
 {

-       UnRef();
+    UnRef();

 #if wxUSE_SERIAL
 #if wxUSE_SERIAL

-       if (m_serialObj)
-         delete m_serialObj;
+    if (m_serialObj)
+        delete m_serialObj;

 #endif
 }
 
 #endif
 }
 


@@ -77,23 +75,39 @@ wxObject::~wxObject(void)
  * Go from this class to superclass, taking into account
  * two possible base classes.
  */
  * Go from this class to superclass, taking into account
  * two possible base classes.
  */

- 
+

 bool wxObject::IsKindOf(wxClassInfo *info) const
 {
 bool wxObject::IsKindOf(wxClassInfo *info) const
 {

-  wxClassInfo *thisInfo = GetClassInfo();
-  if (thisInfo)
-    return thisInfo->IsKindOf(info);
-  else
-    return FALSE;
+    wxClassInfo *thisInfo = GetClassInfo();
+    if (thisInfo)
+        return thisInfo->IsKindOf(info);
+    else
+        return FALSE;

 }
 
 }
 

-#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+wxObject *wxObject::Clone() const
+{
+    wxObject *object = GetClassInfo()->CreateObject();
+    CopyObject(*object);
+    return object;
+}
+
+#ifdef __WXDEBUG__
+void wxObject::CopyObject(wxObject& object_dest) const
+#else // !Debug
+void wxObject::CopyObject(wxObject& WXUNUSED(object_dest)) const
+#endif // Debug/!Debug
+{
+    wxASSERT(object_dest.GetClassInfo()->IsKindOf(GetClassInfo()));
+}
+
+#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)

 void wxObject::Dump(ostream& str)
 {
 void wxObject::Dump(ostream& str)
 {

-  if (GetClassInfo() && GetClassInfo()->GetClassName())
-    str << GetClassInfo()->GetClassName();
-  else
-    str << "unknown object class";
+    if (GetClassInfo() && GetClassInfo()->GetClassName())
+        str << GetClassInfo()->GetClassName();
+    else
+        str << "unknown object class";

 }
 #endif
 
 }
 #endif
 


@@ -103,34 +117,34 @@ void wxObject::Dump(ostream& str)
 #undef new
 #endif
 
 #undef new
 #endif
 

-void * wxObject::operator new (size_t size, char * fileName, int lineNum)
+void *wxObject::operator new (size_t size, wxChar * fileName, int lineNum)

 {
 {

-  return wxDebugAlloc(size, fileName, lineNum, TRUE);
+    return wxDebugAlloc(size, fileName, lineNum, TRUE);

 }
 
 void wxObject::operator delete (void * buf)
 {
 }
 
 void wxObject::operator delete (void * buf)
 {

-  wxDebugFree(buf);
+    wxDebugFree(buf);

 }
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)
 {
 }
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)
 {

- ::operator delete(pData);
+    ::operator delete(pData);

 }
 #endif
 
 // Cause problems for VC++ - crashes
 }
 #endif
 
 // Cause problems for VC++ - crashes

-#if !defined(__VISUALC__) && wxUSE_ARRAY_MEMORY_OPERATORS
-void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)
+#if (!defined(__VISUALC__) && wxUSE_ARRAY_MEMORY_OPERATORS ) || defined(__MWERKS__)
+void * wxObject::operator new[] (size_t size, wxChar * fileName, int lineNum)

 {
 {

-  return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);
+    return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);

 }
 
 void wxObject::operator delete[] (void * buf)
 {
 }
 
 void wxObject::operator delete[] (void * buf)
 {

-  wxDebugFree(buf, TRUE);
+    wxDebugFree(buf, TRUE);

 }
 #endif
 
 }
 #endif
 


@@ -140,105 +154,124 @@ void wxObject::operator delete[] (void * buf)
  * Class info: provides run-time class type information.
  */
 
  * Class info: provides run-time class type information.
  */
 

-wxClassInfo::wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn constr)
+wxClassInfo::wxClassInfo(wxChar *cName, wxChar *baseName1, wxChar *baseName2, int sz, wxObjectConstructorFn constr)

 {
 {

-  m_className = cName;
-  m_baseClassName1 = baseName1;
-  m_baseClassName2 = baseName2;
-
-  m_objectSize = sz;
-  m_objectConstructor = constr;
-  
-  m_next = sm_first;
-  sm_first = this;
-
-  m_baseInfo1 = (wxClassInfo *) NULL;
-  m_baseInfo2 = (wxClassInfo *) NULL;
+    m_className = cName;
+    m_baseClassName1 = baseName1;
+    m_baseClassName2 = baseName2;
+
+    m_objectSize = sz;
+    m_objectConstructor = constr;
+
+    m_next = sm_first;
+    sm_first = this;
+
+    m_baseInfo1 = (wxClassInfo *) NULL;
+    m_baseInfo2 = (wxClassInfo *) NULL;

 }
 
 }
 

-wxObject *wxClassInfo::CreateObject(void)
+wxObject *wxClassInfo::CreateObject()

 {
 {

-  if (m_objectConstructor)
-    return (wxObject *)(*m_objectConstructor)();
-  else
-    return (wxObject *) NULL;
+    if (m_objectConstructor)
+        return (wxObject *)(*m_objectConstructor)();
+    else
+        return (wxObject *) NULL;

 }
 
 }
 

-wxClassInfo *wxClassInfo::FindClass(char *c)
+wxClassInfo *wxClassInfo::FindClass(wxChar *c)

 {
 {

-  wxClassInfo *p = sm_first;
-  while (p)
-  {
-    if (p && p->GetClassName() && strcmp(p->GetClassName(), c) == 0)
-      return p;
-    p = p->m_next;
-  }
-  return (wxClassInfo *) NULL;
+    wxClassInfo *p = sm_first;
+    while (p)
+    {
+        if (p && p->GetClassName() && wxStrcmp(p->GetClassName(), c) == 0)
+            return p;
+        p = p->m_next;
+    }
+    return (wxClassInfo *) NULL;

 }
 
 // Climb upwards through inheritance hierarchy.
 // Dual inheritance is catered for.
 bool wxClassInfo::IsKindOf(wxClassInfo *info) const
 {
 }
 
 // Climb upwards through inheritance hierarchy.
 // Dual inheritance is catered for.
 bool wxClassInfo::IsKindOf(wxClassInfo *info) const
 {

-  if (info == NULL)
-    return FALSE;
-
-  // For some reason, when making/using a DLL, static data has to be included
-  // in both the DLL and the application. This can lead to duplicate
-  // wxClassInfo objects, so we have to test the name instead of the pointers.
-  // PROBABLY NO LONGER TRUE now I've done DLL creation right.
-/*
+    if (info == NULL)
+        return FALSE;
+
+    // For some reason, when making/using a DLL, static data has to be included
+    // in both the DLL and the application. This can lead to duplicate
+    // wxClassInfo objects, so we have to test the name instead of the pointers.
+    // PROBABLY NO LONGER TRUE now I've done DLL creation right.
+    /*

 #if WXMAKINGDLL
 #if WXMAKINGDLL

-  if (GetClassName() && info->GetClassName() && (strcmp(GetClassName(), info->GetClassName()) == 0))
-    return TRUE;
+if (GetClassName() && info->GetClassName() && (wxStrcmp(GetClassName(), info->GetClassName()) == 0))
+return TRUE;

 #else
 #else

-*/
-  if (this == info)
-    return TRUE;
+     */
+    if (this == info)
+        return TRUE;

 
 

-  if (m_baseInfo1)
-    if (m_baseInfo1->IsKindOf(info))
-      return TRUE;
+    if (m_baseInfo1)
+        if (m_baseInfo1->IsKindOf(info))
+            return TRUE;

 
 

-  if (m_baseInfo2)
-    return m_baseInfo2->IsKindOf(info);
+    if (m_baseInfo2)
+        return m_baseInfo2->IsKindOf(info);

 
 

-  return FALSE;
+    return FALSE;

 }
 
 // Set pointers to base class(es) to speed up IsKindOf
 }
 
 // Set pointers to base class(es) to speed up IsKindOf

-void wxClassInfo::InitializeClasses(void)
+void wxClassInfo::InitializeClasses()

 {
 {

-  wxClassInfo::sm_classTable = new wxHashTable(wxKEY_STRING);
-
-  // Index all class infos by their class name
-  wxClassInfo *info = sm_first;
-  while (info)
-  {
-    if (info->m_className)
-      sm_classTable->Put(info->m_className, (wxObject *)info);
-    info = info->m_next;
-  }
-
-  // Set base pointers for each wxClassInfo
-  info = sm_first;
-  while (info)
-  {
-    if (info->GetBaseClassName1())
-      info->m_baseInfo1 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName1());
-    if (info->GetBaseClassName2())
-      info->m_baseInfo2 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName2());
-    info = info->m_next;
-  }
+    // 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
+#ifdef __WXDEBUG__
+    // more classes than we'll ever have
+    static const size_t nMaxClasses = 10000;
+    size_t nClass = 0;
+#endif // Debug
+
+    wxClassInfo::sm_classTable = new wxHashTable(wxKEY_STRING);
+
+    // Index all class infos by their class name
+    wxClassInfo *info = sm_first;
+    while (info)
+    {
+        if (info->m_className)
+        {
+            wxASSERT_MSG( ++nClass < nMaxClasses,
+                          _T("an infinite loop detected - have you used "
+                            "IMPLEMENT_DYNAMIC_CLASS() twice (may be by "
+                            "linking some object module(s) twice)?") );
+
+            sm_classTable->Put(info->m_className, (wxObject *)info);
+        }
+
+        info = info->m_next;
+    }
+
+    // Set base pointers for each wxClassInfo
+    info = sm_first;
+    while (info)
+    {
+        if (info->GetBaseClassName1())
+            info->m_baseInfo1 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName1());
+        if (info->GetBaseClassName2())
+            info->m_baseInfo2 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName2());
+        info = info->m_next;
+    }

 }
 
 }
 

-void wxClassInfo::CleanUpClasses(void)
+void wxClassInfo::CleanUpClasses()

 {
     delete wxClassInfo::sm_classTable;
     wxClassInfo::sm_classTable = NULL;
 }
 
 {
     delete wxClassInfo::sm_classTable;
     wxClassInfo::sm_classTable = NULL;
 }
 

-wxObject *wxCreateDynamicObject(const char *name)
+wxObject *wxCreateDynamicObject(const wxChar *name)

 {
     if (wxClassInfo::sm_classTable)
     {
 {
     if (wxClassInfo::sm_classTable)
     {


@@ -253,71 +286,69 @@ wxObject *wxCreateDynamicObject(const char *name)
         wxClassInfo *info = wxClassInfo::sm_first;
         while (info)
         {
         wxClassInfo *info = wxClassInfo::sm_first;
         while (info)
         {

-            if (info->m_className && strcmp(info->m_className, name) == 0)
+            if (info->m_className && wxStrcmp(info->m_className, name) == 0)

                 return info->CreateObject();
             info = info->m_next;
         }
         return (wxObject*) NULL;
     }
                 return info->CreateObject();
             info = info->m_next;
         }
         return (wxObject*) NULL;
     }

-    return (wxObject*) NULL;

 }
 
 #if wxUSE_SERIAL
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"
 }
 
 #if wxUSE_SERIAL
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"

-#include "wx/msgdlg.h"

 
 wxObject* wxCreateStoredObject( wxInputStream &stream )
 {
 
 wxObject* wxCreateStoredObject( wxInputStream &stream )
 {

-  wxObjectInputStream obj_s(stream);
-  return obj_s.LoadObject();
+    wxObjectInputStream obj_s(stream);
+    return obj_s.LoadObject();

 };
 
 void wxObject::StoreObject( wxObjectOutputStream& stream )
 {
 };
 
 void wxObject::StoreObject( wxObjectOutputStream& stream )
 {

-  wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
-  wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
-
-  if (!lib) {
-    wxLogError(_("Can't load wxSerial dynamic library."));
-    return;
-  }
-  if (!m_serialObj) {
-    m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
+    wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
+    wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");

 
 

+    if (!lib) {
+        wxLogError(_("Can't load wxSerial dynamic library."));
+        return;
+    }

     if (!m_serialObj) {
     if (!m_serialObj) {

-      wxLogError(_("Can't find the serialization object '%s' "
-                   "for the object '%s'."),
-                 obj_name.c_str(),
-                 GetClassInfo()->GetClassName());
-      return;
+        m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
+
+        if (!m_serialObj) {
+            wxLogError(_("Can't find the serialization object '%s' "
+                        "for the object '%s'."),
+                    obj_name.c_str(),
+                    GetClassInfo()->GetClassName());
+            return;
+        }
+        m_serialObj->SetObject(this);

     }
     }

-    m_serialObj->SetObject(this);
-  }

 
 

-  m_serialObj->StoreObject(stream);
+    m_serialObj->StoreObject(stream);

 }
 
 void wxObject::LoadObject( wxObjectInputStream& stream )
 {
 }
 
 void wxObject::LoadObject( wxObjectInputStream& stream )
 {

-  wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
-  wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
-
-  if (!m_serialObj) {
-    m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
+    wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
+    wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");

 
     if (!m_serialObj) {
 
     if (!m_serialObj) {

-      wxLogError(_("Can't find the serialization object '%s' "
-                   "for the object '%s'."),
-                 obj_name.c_str(),
-                 GetClassInfo()->GetClassName());
-      return;
+        m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
+
+        if (!m_serialObj) {
+            wxLogError(_("Can't find the serialization object '%s' "
+                        "for the object '%s'."),
+                    obj_name.c_str(),
+                    GetClassInfo()->GetClassName());
+            return;
+        }
+        m_serialObj->SetObject(this);

     }
     }

-    m_serialObj->SetObject(this);
-  }

 
 

-  m_serialObj->LoadObject(stream);
+    m_serialObj->LoadObject(stream);

 }
 
 #endif // wxUSE_SERIAL
 }
 
 #endif // wxUSE_SERIAL


@@ -337,15 +368,17 @@ void wxObject::Ref(const wxObject& clone)
     }
 }
 
     }
 }
 

-void wxObject::UnRef(void)
+void wxObject::UnRef()

 {
 {

-    if (m_refData) {
-        assert(m_refData->m_count > 0);
-        --(m_refData->m_count);
-        if (m_refData->m_count == 0)
+    if ( m_refData )
+    {
+        wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") );
+
+        if ( !--m_refData->m_count )

             delete m_refData;
             delete m_refData;

+
+        m_refData = (wxObjectRefData *) NULL;

     }
     }

-    m_refData = (wxObjectRefData *) NULL;

 }
 
 /*
 }
 
 /*


@@ -356,7 +389,7 @@ wxObjectRefData::wxObjectRefData(void) : m_count(1)
 {
 }
 
 {
 }
 

-wxObjectRefData::~wxObjectRefData(void)
+wxObjectRefData::~wxObjectRefData()

 {
 }
 
 {
 }