X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e765d7ee7309149e8be24e29466a2b2c8ff7b3ae..e4c903b2ea42fe104ef50d0ea6028f14d8309dfa:/src/common/xti.cpp diff --git a/src/common/xti.cpp b/src/common/xti.cpp index bd9fd18cca..3287e23787 100644 --- a/src/common/xti.cpp +++ b/src/common/xti.cpp @@ -341,30 +341,12 @@ wxTypeInfo *wxTypeInfo::FindType(const wxString& typeName) { wxTypeInfoMap::iterator iter = ms_typeTable->find(typeName); - //wxASSERT_MSG( iter != ms_typeTable->end(), - // wxT("lookup for a non-existent type-info") ); - // FM 3/6/2007 - disabled because otherwise - // wxPropertyInfo::GetCollectionElementTypeInfo - // may easily crash if (iter == ms_typeTable->end()) return NULL; return (wxTypeInfo *)iter->second; } -#if wxUSE_UNICODE -wxClassTypeInfo::wxClassTypeInfo( wxTypeKind kind, wxClassInfo* classInfo, - wxVariant2StringFnc to, - wxString2VariantFnc from, - const char *name) : - wxTypeInfo( kind, to, from, name) -{ - wxASSERT_MSG( kind == wxT_OBJECT_PTR || - kind == wxT_OBJECT, - wxT("Illegal Kind for Enum Type")); m_classInfo = classInfo; -} -#endif - wxClassTypeInfo::wxClassTypeInfo( wxTypeKind kind, wxClassInfo* classInfo, wxVariant2StringFnc to, wxString2VariantFnc from, @@ -732,6 +714,11 @@ wxAny wxClassInfo::ObjectPtrToAny( wxObject* obj) const return m_objectToVariantConverter(obj); } +bool wxClassInfo::NeedsDirectConstruction() const +{ + return wx_dynamic_cast(wxObjectAllocator*, m_constructor) != NULL; +} + // ---------------------------------------------------------------------------- // wxDynamicObject support // ----------------------------------------------------------------------------