X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/431346ff02c3ecbbd9160fe039da812002b0680e..9ec0e7da983d3c4de9c7007142a72864214514ac:/src/common/object.cpp diff --git a/src/common/object.cpp b/src/common/object.cpp index e39d06cdbb..e7692e7384 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -10,7 +10,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "object.h" #endif @@ -33,9 +33,6 @@ #endif #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++; } @@ -52,28 +49,26 @@ #endif #if wxUSE_EXTENDED_RTTI -const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ; +const wxClassInfo* wxObject::ms_classParents[] = { NULL } ; wxObject* wxVariantToObjectConverterwxObject ( wxxVariant &data ) -{ return data.Get() ; } +{ return data.wxTEMPLATED_MEMBER_CALL(Get , wxObject*) ; } wxObject* wxVariantOfPtrToObjectConverterwxObject ( wxxVariant &data ) -{ return &data.Get() ; } +{ return &data.wxTEMPLATED_MEMBER_CALL(Get , wxObject) ; } wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } - wxClassInfo wxObject::sm_classwxObject(sm_classParentswxObject , wxT("") , wxT("wxObject"), + wxClassInfo wxObject::ms_classInfo(ms_classParents , wxEmptyString , wxT("wxObject"), (int) sizeof(wxObject), \ (wxObjectConstructorFn) 0 , - (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 , - 0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject); + (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 , + 0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject); template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;} template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;} 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(wxT_OBJECT_PTR , &wxObject::sm_classwxObject) ; return &s_typeInfo ; } - template<> const wxTypeInfo* wxGetTypeInfo( wxObject * ) - { static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &wxObject::sm_classwxObject) ; return &s_typeInfo ; } + wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject*).name() ) ; + wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject).name() ) ; #else -wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0, +wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0, (int) sizeof(wxObject), (wxObjectConstructorFn) 0 ); #endif @@ -86,10 +81,25 @@ wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0, wxClassInfo* wxClassInfo::sm_first = NULL; wxHashTable* wxClassInfo::sm_classTable = NULL; +// when using XTI, this method is already implemented inline inside +// DECLARE_DYNAMIC_CLASS but otherwise we intentionally make this function +// non-inline because this allows us to have a non-inline virtual function in +// all wx classes and this solves linking problems for HP-UX native toolchain +// and possibly others (we could make dtor non-inline as well but it's more +// useful to keep it inline than this function) +#if !wxUSE_EXTENDED_RTTI + +wxClassInfo *wxObject::GetClassInfo() const +{ + return &wxObject::ms_classInfo; +} + +#endif // wxUSE_EXTENDED_RTTI + // 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; +// 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? @@ -98,29 +108,18 @@ const bool wxFalse = FALSE; bool wxObject::IsKindOf(wxClassInfo *info) const { wxClassInfo *thisInfo = GetClassInfo(); - return (thisInfo) ? thisInfo->IsKindOf(info) : FALSE ; + return (thisInfo) ? thisInfo->IsKindOf(info) : false ; } -#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT) -void wxObject::Dump(wxSTD ostream& str) -{ - if (GetClassInfo() && GetClassInfo()->GetClassName()) - str << GetClassInfo()->GetClassName(); - else - str << _T("unknown object class"); -} -#endif - - #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING && defined( new ) - #undef new + #undef new #endif #ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT void *wxObject::operator new ( size_t size, const wxChar *fileName, int lineNum ) { - return wxDebugAlloc(size, (wxChar*) fileName, lineNum, TRUE); + return wxDebugAlloc(size, (wxChar*) fileName, lineNum, true); } #endif @@ -148,21 +147,21 @@ void wxObject::operator delete ( void *buf, const wxChar *WXUNUSED(fileName), in #ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT void *wxObject::operator new[] ( size_t size, const wxChar* fileName, int lineNum ) { - return wxDebugAlloc(size, (wxChar*) fileName, lineNum, TRUE, TRUE); + return wxDebugAlloc(size, (wxChar*) fileName, lineNum, true, true); } #endif #ifdef _WX_WANT_ARRAY_DELETE_VOID void wxObject::operator delete[] ( void *buf ) { - wxDebugFree(buf, TRUE); + wxDebugFree(buf, true); } #endif #ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT void wxObject::operator delete[] (void * buf, const wxChar* WXUNUSED(fileName), int WXUNUSED(lineNum) ) { - wxDebugFree(buf, TRUE); + wxDebugFree(buf, true); } #endif @@ -194,9 +193,7 @@ wxClassInfo::~wxClassInfo() info = info->m_next; } } -#if wxUSE_EXTENDED_RTTI - Unregister( m_className ) ; -#endif + Unregister(); } wxClassInfo *wxClassInfo::FindClass(const wxChar *className) @@ -217,74 +214,44 @@ wxClassInfo *wxClassInfo::FindClass(const wxChar *className) } } -// a tiny InitializeClasses() helper -/* static */ -inline wxClassInfo *wxClassInfo::GetBaseByName(const wxChar *name) +void wxClassInfo::CleanUp() { - if ( !name ) - return NULL; - - wxClassInfo *classInfo = (wxClassInfo *)sm_classTable->Get(name); - -#ifdef __WXDEBUG__ - // this must be fixed, other things will work wrongly later if you get this - if ( !classInfo ) + if ( sm_classTable ) { - wxFAIL_MSG( wxString::Format - ( - _T("base class '%s' is unknown to wxWindows RTTI"), - name - ) ); + delete sm_classTable; + sm_classTable = NULL; } -#endif // __WXDEBUG__ - - return classInfo; } -// Set pointers to base class(es) to speed up IsKindOf -void wxClassInfo::InitializeClasses() +void wxClassInfo::Register() { + if ( !sm_classTable ) + { + sm_classTable = new wxHashTable(wxKEY_STRING); + } + // 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 + wxASSERT_MSG( sm_classTable->Get(m_className) == NULL, + _T("class already in RTTI table - have you used IMPLEMENT_DYNAMIC_CLASS() twice (may be by linking some object module(s) twice)?") ); -#ifdef __WXDEBUG__ - static const size_t nMaxClasses = 10000; // more than we'll ever have - size_t nClass = 0; -#endif - - sm_classTable = new wxHashTable(wxKEY_STRING); - - // Index all class infos by their class name + sm_classTable->Put(m_className, (wxObject *)this); +} - wxClassInfo *info; - for(info = sm_first; info; info = info->m_next) +void wxClassInfo::Unregister() +{ + if ( sm_classTable ) { - if (info->m_className) + sm_classTable->Delete(m_className); + if ( sm_classTable->GetCount() == 0 ) { - 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); + delete sm_classTable; + sm_classTable = NULL; } } - -#if wxUSE_EXTENDED_RTTI == 0 - // Set base pointers for each wxClassInfo - - for(info = sm_first; info; info = info->m_next) - { - info->m_baseInfo1 = GetBaseByName(info->GetBaseClassName1()); - info->m_baseInfo2 = GetBaseByName(info->GetBaseClassName2()); - } -#endif -} - -void wxClassInfo::CleanUpClasses() -{ - delete wxClassInfo::sm_classTable; - wxClassInfo::sm_classTable = NULL; } wxObject *wxCreateDynamicObject(const wxChar *name) @@ -396,34 +363,3 @@ wxObject::CloneRefData(const wxObjectRefData * WXUNUSED(data)) const return NULL; } - -// ---------------------------------------------------------------------------- -// misc -// ---------------------------------------------------------------------------- - -#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 - -void wxWindowsDylibInit() -{ - // The function __initialize_Cplusplus() must be called from the shared - // 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(); -} - -#endif - -// vi:sts=4:sw=4:et