removed some rests of my tests (which should have never been checked in in the

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 2c8864b956d9fbb7df37e0b47664a3e44302afde..d26826ebe253cafe90d60334d53445afacf1b774 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -22,7 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/hash.h"
 
 #ifndef WX_PRECOMP
 #include "wx/hash.h"

-#ifdef USE_STORABLE_CLASSES
+#ifdef wxUSE_SERIAL

 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif
 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif


@@ -31,19 +31,19 @@
 #include <string.h>
 #include <assert.h>
 
 #include <string.h>
 #include <assert.h>
 

-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

 #include "wx/memory.h"
 #endif
 
 #include "wx/memory.h"
 #endif
 

-#if WXDEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || wxUSE_DEBUG_CONTEXT

   // for wxObject::Dump
   #include <iostream.h>
 #endif
 
 #if !USE_SHARED_LIBRARY
   // for wxObject::Dump
   #include <iostream.h>
 #endif
 
 #if !USE_SHARED_LIBRARY

-wxClassInfo wxObject::classwxObject((char *) "wxObject", (char *) NULL, (char *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
-wxClassInfo *wxClassInfo::first = (wxClassInfo *) NULL;
-wxHashTable wxClassInfo::classTable(wxKEY_STRING);
+wxClassInfo wxObject::sm_classwxObject((char *) "wxObject", (char *) NULL, (char *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
+wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL;
+wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;

 #endif
 
 /*
 #endif
 
 /*


@@ -53,7 +53,7 @@ wxHashTable wxClassInfo::classTable(wxKEY_STRING);
 wxObject::wxObject(void)
 {
   m_refData = (wxObjectRefData *) NULL;
 wxObject::wxObject(void)
 {
   m_refData = (wxObjectRefData *) NULL;

-#ifdef USE_STORABLE_CLASSES
+#ifdef wxUSE_SERIAL

   m_serialObj = (wxObject_Serialize *)NULL;
 #endif
 }
   m_serialObj = (wxObject_Serialize *)NULL;
 #endif
 }


@@ -61,7 +61,7 @@ wxObject::wxObject(void)
 wxObject::~wxObject(void)
 {
        UnRef();
 wxObject::~wxObject(void)
 {
        UnRef();

-#ifdef USE_STORABLE_CLASSES
+#ifdef wxUSE_SERIAL

        if (m_serialObj)
          delete m_serialObj;
 #endif
        if (m_serialObj)
          delete m_serialObj;
 #endif


@@ -74,7 +74,7 @@ wxObject::~wxObject(void)
  * two possible base classes.
  */
  
  * two possible base classes.
  */
  

-bool wxObject::IsKindOf(wxClassInfo *info)
+bool wxObject::IsKindOf(wxClassInfo *info) const

 {
   wxClassInfo *thisInfo = GetClassInfo();
   if (thisInfo)
 {
   wxClassInfo *thisInfo = GetClassInfo();
   if (thisInfo)


@@ -83,7 +83,7 @@ bool wxObject::IsKindOf(wxClassInfo *info)
     return FALSE;
 }
 
     return FALSE;
 }
 

-#if WXDEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || wxUSE_DEBUG_CONTEXT

 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())
 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())


@@ -93,7 +93,7 @@ void wxObject::Dump(ostream& str)
 }
 #endif
 
 }
 #endif
 

-#if WXDEBUG && USE_MEMORY_TRACING
+#if WXDEBUG && wxUSE_MEMORY_TRACING

 
 #ifdef new
 #undef new
 
 #ifdef new
 #undef new


@@ -109,6 +109,14 @@ void wxObject::operator delete (void * buf)
   wxDebugFree(buf);
 }
 
   wxDebugFree(buf);
 }
 

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

 // Cause problems for VC++ - crashes
 #ifndef _MSC_VER
 void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)
 // Cause problems for VC++ - crashes
 #ifndef _MSC_VER
 void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)


@@ -130,43 +138,43 @@ void wxObject::operator delete[] (void * buf)
 
 wxClassInfo::wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn constr)
 {
 
 wxClassInfo::wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn constr)
 {

-  className = cName;
-  baseClassName1 = baseName1;
-  baseClassName2 = baseName2;
+  m_className = cName;
+  m_baseClassName1 = baseName1;
+  m_baseClassName2 = baseName2;

 
 

-  objectSize = sz;
-  objectConstructor = constr;
+  m_objectSize = sz;
+  m_objectConstructor = constr;

   
   

-  next = first;
-  first = this;
+  m_next = sm_first;
+  sm_first = this;

 
 

-  baseInfo1 = (wxClassInfo *) NULL;
-  baseInfo2 = (wxClassInfo *) NULL;
+  m_baseInfo1 = (wxClassInfo *) NULL;
+  m_baseInfo2 = (wxClassInfo *) NULL;

 }
 
 wxObject *wxClassInfo::CreateObject(void)
 {
 }
 
 wxObject *wxClassInfo::CreateObject(void)
 {

-  if (objectConstructor)
-    return (wxObject *)(*objectConstructor)();
+  if (m_objectConstructor)
+    return (wxObject *)(*m_objectConstructor)();

   else
     return (wxObject *) NULL;
 }
 
 wxClassInfo *wxClassInfo::FindClass(char *c)
 {
   else
     return (wxObject *) NULL;
 }
 
 wxClassInfo *wxClassInfo::FindClass(char *c)
 {

-  wxClassInfo *p = first;
+  wxClassInfo *p = sm_first;

   while (p)
   {
     if (p && p->GetClassName() && strcmp(p->GetClassName(), c) == 0)
       return p;
   while (p)
   {
     if (p && p->GetClassName() && strcmp(p->GetClassName(), c) == 0)
       return p;

-    p = p->next;
+    p = p->m_next;

   }
   return (wxClassInfo *) NULL;
 }
 
 // Climb upwards through inheritance hierarchy.
 // Dual inheritance is catered for.
   }
   return (wxClassInfo *) NULL;
 }
 
 // Climb upwards through inheritance hierarchy.
 // Dual inheritance is catered for.

-bool wxClassInfo::IsKindOf(wxClassInfo *info)
+bool wxClassInfo::IsKindOf(wxClassInfo *info) const

 {
   if (info == NULL)
     return FALSE;
 {
   if (info == NULL)
     return FALSE;


@@ -174,20 +182,22 @@ bool wxClassInfo::IsKindOf(wxClassInfo *info)
   // 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.
   // 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 WXMAKINGDLL
   if (GetClassName() && info->GetClassName() && (strcmp(GetClassName(), info->GetClassName()) == 0))
     return TRUE;
 #else

+*/

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

-#endif

 
 

-  if (baseInfo1)
-    if (baseInfo1->IsKindOf(info))
+  if (m_baseInfo1)
+    if (m_baseInfo1->IsKindOf(info))

       return TRUE;
 
       return TRUE;
 

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

 
   return FALSE;
 }
 
   return FALSE;
 }


@@ -195,40 +205,60 @@ bool wxClassInfo::IsKindOf(wxClassInfo *info)
 // Set pointers to base class(es) to speed up IsKindOf
 void wxClassInfo::InitializeClasses(void)
 {
 // Set pointers to base class(es) to speed up IsKindOf
 void wxClassInfo::InitializeClasses(void)
 {

+  wxClassInfo::sm_classTable = new wxHashTable(wxKEY_STRING);
+

   // Index all class infos by their class name
   // Index all class infos by their class name

-  wxClassInfo *info = first;
+  wxClassInfo *info = sm_first;

   while (info)
   {
   while (info)
   {

-    if (info->className)
-      classTable.Put(info->className, (wxObject *)info);
-    info = info->next;
+    if (info->m_className)
+      sm_classTable->Put(info->m_className, (wxObject *)info);
+    info = info->m_next;

   }
 
   // Set base pointers for each wxClassInfo
   }
 
   // Set base pointers for each wxClassInfo

-  info = first;
+  info = sm_first;

   while (info)
   {
     if (info->GetBaseClassName1())
   while (info)
   {
     if (info->GetBaseClassName1())

-      info->baseInfo1 = (wxClassInfo *)classTable.Get(info->GetBaseClassName1());
+      info->m_baseInfo1 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName1());

     if (info->GetBaseClassName2())
     if (info->GetBaseClassName2())

-      info->baseInfo2 = (wxClassInfo *)classTable.Get(info->GetBaseClassName2());
-    info = info->next;
+      info->m_baseInfo2 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName2());
+    info = info->m_next;

   }
   }

-  first = NULL;

 }
 
 }
 

-wxObject *wxCreateDynamicObject(char *name)
+void wxClassInfo::CleanUpClasses(void)

 {
 {

-  wxClassInfo *info;
+    delete wxClassInfo::sm_classTable;
+    wxClassInfo::sm_classTable = NULL;
+}

 
 

-  info = (wxClassInfo *)wxClassInfo::classTable.Get(name);
-  if (!info)
-    return (wxObject *)NULL;
+wxObject *wxCreateDynamicObject(const char *name)
+{
+    if (wxClassInfo::sm_classTable)
+    {
+        wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name);
+        if (!info)
+            return (wxObject *)NULL;

 
 

-  return info->CreateObject();
+        return info->CreateObject();
+    }
+    else
+    {
+        wxClassInfo *info = wxClassInfo::sm_first;
+        while (info)
+        {
+            if (info->m_className && strcmp(info->m_className, name) == 0)
+                return info->CreateObject();
+            info = info->m_next;
+        }
+        return (wxObject*) NULL;
+    }
+    return (wxObject*) NULL;

 }
 
 }
 

-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL

 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"


@@ -330,3 +360,7 @@ wxObjectRefData::~wxObjectRefData(void)
 {
 }
 
 {
 }
 

+// 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;