Added Set/GetThemeEnabled and used this for determining whether to paint a theme

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 0672600cf98e741c88fbafce2b1c3db102d43222..b81454d2abda76a1ef2aabfe7ca0d735551ad6cc 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -44,11 +44,14 @@
     #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
+
+// 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.
 
 /*
  * wxWindows root object.


@@ -131,14 +134,14 @@ void wxObject::operator delete (void * buf)
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 
 // 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);
 }
 #endif
 
 // Cause problems for VC++ - crashes
 {
     ::operator delete(pData);
 }
 #endif
 
 // Cause problems for VC++ - crashes

-#if !defined(__VISUALC__) && wxUSE_ARRAY_MEMORY_OPERATORS
+#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);
 void * wxObject::operator new[] (size_t size, wxChar * fileName, int lineNum)
 {
     return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);


@@ -199,16 +202,6 @@ bool wxClassInfo::IsKindOf(wxClassInfo *info) const
     if (info == NULL)
         return FALSE;
 
     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() && (strcmp(GetClassName(), info->GetClassName()) == 0))
-return TRUE;
-#else
-     */

     if (this == info)
         return TRUE;
 
     if (this == info)
         return TRUE;
 


@@ -225,6 +218,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 +236,13 @@ 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;
     }
 


@@ -275,14 +285,12 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
         }
         return (wxObject*) NULL;
     }
         }
         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 )
 {


@@ -355,13 +363,14 @@ void wxObject::Ref(const wxObject& clone)
 
 void wxObject::UnRef()
 {
 
 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;

 }
 
 /*
 }
 
 /*


@@ -375,8 +384,3 @@ wxObjectRefData::wxObjectRefData(void) : m_count(1)
 wxObjectRefData::~wxObjectRefData()
 {
 }
 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;