Improved selection mode handling in wxGrid::SelectBlock

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index d70fdbd253b892e765869bfb8af542d410f5bc3e..ab59919f01fe8e3d3cd44e9eaedce9eda43afeeb 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -44,11 +44,9 @@
     #include "wx/ioswrap.h"
 #endif
 
     #include "wx/ioswrap.h"
 #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;
 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

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


@@ -225,6 +223,17 @@ return TRUE;
 // Set pointers to base class(es) to speed up IsKindOf
 void wxClassInfo::InitializeClasses()
 {
 // 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
     wxClassInfo::sm_classTable = new wxHashTable(wxKEY_STRING);
 
     // Index all class infos by their class name


@@ -232,7 +241,15 @@ void wxClassInfo::InitializeClasses()
     while (info)
     {
         if (info->m_className)
     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);
             sm_classTable->Put(info->m_className, (wxObject *)info);

+        }
+

         info = info->m_next;
     }
 
         info = info->m_next;
     }
 


@@ -281,7 +298,6 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"

-#include "wx/msgdlg.h"

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


@@ -360,7 +376,6 @@ void wxObject::UnRef()
 
         if ( !--m_refData->m_count )
             delete m_refData;
 
         if ( !--m_refData->m_count )
             delete m_refData;

-

         m_refData = (wxObjectRefData *) NULL;
     }
 }
         m_refData = (wxObjectRefData *) NULL;
     }
 }