X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21b529859e6dd9a94305768a81b0478142638092..3d3a4a25addf9729c74a8d0f7a056b57bb7f7e2a:/src/common/object.cpp diff --git a/src/common/object.cpp b/src/common/object.cpp index 776878d214..4c8647abd1 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -1,21 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: object.cpp +// Name: src/common/object.cpp // Purpose: wxObject implementation // Author: Julian Smart // Modified by: Ron Lee // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) 1998 Julian Smart and Markus Holzem +// Copyright: (c) 1998 Julian Smart // (c) 2001 Ron Lee -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "object.h" #endif - // For compilers that support precompilation, includes "wx.h". - +// For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -23,11 +22,11 @@ #endif #ifndef WX_PRECOMP -#include "wx/hash.h" + #include "wx/hash.h" + #include "wx/object.h" #endif #include -#include #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT #include "wx/memory.h" @@ -35,35 +34,61 @@ #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT // for wxObject::Dump -#include "wx/ioswrap.h" - -#if defined(__VISAGECPP__) -#define DEBUG_PRINTF(NAME) { static int raz=0; \ - printf( #NAME " %i\n",raz); fflush(stdout); raz++; } -#else -#define DEBUG_PRINTF(NAME) + #include "wx/ioswrap.h" + + #if defined(__VISAGECPP__) + #define DEBUG_PRINTF(NAME) { static int raz=0; \ + printf( #NAME " %i\n",raz); fflush(stdout); raz++; } + #else + #define DEBUG_PRINTF(NAME) + #endif +#endif // __WXDEBUG__ || wxUSE_DEBUG_CONTEXT + +// we must disable optimizations for VC.NET because otherwise its too eager +// linker discards wxClassInfo objects in release build thus breaking many, +// many things +#if defined __VISUALC__ && __VISUALC__ >= 1300 + #pragma optimize("", off) #endif -#endif - - +#if wxUSE_EXTENDED_RTTI +const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ; + wxObject* wxVariantToObjectConverterwxObject ( const wxxVariant &data ) +{ return data.Get() ; } + wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data ) + { return wxxVariant( dynamic_cast (data) ) ; } + wxClassInfo wxObject::sm_classwxObject(sm_classParentswxObject , wxT("") , wxT("wxObject"), + (int) sizeof(wxObject), \ + (wxObjectConstructorFn) 0 , + (wxPropertyInfo*) NULL,0 , 0 , + 0 , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject); + template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;} + template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;} + template<> const wxTypeInfo* wxGetTypeInfo( wxObject ** ) + { static wxClassTypeInfo s_typeInfo(&wxObject::sm_classwxObject) ; return &s_typeInfo ; } +#else wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0, (int) sizeof(wxObject), (wxObjectConstructorFn) 0 ); -wxClassInfo* wxClassInfo::sm_first = 0; -wxHashTable* wxClassInfo::sm_classTable = 0; +#endif + +// restore optimizations +#if defined __VISUALC__ && __VISUALC__ >= 1300 + #pragma optimize("", on) +#endif - // These are here so we can avoid 'always true/false' warnings - // by referring to these instead of TRUE/FALSE +wxClassInfo* wxClassInfo::sm_first = NULL; +wxHashTable* wxClassInfo::sm_classTable = NULL; +// 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; - // Is this object a kind of (a subclass of) 'info'? - // E.g. is wxWindow a kind of wxObject? - // Go from this class to superclass, taking into account - // two possible base classes. - +// Is this object a kind of (a subclass of) 'info'? +// E.g. is wxWindow a kind of wxObject? +// Go from this class to superclass, taking into account +// two possible base classes. bool wxObject::IsKindOf(wxClassInfo *info) const { wxClassInfo *thisInfo = GetClassInfo(); @@ -76,63 +101,98 @@ void wxObject::Dump(wxSTD ostream& str) if (GetClassInfo() && GetClassInfo()->GetClassName()) str << GetClassInfo()->GetClassName(); else - str << "unknown object class"; + str << _T("unknown object class"); } #endif -#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING -#ifdef new -#undef new +#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING && defined( new ) + #undef new #endif -void *wxObject::operator new (size_t size, wxChar *fileName, int lineNum) + +#ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT +void *wxObject::operator new ( size_t size, const wxChar *fileName, int lineNum ) { - return wxDebugAlloc(size, fileName, lineNum, TRUE); + return wxDebugAlloc(size, (wxChar*) fileName, lineNum, TRUE); } +#endif -#ifndef __VISAGECPP__ -void wxObject::operator delete (void *buf) +#ifdef _WX_WANT_DELETE_VOID +void wxObject::operator delete ( void *buf ) { wxDebugFree(buf); } -#elif __DEBUG_ALLOC__ -void wxObject::operator delete (void *buf, const char *_fname, size_t _line) +#endif + +#ifdef _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET +void wxObject::operator delete ( void *buf, const char *_fname, size_t _line ) { wxDebugFree(buf); } #endif - // VC++ 6.0 - -#if defined(__VISUALC__) && (__VISUALC__ >= 1200) -void wxObject::operator delete(void *pData, wxChar *WXUNUSED(fileName), int WXUNUSED(lineNum)) +#ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT +void wxObject::operator delete ( void *buf, const wxChar *WXUNUSED(fileName), int WXUNUSED(lineNum) ) { - ::operator delete(pData); + wxDebugFree(buf); } #endif - // Cause problems for VC++ - crashes - -#if (!defined(__VISUALC__) && wxUSE_ARRAY_MEMORY_OPERATORS ) || defined(__MWERKS__) -void *wxObject::operator new[] (size_t size, wxChar *fileName, int lineNum) +#ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT +void *wxObject::operator new[] ( size_t size, const wxChar* fileName, int lineNum ) { - return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE); + return wxDebugAlloc(size, (wxChar*) fileName, lineNum, TRUE, TRUE); } +#endif -void wxObject::operator delete[] (void *buf) +#ifdef _WX_WANT_ARRAY_DELETE_VOID +void wxObject::operator delete[] ( void *buf ) { wxDebugFree(buf, TRUE); } #endif -#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING +#ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT +void wxObject::operator delete[] (void * buf, const wxChar* WXUNUSED(fileName), int WXUNUSED(lineNum) ) +{ + wxDebugFree(buf, TRUE); +} +#endif // ---------------------------------------------------------------------------- // wxClassInfo // ---------------------------------------------------------------------------- +wxClassInfo::~wxClassInfo() +{ + // remove this object from the linked list of all class infos: if we don't + // do it, loading/unloading a DLL containing static wxClassInfo objects is + // not going to work + if ( this == sm_first ) + { + sm_first = m_next; + } + else + { + wxClassInfo *info = sm_first; + while (info) + { + if ( info->m_next == this ) + { + info->m_next = m_next; + break; + } + + info = info->m_next; + } + } +#if wxUSE_EXTENDED_RTTI + Unregister( m_className ) ; +#endif +} + wxClassInfo *wxClassInfo::FindClass(const wxChar *className) { if ( sm_classTable ) @@ -160,13 +220,17 @@ inline wxClassInfo *wxClassInfo::GetBaseByName(const wxChar *name) wxClassInfo *classInfo = (wxClassInfo *)sm_classTable->Get(name); - // this must be fixed, other things risk work wrongly later if you get this - wxASSERT_MSG( classInfo, - wxString::Format - ( - _T("base class '%s' is unknown to wxWindows RTTI"), - name - ) ); +#ifdef __WXDEBUG__ + // this must be fixed, other things will work wrongly later if you get this + if ( !classInfo ) + { + wxFAIL_MSG( wxString::Format + ( + _T("base class '%s' is unknown to wxWindows RTTI"), + name + ) ); + } +#endif // __WXDEBUG__ return classInfo; } @@ -185,7 +249,7 @@ void wxClassInfo::InitializeClasses() size_t nClass = 0; #endif - wxClassInfo::sm_classTable = new wxHashTable(wxKEY_STRING); + sm_classTable = new wxHashTable(wxKEY_STRING); // Index all class infos by their class name @@ -200,6 +264,7 @@ void wxClassInfo::InitializeClasses() } } +#if wxUSE_EXTENDED_RTTI == 0 // Set base pointers for each wxClassInfo for(info = sm_first; info; info = info->m_next) @@ -207,40 +272,54 @@ void wxClassInfo::InitializeClasses() info->m_baseInfo1 = GetBaseByName(info->GetBaseClassName1()); info->m_baseInfo2 = GetBaseByName(info->GetBaseClassName2()); } +#endif } void wxClassInfo::CleanUpClasses() { delete wxClassInfo::sm_classTable; - wxClassInfo::sm_classTable = 0; + wxClassInfo::sm_classTable = NULL; } - wxObject *wxCreateDynamicObject(const wxChar *name) { #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT - DEBUG_PRINTF(wxObject *wxCreateDynamicObject) + DEBUG_PRINTF(wxObject *wxCreateDynamicObject) #endif - if (wxClassInfo::sm_classTable) + if ( wxClassInfo::sm_classTable ) { wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name); - return info != 0 ? info->CreateObject() : 0; + return info ? info->CreateObject() : NULL; } - else + else // no sm_classTable yet { - for(wxClassInfo *info = wxClassInfo::sm_first; info; info = info->m_next) + for ( wxClassInfo *info = wxClassInfo::sm_first; + info; + info = info->m_next ) + { if (info->m_className && wxStrcmp(info->m_className, name) == 0) return info->CreateObject(); - return 0; + } + + return NULL; } } // ---------------------------------------------------------------------------- -// wxClassInfo +// wxObject // ---------------------------------------------------------------------------- +// Initialize ref data from another object (needed for copy constructor and +// assignment operator) +void wxObject::InitFrom(const wxObject& other) +{ + m_refData = other.m_refData; + if ( m_refData ) + m_refData->m_count++; +} + void wxObject::Ref(const wxObject& clone) { #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT @@ -316,17 +395,17 @@ wxObject::CloneRefData(const wxObjectRefData * WXUNUSED(data)) const // misc // ---------------------------------------------------------------------------- -#if defined(__DARWIN__) && defined(DYLIB_INIT) +#if defined(__DARWIN__) && defined(WXMAKINGDLL) extern "C" { void __initialize_Cplusplus(void); void wxWindowsDylibInit(void); }; - // Dynamic shared library (dylib) initialization routine - // required to initialize static C++ objects bacause of lazy dynamic linking - // http://developer.apple.com/techpubs/macosx/Essentials/ - // SystemOverview/Frameworks/Dynamic_Shared_Libraries.html +// Dynamic shared library (dylib) initialization routine +// required to initialize static C++ objects bacause of lazy dynamic linking +// http://developer.apple.com/techpubs/macosx/Essentials/ +// SystemOverview/Frameworks/Dynamic_Shared_Libraries.html void wxWindowsDylibInit() { @@ -334,6 +413,8 @@ void wxWindowsDylibInit() // library initialization routine to cause the static C++ objects in // the library to be initialized (reference number 2441683). + // This only seems to be necessary if the library initialization routine + // needs to use the static C++ objects __initialize_Cplusplus(); }