X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c74e7fe1de14f32dcd6f3c9cdd727de540bbd0e..937afade13326376cf1d3071057d069041172daa:/src/common/object.cpp?ds=sidebyside

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 44d3f3f3a6..731dd2fdeb 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -42,13 +42,30 @@
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
     // for wxObject::Dump
     #include "wx/ioswrap.h"
+    #if defined(__VISAGECPP__)
+    // help with VA debugging
+        #define DEBUG_PRINTF(NAME)   { static int raz=0; \
+          printf( #NAME " %i\n",raz); fflush(stdout);       \
+           raz++;                                        \
+         }
+    #else
+        #define DEBUG_PRINTF(NAME)
+    #endif
 #endif
 
-#if !USE_SHARED_LIBRARY
 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;
-#endif
+
+#if defined(__WXDEBUG__) && defined(__VISAGECPP__)
+  int wxObject::N = 0;  // total number of objects
+  int wxObject::Nid = 0;// object serial counter
+#endif // __WXDEBUG__
+
+// These are here so we can avoid 'always true/false' warnings
+// by referring to these instead of TRUE/FALSE
+const bool wxTrue = TRUE;
+const bool wxFalse = FALSE;
 
 /*
  * wxWindows root object.
@@ -60,6 +77,12 @@ wxObject::wxObject()
 #if wxUSE_SERIAL
     m_serialObj = (wxObject_Serialize *)NULL;
 #endif
+#if defined(__WXDEBUG__) && defined(__VISAGECPP__)
+    id = Nid++;
+    N++;
+//  {  printf("wxObject %i/%i \t",id,N);
+//  }
+#endif
 }
 
 wxObject::~wxObject()
@@ -69,6 +92,11 @@ wxObject::~wxObject()
     if (m_serialObj)
         delete m_serialObj;
 #endif
+#if defined(__WXDEBUG__) && defined(__VISAGECPP__)
+     N--;
+//  {  printf("~wxObject %i/%i \t",id,N);
+//  }
+#endif  //__WXDEBUG__
 }
 
 /*
@@ -124,14 +152,23 @@ void *wxObject::operator new (size_t size, wxChar * fileName, int lineNum)
     return wxDebugAlloc(size, fileName, lineNum, TRUE);
 }
 
+#if defined(__VISAGECPP__)
+#  if __DEBUG_ALLOC__
+void wxObject::operator delete (void * buf,const char * _fname, size_t _line)
+{
+    wxDebugFree(buf);
+}
+#  endif  //__DEBUG_ALLOC__
+#else
 void wxObject::operator delete (void * buf)
 {
     wxDebugFree(buf);
 }
+#endif // __VISAGECPP__
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+void wxObject::operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
 {
     ::operator delete(pData);
 }
@@ -199,16 +236,6 @@ 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 WXMAKINGDLL
-if (GetClassName() && info->GetClassName() && (wxStrcmp(GetClassName(), info->GetClassName()) == 0))
-return TRUE;
-#else
-     */
     if (this == info)
         return TRUE;
 
@@ -225,6 +252,17 @@ return TRUE;
 // Set pointers to base class(es) to speed up IsKindOf
 void wxClassInfo::InitializeClasses()
 {
+    // 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
@@ -232,7 +270,13 @@ void wxClassInfo::InitializeClasses()
     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;
     }
 
@@ -256,6 +300,10 @@ void wxClassInfo::CleanUpClasses()
 
 wxObject *wxCreateDynamicObject(const wxChar *name)
 {
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+ DEBUG_PRINTF(wxObject *wxCreateDynamicObject)
+#endif
+     
     if (wxClassInfo::sm_classTable)
     {
         wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name);
@@ -275,14 +323,12 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
         }
         return (wxObject*) NULL;
     }
-    return (wxObject*) NULL;
 }
 
 #if wxUSE_SERIAL
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"
-#include "wx/msgdlg.h"
 
 wxObject* wxCreateStoredObject( wxInputStream &stream )
 {
@@ -292,6 +338,10 @@ wxObject* wxCreateStoredObject( wxInputStream &stream )
 
 void wxObject::StoreObject( wxObjectOutputStream& stream )
 {
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+ DEBUG_PRINTF(wxObject::StoreObject)
+#endif
+     
     wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
     wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
 
@@ -317,6 +367,10 @@ void wxObject::StoreObject( wxObjectOutputStream& stream )
 
 void wxObject::LoadObject( wxObjectInputStream& stream )
 {
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+ DEBUG_PRINTF(wxObject::LoadObject)
+#endif
+     
     wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
     wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
 
@@ -344,7 +398,10 @@ void wxObject::LoadObject( wxObjectInputStream& stream )
 
 void wxObject::Ref(const wxObject& clone)
 {
-    // delete reference to old data
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+ DEBUG_PRINTF(wxObject::Ref)
+#endif
+     // delete reference to old data
     UnRef();
     // reference new data
     if (clone.m_refData) {
@@ -355,13 +412,14 @@ void wxObject::Ref(const wxObject& clone)
 
 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;
+        m_refData = (wxObjectRefData *) NULL;
     }
-    m_refData = (wxObjectRefData *) NULL;
 }
 
 /*
@@ -375,8 +433,3 @@ wxObjectRefData::wxObjectRefData(void) : m_count(1)
 wxObjectRefData::~wxObjectRefData()
 {
 }
-
-// These are here so we can avoid 'always true/false' warnings
-// by referring to these instead of TRUE/FALSE
-const bool wxTrue = TRUE;
-const bool wxFalse = FALSE;