X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1678ad780265f08fc8b84d180c04ae3a9900b1bb..d54598dd855e64cf2086b73cb3b8e3b99c513bbc:/src/common/object.cpp?ds=sidebyside diff --git a/src/common/object.cpp b/src/common/object.cpp index 272e88a21f..0672600cf9 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -21,39 +21,54 @@ #endif #ifndef WX_PRECOMP -#include "wx/hash.h" -#include "wx/objstrm.h" -#endif + #include "wx/hash.h" + #if wxUSE_SERIAL + #include "wx/objstrm.h" + #include "wx/serbase.h" + + // for error messages + #include "wx/log.h" + #include "wx/intl.h" + #endif // wxUSE_SERIAL +#endif // WX_PRECOMP #include #include -#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT #include "wx/memory.h" #endif -#if WXDEBUG || USE_DEBUG_CONTEXT - // for wxObject::Dump - #include +#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT + // for wxObject::Dump + #include "wx/ioswrap.h" #endif #if !USE_SHARED_LIBRARY -wxClassInfo wxObject::classwxObject("wxObject", NULL, NULL, sizeof(wxObject), NULL); -wxClassInfo *wxClassInfo::first = 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. */ -wxObject::wxObject(void) +wxObject::wxObject() { - m_refData = NULL; + m_refData = (wxObjectRefData *) NULL; +#if wxUSE_SERIAL + m_serialObj = (wxObject_Serialize *)NULL; +#endif } -wxObject::~wxObject(void) +wxObject::~wxObject() { - UnRef(); + UnRef(); +#if wxUSE_SERIAL + if (m_serialObj) + delete m_serialObj; +#endif } /* @@ -62,52 +77,76 @@ wxObject::~wxObject(void) * Go from this class to superclass, taking into account * two possible base classes. */ - -bool wxObject::IsKindOf(wxClassInfo *info) + +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; +} + +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 WXDEBUG || USE_DEBUG_CONTEXT +#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT) 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 -#if WXDEBUG && USE_MEMORY_TRACING +#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING #ifdef new #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) { - wxDebugFree(buf); + wxDebugFree(buf); +} + +// VC++ 6.0 +#if defined(__VISUALC__) && (__VISUALC__ >= 1200) +void wxObject::operator 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) +#if !defined(__VISUALC__) && wxUSE_ARRAY_MEMORY_OPERATORS +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) { - wxDebugFree(buf, TRUE); + wxDebugFree(buf, TRUE); } #endif @@ -117,117 +156,187 @@ void wxObject::operator delete[] (void * buf) * 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) { - className = cName; - baseClassName1 = baseName1; - baseClassName2 = baseName2; - - objectSize = sz; - objectConstructor = constr; - - next = first; - first = this; - - baseInfo1 = NULL; - baseInfo2 = 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 (objectConstructor) - return (wxObject *)(*objectConstructor)(); - else - return NULL; + if (m_objectConstructor) + return (wxObject *)(*m_objectConstructor)(); + else + return (wxObject *) NULL; } -wxClassInfo *wxClassInfo::FindClass(char *c) +wxClassInfo *wxClassInfo::FindClass(wxChar *c) { - wxClassInfo *p = first; - while (p) - { - if (p && p->GetClassName() && strcmp(p->GetClassName(), c) == 0) - return p; - p = p->next; - } - return 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) +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. + 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; +if (GetClassName() && info->GetClassName() && (strcmp(GetClassName(), info->GetClassName()) == 0)) +return TRUE; #else - if (this == info) - return TRUE; -#endif + */ + if (this == info) + return TRUE; - if (baseInfo1) - if (baseInfo1->IsKindOf(info)) - return TRUE; + if (m_baseInfo1) + if (m_baseInfo1->IsKindOf(info)) + return TRUE; - if (baseInfo2) - return 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 -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; + } +} + +void wxClassInfo::CleanUpClasses() { - wxHashTable table(wxKEY_STRING); - - // Index all class infos by their class name - wxClassInfo *info = first; - while (info) - { - if (info->className) - table.Put(info->className, (wxObject *)info); - info = info->next; - } - - // Set base pointers for each wxClassInfo - info = first; - while (info) - { - if (info->GetBaseClassName1()) - info->baseInfo1 = (wxClassInfo *)table.Get(info->GetBaseClassName1()); - if (info->GetBaseClassName2()) - info->baseInfo2 = (wxClassInfo *)table.Get(info->GetBaseClassName2()); - info = info->next; - } + delete wxClassInfo::sm_classTable; + wxClassInfo::sm_classTable = NULL; } -wxObject *wxCreateDynamicObject(char *name) +wxObject *wxCreateDynamicObject(const wxChar *name) { - wxClassInfo *info = wxClassInfo::first; - while (info) - { - if (info->className && strcmp(info->className, name) == 0) - return info->CreateObject(); - info = info->next; - } - return NULL; + if (wxClassInfo::sm_classTable) + { + wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name); + if (!info) + return (wxObject *)NULL; + + return info->CreateObject(); + } + else + { + wxClassInfo *info = wxClassInfo::sm_first; + while (info) + { + if (info->m_className && wxStrcmp(info->m_className, name) == 0) + return info->CreateObject(); + info = info->m_next; + } + return (wxObject*) NULL; + } + return (wxObject*) NULL; } -#ifdef USE_STORABLE_CLASSES +#if wxUSE_SERIAL + +#include "wx/serbase.h" +#include "wx/dynlib.h" +#include "wx/msgdlg.h" wxObject* wxCreateStoredObject( wxInputStream &stream ) { - wxObjectInputStream obj_s(stream); - return obj_s.LoadObject(); + wxObjectInputStream obj_s(stream); + return obj_s.LoadObject(); }; -#endif +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 ); + + 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->StoreObject(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 ); + + 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->LoadObject(stream); +} + +#endif // wxUSE_SERIAL /* * wxObject: cloning of objects @@ -244,7 +353,7 @@ void wxObject::Ref(const wxObject& clone) } } -void wxObject::UnRef(void) +void wxObject::UnRef() { if (m_refData) { assert(m_refData->m_count > 0); @@ -252,7 +361,7 @@ void wxObject::UnRef(void) if (m_refData->m_count == 0) delete m_refData; } - m_refData = NULL; + m_refData = (wxObjectRefData *) NULL; } /* @@ -263,7 +372,11 @@ wxObjectRefData::wxObjectRefData(void) : m_count(1) { } -wxObjectRefData::~wxObjectRefData(void) +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;