X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a095505c96a4ffbbfa559d9239bc8a6f75698da1..61fef19b852d426f5b00b60de083539b9ba0f76c:/src/common/object.cpp diff --git a/src/common/object.cpp b/src/common/object.cpp index d21eb76155..2c5530169c 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -51,7 +51,7 @@ #pragma optimize("", off) #endif -#if wxUSE_XTI +#if wxUSE_EXTENDED_RTTI const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ; wxObject* wxVariantToObjectConverterwxObject ( const wxxVariant &data ) { return data.Get() ; } @@ -60,7 +60,7 @@ const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ; wxClassInfo wxObject::sm_classwxObject(sm_classParentswxObject , wxT("") , wxT("wxObject"), (int) sizeof(wxObject), \ (wxObjectConstructorFn) 0 , - (wxPropertyInfo*) NULL,0 , 0 , + (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 , 0 , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject); template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;} template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;} @@ -188,7 +188,7 @@ wxClassInfo::~wxClassInfo() info = info->m_next; } } -#if wxUSE_XTI +#if wxUSE_EXTENDED_RTTI Unregister( m_className ) ; #endif } @@ -264,7 +264,7 @@ void wxClassInfo::InitializeClasses() } } -#if wxUSE_XTI == 0 +#if wxUSE_EXTENDED_RTTI == 0 // Set base pointers for each wxClassInfo for(info = sm_first; info; info = info->m_next)