X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..a1218415705b9fcb40dedbc38c55632c0c3cb6df:/src/common/object.cpp diff --git a/src/common/object.cpp b/src/common/object.cpp index 4dc8b093b3..0eda4f7880 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -20,23 +20,41 @@ #pragma hdrstop #endif -#include "wx/hash.h" +#ifndef WX_PRECOMP + #include "wx/hash.h" + #ifdef 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 (DEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT #include "wx/memory.h" #endif -#if DEBUG || USE_DEBUG_CONTEXT +#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT // for wxObject::Dump - #include +#if wxUSE_IOSTREAMH +# include +#else +# include +# ifdef _MSC_VER + using namespace std; +# endif +#endif #endif #if !USE_SHARED_LIBRARY -wxClassInfo wxObject::classwxObject("wxObject", NULL, NULL, sizeof(wxObject), NULL); -wxClassInfo *wxClassInfo::first = NULL; +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 /* @@ -45,12 +63,19 @@ wxClassInfo *wxClassInfo::first = NULL; wxObject::wxObject(void) { - m_refData = NULL; + m_refData = (wxObjectRefData *) NULL; +#ifdef wxUSE_SERIAL + m_serialObj = (wxObject_Serialize *)NULL; +#endif } wxObject::~wxObject(void) { UnRef(); +#ifdef wxUSE_SERIAL + if (m_serialObj) + delete m_serialObj; +#endif } /* @@ -60,7 +85,7 @@ wxObject::~wxObject(void) * two possible base classes. */ -bool wxObject::IsKindOf(wxClassInfo *info) +bool wxObject::IsKindOf(wxClassInfo *info) const { wxClassInfo *thisInfo = GetClassInfo(); if (thisInfo) @@ -69,7 +94,7 @@ bool wxObject::IsKindOf(wxClassInfo *info) return FALSE; } -#if DEBUG || USE_DEBUG_CONTEXT +#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT void wxObject::Dump(ostream& str) { if (GetClassInfo() && GetClassInfo()->GetClassName()) @@ -79,7 +104,7 @@ void wxObject::Dump(ostream& str) } #endif -#if DEBUG && USE_MEMORY_TRACING +#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING #ifdef new #undef new @@ -95,8 +120,16 @@ void wxObject::operator delete (void * buf) wxDebugFree(buf); } +// VC++ 6.0 +#if _MSC_VER >= 1200 +void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */) +{ + ::operator delete(pData); +} +#endif + // Cause problems for VC++ - crashes -#ifndef _MSC_VER +#if !defined(_MSC_VER) && wxUSE_ARRAY_MEMORY_OPERATORS void * wxObject::operator new[] (size_t size, char * fileName, int lineNum) { return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE); @@ -114,77 +147,45 @@ void wxObject::operator delete[] (void * buf) * Class info: provides run-time class type information. */ -#ifdef USE_STORABLE_CLASSES - -wxClassInfo::wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn, - wxStorableConstructorFn stoFn ) -{ - className = cName; - baseClassName1 = baseName1; - baseClassName2 = baseName2; - - objectSize = sz; - objectConstructor = fn; - storableConstructor = stoFn; - - next = first; - first = this; - - baseInfo1 = NULL; - baseInfo2 = NULL; -} - -wxObject* wxClassInfo::CreateObject( istream &stream, char *data ) -{ - if (storableConstructor) - return (wxObject *)(*storableConstructor)( stream, data ); - else - return NULL; -} - -#else - 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 = NULL; - baseInfo2 = NULL; + m_baseInfo1 = (wxClassInfo *) NULL; + m_baseInfo2 = (wxClassInfo *) NULL; } -#endif - wxObject *wxClassInfo::CreateObject(void) { - if (objectConstructor) - return (wxObject *)(*objectConstructor)(); + if (m_objectConstructor) + return (wxObject *)(*m_objectConstructor)(); else - return NULL; + 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; - p = p->next; + p = p->m_next; } - return NULL; + 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; @@ -192,20 +193,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. + // 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; -#endif - if (baseInfo1) - if (baseInfo1->IsKindOf(info)) + 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; } @@ -213,55 +216,117 @@ bool wxClassInfo::IsKindOf(wxClassInfo *info) // Set pointers to base class(es) to speed up IsKindOf void wxClassInfo::InitializeClasses(void) { - wxHashTable table(wxKEY_STRING); + wxClassInfo::sm_classTable = new wxHashTable(wxKEY_STRING); // Index all class infos by their class name - wxClassInfo *info = first; + wxClassInfo *info = sm_first; while (info) { - if (info->className) - table.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 - info = first; + info = sm_first; while (info) { if (info->GetBaseClassName1()) - info->baseInfo1 = (wxClassInfo *)table.Get(info->GetBaseClassName1()); + info->m_baseInfo1 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName1()); if (info->GetBaseClassName2()) - info->baseInfo2 = (wxClassInfo *)table.Get(info->GetBaseClassName2()); - info = info->next; + info->m_baseInfo2 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName2()); + info = info->m_next; } } -wxObject *wxCreateDynamicObject(char *name) +void wxClassInfo::CleanUpClasses(void) { - wxClassInfo *info = wxClassInfo::first; - while (info) - { - if (info->className && strcmp(info->className, name) == 0) - return info->CreateObject(); - info = info->next; - } - return NULL; + delete wxClassInfo::sm_classTable; + wxClassInfo::sm_classTable = 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(); + } + 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_STORABLE_CLASSES +#ifdef wxUSE_SERIAL -wxObject* wxCreateStoredObject( char *name, istream &stream, char *data ) +#include "wx/serbase.h" +#include "wx/dynlib.h" +#include "wx/msgdlg.h" + +wxObject* wxCreateStoredObject( wxInputStream &stream ) { - wxClassInfo *info = wxClassInfo::first; - while (info) - { - if (info->className && strcmp(info->className, name) == 0) - return info->CreateObject( stream, data ); - info = info->next; - } - return NULL; + wxObjectInputStream obj_s(stream); + return obj_s.LoadObject(); }; +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 /* @@ -287,7 +352,7 @@ void wxObject::UnRef(void) if (m_refData->m_count == 0) delete m_refData; } - m_refData = NULL; + m_refData = (wxObjectRefData *) NULL; } /* @@ -302,3 +367,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;