X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb73e6001f891ae46b12a1e4ca39b93649cb6099..7fa4dc1cfcc55b0fe425a3ebe5e992ff8255481b:/src/common/xtistrm.cpp diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp index 372602c376..6438ed2815 100644 --- a/src/common/xtistrm.cpp +++ b/src/common/xtistrm.cpp @@ -1,8 +1,8 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/common/xtistrm.cpp -// Purpose: streaming runtime metadata information +// Purpose: streaming runtime metadata information // Author: Stefan Csomor -// Modified by: +// Modified by: // Created: 27/07/03 // RCS-ID: $Id$ // Copyright: (c) 2003 Stefan Csomor @@ -25,13 +25,14 @@ #include "wx/object.h" #endif -#include "wx/xml/xml.h" #include "wx/tokenzr.h" -#include "wx/xtistrm.h" #include "wx/txtstrm.h" +#include "wx/event.h" #if wxUSE_EXTENDED_RTTI +#include "wx/xtistrm.h" + #include "wx/beforestd.h" #include #include @@ -78,11 +79,7 @@ void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , bool isEmbedded, wxxVariantArray &metadata ) { - // hack to avoid writing out embedded windows, these are windows that are constructed as part of other windows, they would - // doubly constructed afterwards - - const wxWindow * win = dynamic_cast(object) ; - if ( win && win->GetId() < 0 ) + if ( !classInfo->BeforeWriteObject( object , this , persister , metadata) ) return ; if ( persister->BeforeWriteObject( this , object , classInfo , metadata) ) @@ -112,7 +109,7 @@ void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo } } -void wxWriter::FindConnectEntry(const wxWindow * evSource,const wxDelegateTypeInfo* dti, const wxObject* &sink , const wxHandlerInfo *&handler) +void wxWriter::FindConnectEntry(const wxEvtHandler * evSource,const wxDelegateTypeInfo* dti, const wxObject* &sink , const wxHandlerInfo *&handler) { wxList *dynamicEvents = evSource->GetDynamicEventTable() ; @@ -124,13 +121,10 @@ void wxWriter::FindConnectEntry(const wxWindow * evSource,const wxDelegateTypeIn wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData(); // find the match - if ( entry->m_fn && (dti->GetEventType() == entry->m_eventType) && - (entry->m_id == -1 || - (entry->m_lastId == -1 && evSource->GetId() == entry->m_id) || - (entry->m_lastId != -1 && - (evSource->GetId() >= entry->m_id && evSource->GetId() <= entry->m_lastId) ) ) && - entry->m_eventSink - ) + if ( entry->m_fn && + (dti->GetEventType() == entry->m_eventType) && + (entry->m_id == -1 ) && + (entry->m_eventSink != NULL ) ) { sink = entry->m_eventSink ; const wxClassInfo* sinkClassInfo = sink->GetClassInfo() ; @@ -158,38 +152,48 @@ void wxWriter::WriteAllProperties( const wxObject * obj , const wxClassInfo* ci { wxString name = ci->GetCreateParamName(i) ; const wxPropertyInfo* prop = map.find(name)->second ; - wxASSERT_MSG( prop , wxT("Create Parameter not found in declared RTTI Parameters") ) ; - WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ; + if ( prop ) + { + WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ; + } + else + { + wxLogError( _("Create Parameter not found in declared RTTI Parameters") ) ; + } map.erase( name ) ; } - - for( wxPropertyInfoMap::iterator iter = map.begin() ; iter != map.end() ; ++iter ) - { - const wxPropertyInfo* prop = iter->second ; - if ( prop->GetFlags() & wxPROP_OBJECT_GRAPH ) + { // Extra block for broken compilers + for( wxPropertyInfoMap::iterator iter = map.begin() ; iter != map.end() ; ++iter ) { - WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ; + const wxPropertyInfo* prop = iter->second ; + if ( prop->GetFlags() & wxPROP_OBJECT_GRAPH ) + { + WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ; + } } } - - for( wxPropertyInfoMap::iterator iter = map.begin() ; iter != map.end() ; ++iter ) - { - const wxPropertyInfo* prop = iter->second ; - if ( !(prop->GetFlags() & wxPROP_OBJECT_GRAPH) ) + { // Extra block for broken compilers + for( wxPropertyInfoMap::iterator iter = map.begin() ; iter != map.end() ; ++iter ) { - WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ; + const wxPropertyInfo* prop = iter->second ; + if ( !(prop->GetFlags() & wxPROP_OBJECT_GRAPH) ) + { + WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ; + } } } } -void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , const wxPropertyInfo* pi , wxPersister *persister , wxWriterInternalPropertiesData *data ) +void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , const wxPropertyInfo* pi , wxPersister *persister , wxWriterInternalPropertiesData *WXUNUSED(data) ) { + if ( pi->GetFlags() & wxPROP_DONT_STREAM ) + return ; + // make sure that we are picking the correct object for accessing the property const wxDynamicObject* dynobj = dynamic_cast< const wxDynamicObject* > (obj ) ; if ( dynobj && (dynamic_cast(ci) == NULL) ) obj = dynobj->GetSuperClassInstance() ; - DoBeginWriteProperty( pi ) ; if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION ) { wxxVariantArray data ; @@ -197,9 +201,12 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c const wxTypeInfo * elementType = dynamic_cast< const wxCollectionTypeInfo* >( pi->GetTypeInfo() )->GetElementType() ; for ( size_t i = 0 ; i < data.GetCount() ; ++i ) { + if ( i == 0 ) + DoBeginWriteProperty( pi ) ; + DoBeginWriteElement() ; wxxVariant value = data[i] ; - if ( persister->BeforeWriteProperty( this , pi , value ) ) + if ( persister->BeforeWriteProperty( this , obj, pi , value ) ) { const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( elementType ) ; if ( cti ) @@ -211,12 +218,14 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c } else { - DoWriteSimpleType( value ) ; + DoWriteSimpleType( value ) ; } } DoEndWriteElement() ; - } - } + if ( i == data.GetCount() - 1 ) + DoEndWriteProperty( pi ) ; + } + } else { const wxDelegateTypeInfo* dti = dynamic_cast< const wxDelegateTypeInfo* > ( pi->GetTypeInfo() ) ; @@ -225,50 +234,98 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c const wxObject* sink = NULL ; const wxHandlerInfo *handler = NULL ; - const wxWindow * evSource = dynamic_cast(obj) ; - wxASSERT_MSG( evSource , wxT("Illegal Object Class (Non-Window) as Event Source") ) ; - - FindConnectEntry( evSource , dti , sink , handler ) ; - if ( persister->BeforeWriteDelegate( this , obj , ci , pi , sink , handler ) ) + const wxEvtHandler * evSource = dynamic_cast(obj) ; + if ( evSource ) { - if ( sink != NULL && handler != NULL ) + FindConnectEntry( evSource , dti , sink , handler ) ; + if ( persister->BeforeWriteDelegate( this , obj , ci , pi , sink , handler ) ) { - wxASSERT_MSG( IsObjectKnown( sink ) , wxT("Streaming delegates for not already streamed objects not yet supported") ) ; - DoWriteDelegate( obj , ci , pi , sink , GetObjectID( sink ) , sink->GetClassInfo() , handler ) ; + if ( sink != NULL && handler != NULL ) + { + DoBeginWriteProperty( pi ) ; + if ( IsObjectKnown( sink ) ) + { + DoWriteDelegate( obj , ci , pi , sink , GetObjectID( sink ) , sink->GetClassInfo() , handler ) ; + DoEndWriteProperty( pi ) ; + } + else + { + wxLogError( _("Streaming delegates for not already streamed objects not yet supported") ) ; + } + } } } + else + { + wxLogError(_("Illegal Object Class (Non-wxEvtHandler) as Event Source") ) ; + } } else { wxxVariant value ; pi->GetAccessor()->GetProperty(obj, value) ; - if ( persister->BeforeWriteProperty( this , pi , value ) ) + + // avoid streaming out void objects + if( value.IsEmpty() ) + return ; + + if ( pi->GetFlags() & wxPROP_ENUM_STORE_LONG ) + { + const wxEnumTypeInfo *eti = dynamic_cast( pi->GetTypeInfo() ) ; + if ( eti ) + { + eti->ConvertFromLong( value.wxTEMPLATED_MEMBER_CALL(Get , long) , value ) ; + } + else + { + wxLogError( _("Type must have enum - long conversion") ) ; + } + } + + // avoid streaming out default values + if ( pi->GetTypeInfo()->HasStringConverters() && !pi->GetDefaultValue().IsEmpty() ) { - const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( pi->GetTypeInfo() ) ; + if ( value.GetAsString() == pi->GetDefaultValue().GetAsString() ) + return ; + } + + // avoid streaming out null objects + const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( pi->GetTypeInfo() ) ; + + if ( cti && value.GetAsObject() == NULL ) + return ; + + if ( persister->BeforeWriteProperty( this , obj, pi , value ) ) + { + DoBeginWriteProperty( pi ) ; if ( cti ) { const wxClassInfo* pci = cti->GetClassInfo() ; wxObject *vobj = pci->VariantToInstance( value ) ; - wxxVariantArray md ; - WriteObject( vobj , (vobj ? vobj->GetClassInfo() : pci ) , persister , cti->GetKind()== wxT_OBJECT , md) ; - } - else - { - if ( pi->GetFlags() & wxPROP_ENUM_STORE_LONG ) + if ( vobj && pi->GetTypeInfo()->HasStringConverters() ) + { + wxString stringValue ; + cti->ConvertToString( value , stringValue ) ; + wxxVariant convertedValue(stringValue) ; + DoWriteSimpleType( convertedValue ) ; + } + else { - const wxEnumTypeInfo *eti = dynamic_cast( pi->GetTypeInfo() ) ; - wxASSERT_MSG( eti , wxT("Type must have enum - long conversion") ) ; - eti->ConvertFromLong( value.Get() , value ) ; + wxxVariantArray md ; + WriteObject( vobj , (vobj ? vobj->GetClassInfo() : pci ) , persister , cti->GetKind()== wxT_OBJECT , md) ; } + } + else + { DoWriteSimpleType( value ) ; } + DoEndWriteProperty( pi ) ; } } } - DoEndWriteProperty( pi ) ; } -int wxWriter::GetObjectID(const wxObject *obj) +int wxWriter::GetObjectID(const wxObject *obj) { if ( !IsObjectKnown( obj ) ) return wxInvalidObjectID ; @@ -276,160 +333,14 @@ int wxWriter::GetObjectID(const wxObject *obj) return m_data->m_writtenObjects[obj] ; } -bool wxWriter::IsObjectKnown( const wxObject *obj ) +bool wxWriter::IsObjectKnown( const wxObject *obj ) { return m_data->m_writtenObjects.find( obj ) != m_data->m_writtenObjects.end() ; } -// -// XML Streaming -// - -// convenience functions - -void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data ) -{ - node->AddChild(new wxXmlNode(wxXML_TEXT_NODE, "value", data ) ); -} - -wxString wxXmlGetContentFromNode( wxXmlNode *node ) -{ - if ( node->GetChildren() ) - return node->GetChildren()->GetContent() ; - else - return wxEmptyString ; -} - -struct wxXmlWriter::wxXmlWriterInternal -{ - wxXmlNode *m_root ; - wxXmlNode *m_current ; - vector< wxXmlNode * > m_objectStack ; - - void Push( wxXmlNode *newCurrent ) - { - m_objectStack.push_back( m_current ) ; - m_current = newCurrent ; - } - - void Pop() - { - m_current = m_objectStack.back() ; - m_objectStack.pop_back() ; - } -} ; - -wxXmlWriter::wxXmlWriter( wxXmlNode * rootnode ) -{ - m_data = new wxXmlWriterInternal() ; - m_data->m_root = rootnode ; - m_data->m_current = rootnode ; -} - -wxXmlWriter::~wxXmlWriter() -{ - delete m_data ; -} - -void wxXmlWriter::DoBeginWriteTopLevelEntry( const wxString &name ) -{ - wxXmlNode *pnode; - pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("entry")); - pnode->AddProperty(wxString("name"), name); - m_data->m_current->AddChild(pnode) ; - m_data->Push( pnode ) ; -} - -void wxXmlWriter::DoEndWriteTopLevelEntry( const wxString &WXUNUSED(name) ) -{ - m_data->Pop() ; -} - -void wxXmlWriter::DoBeginWriteObject(const wxObject *WXUNUSED(object), const wxClassInfo *classInfo, int objectID , wxxVariantArray &metadata ) -{ - wxXmlNode *pnode; - pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); - pnode->AddProperty(wxT("class"), wxString(classInfo->GetClassName())); - pnode->AddProperty(wxT("id"), wxString::Format( "%d" , objectID ) ); - - for ( size_t i = 0 ; i < metadata.GetCount() ; ++i ) - { - pnode->AddProperty( metadata[i].GetName() , metadata[i].GetAsString() ) ; - } - m_data->m_current->AddChild(pnode) ; - m_data->Push( pnode ) ; -} - -// end of writing the root object -void wxXmlWriter::DoEndWriteObject(const wxObject *WXUNUSED(object), const wxClassInfo *WXUNUSED(classInfo), int WXUNUSED(objectID) ) -{ - m_data->Pop() ; -} - -// writes a property in the stream format -void wxXmlWriter::DoWriteSimpleType( wxxVariant &value ) -{ - wxXmlAddContentToNode( m_data->m_current ,value.GetAsString() ) ; -} - -void wxXmlWriter::DoBeginWriteElement() -{ - wxXmlNode *pnode; - pnode = new wxXmlNode(wxXML_ELEMENT_NODE, "element" ); - m_data->m_current->AddChild(pnode) ; - m_data->Push( pnode ) ; -} - -void wxXmlWriter::DoEndWriteElement() -{ - m_data->Pop() ; -} - -void wxXmlWriter::DoBeginWriteProperty(const wxPropertyInfo *pi ) -{ - wxXmlNode *pnode; - pnode = new wxXmlNode(wxXML_ELEMENT_NODE, "prop" ); - pnode->AddProperty(wxT("name"), pi->GetName() ); - m_data->m_current->AddChild(pnode) ; - m_data->Push( pnode ) ; -} - -void wxXmlWriter::DoEndWriteProperty(const wxPropertyInfo *WXUNUSED(propInfo) ) -{ - m_data->Pop() ; -} - - - -// insert an object reference to an already written object -void wxXmlWriter::DoWriteRepeatedObject( int objectID ) -{ - wxXmlNode *pnode; - pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); - pnode->AddProperty(wxString("href"), wxString::Format( "%d" , objectID ) ); - m_data->m_current->AddChild(pnode) ; -} - -// insert a null reference -void wxXmlWriter::DoWriteNullObject() -{ - wxXmlNode *pnode; - pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); - m_data->m_current->AddChild(pnode) ; -} - -// writes a delegate in the stream format -void wxXmlWriter::DoWriteDelegate( const wxObject *WXUNUSED(object), const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(pi) , - const wxObject *eventSink, int sinkObjectID , const wxClassInfo* WXUNUSED(eventSinkClassInfo) , const wxHandlerInfo* handlerInfo ) -{ - if ( eventSink != NULL && handlerInfo != NULL ) - { - wxXmlAddContentToNode( m_data->m_current ,wxString::Format(wxT("%d.%s"), sinkObjectID , handlerInfo->GetName()) ) ; - } -} // ---------------------------------------------------------------------------- -// reading objects in +// reading objects in // ---------------------------------------------------------------------------- struct wxReader::wxReaderInternal @@ -437,7 +348,7 @@ struct wxReader::wxReaderInternal map m_classInfos; }; -wxReader::wxReader() +wxReader::wxReader() { m_data = new wxReaderInternal; } @@ -449,281 +360,58 @@ wxReader::~wxReader() wxClassInfo* wxReader::GetObjectClassInfo(int objectID) { - assert( m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() ); + if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID ) + { + wxLogError( _("Invalid or Null Object ID passed to GetObjectClassInfo" ) ) ; + return NULL ; + } + if ( m_data->m_classInfos.find(objectID) == m_data->m_classInfos.end() ) + { + wxLogError( _("Unknown Object passed to GetObjectClassInfo" ) ) ; + return NULL ; + } return m_data->m_classInfos[objectID] ; } void wxReader::SetObjectClassInfo(int objectID, wxClassInfo *classInfo ) { - assert( m_data->m_classInfos.find(objectID) == m_data->m_classInfos.end() ) ; + if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID ) + { + wxLogError( _("Invalid or Null Object ID passed to GetObjectClassInfo" ) ) ; + return ; + } + if ( m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() ) + { + wxLogError( _("Already Registered Object passed to SetObjectClassInfo" ) ) ; + return ; + } m_data->m_classInfos[objectID] = classInfo ; } -bool wxReader::HasObjectClassInfo( int objectID ) +bool wxReader::HasObjectClassInfo( int objectID ) { + if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID ) + { + wxLogError( _("Invalid or Null Object ID passed to HasObjectClassInfo" ) ) ; + return NULL ; + } return m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() ; } // ---------------------------------------------------------------------------- -// reading xml in +// reading xml in // ---------------------------------------------------------------------------- -/* +/* Reading components has not to be extended for components as properties are always sought by typeinfo over all levels and create params are always toplevel class only */ -int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) -{ - wxASSERT_MSG( callbacks , wxT("Does not support reading without a Depersistor") ) ; - wxString className; - wxClassInfo *classInfo; - - wxxVariant *createParams ; - int *createParamOids ; - const wxClassInfo** createClassInfos ; - wxXmlNode *children; - int objectID; - wxString ObjectIdString ; - - children = node->GetChildren(); - if (!children) - { - // check for a null object or href - if (node->GetPropVal("href" , &ObjectIdString ) ) - { - objectID = atoi( ObjectIdString.c_str() ) ; - wxASSERT_MSG( HasObjectClassInfo( objectID ) , wxT("Forward hrefs are not supported") ) ; - return objectID ; - } - if ( !node->GetPropVal("id" , &ObjectIdString ) ) - { - return wxNullObjectID; - } - } - if (!node->GetPropVal("class", &className)) - { - // No class name. Eek. FIXME: error handling - return wxInvalidObjectID; - } - classInfo = wxClassInfo::FindClass(className); - wxASSERT_MSG( classInfo , wxString::Format(wxT("unknown class %s"),className ) ) ; - wxASSERT_MSG( !children || children->GetType() != wxXML_TEXT_NODE , wxT("objects cannot have XML Text Nodes") ) ; - if (!node->GetPropVal("id", &ObjectIdString)) - { - wxASSERT_MSG(0,wxT("Objects must have an id attribute") ) ; - // No object id. Eek. FIXME: error handling - return wxInvalidObjectID; - } - objectID = atoi( ObjectIdString.c_str() ) ; - // is this object already has been streamed in, return it here - wxASSERT_MSG( !HasObjectClassInfo( objectID ) , wxString::Format(wxT("Doubly used id : %d"), objectID ) ) ; - - // new object, start with allocation - // first make the object know to our internal registry - SetObjectClassInfo( objectID , classInfo ) ; - - wxxVariantArray metadata ; - wxXmlProperty *xp = node->GetProperties() ; - while ( xp ) - { - if ( xp->GetName() != wxString("class") && xp->GetName() != wxString("id") ) - { - metadata.Add( new wxxVariant( xp->GetValue() , xp->GetName() ) ) ; - } - xp = xp->GetNext() ; - } - callbacks->AllocateObject(objectID, classInfo, metadata); - - // - // stream back the Create parameters first - createParams = new wxxVariant[ classInfo->GetCreateParamCount() ] ; - createParamOids = new int[classInfo->GetCreateParamCount() ] ; - createClassInfos = new const wxClassInfo*[classInfo->GetCreateParamCount() ] ; - - typedef map PropertyNodes ; - typedef vector PropertyNames ; - - PropertyNodes propertyNodes ; - PropertyNames propertyNames ; - - while( children ) - { - wxString name ; - children->GetPropVal( wxT("name") , &name ) ; - propertyNames.push_back( name.c_str() ) ; - propertyNodes[name.c_str()] = children->GetChildren() ; - children = children->GetNext() ; - } - - for ( int i = 0 ; i GetCreateParamCount() ; ++i ) - { - const wxChar* paramName = classInfo->GetCreateParamName(i) ; - PropertyNodes::iterator propiter = propertyNodes.find( paramName ) ; - const wxPropertyInfo* pi = classInfo->FindPropertyInfo( paramName ) ; - wxASSERT_MSG(pi,wxString::Format("Unkown Property %s",paramName) ) ; - // if we don't have the value of a create param set in the xml - // we use the default value - if ( propiter != propertyNodes.end() ) - { - wxXmlNode* prop = propiter->second ; - if ( pi->GetTypeInfo()->IsObjectType() ) - { - createParamOids[i] = ReadComponent( prop , callbacks ) ; - createClassInfos[i] = dynamic_cast(pi->GetTypeInfo())->GetClassInfo() ; - } - else - { - createParamOids[i] = wxInvalidObjectID ; - createParams[i] = ReadValue( prop , pi->GetTypeInfo() ) ; - if( pi->GetFlags() & wxPROP_ENUM_STORE_LONG ) - { - const wxEnumTypeInfo *eti = dynamic_cast( pi->GetTypeInfo() ) ; - wxASSERT_MSG( eti , wxT("Type must have enum - long conversion") ) ; - - long realval ; - eti->ConvertToLong( createParams[i] , realval ) ; - createParams[i] = wxxVariant( realval ) ; - } - createClassInfos[i] = NULL ; - } - - for ( size_t j = 0 ; j < propertyNames.size() ; ++j ) - { - if ( propertyNames[j] == paramName ) - { - propertyNames[j] = "" ; - break ; - } - } - } - else - { - createParams[i] = pi->GetDefaultValue() ; - } - } - - // got the parameters. Call the Create method - callbacks->CreateObject(objectID, classInfo, - classInfo->GetCreateParamCount(), - createParams, createParamOids, createClassInfos, metadata ); - - // now stream in the rest of the properties, in the sequence their properties were written in the xml - for ( size_t j = 0 ; j < propertyNames.size() ; ++j ) - { - if ( propertyNames[j].length() ) - { - PropertyNodes::iterator propiter = propertyNodes.find( propertyNames[j] ) ; - if ( propiter != propertyNodes.end() ) - { - wxXmlNode* prop = propiter->second ; - const wxPropertyInfo* pi = classInfo->FindPropertyInfo( propertyNames[j].c_str() ) ; - if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION ) - { - const wxCollectionTypeInfo* collType = dynamic_cast< const wxCollectionTypeInfo* >( pi->GetTypeInfo() ) ; - const wxTypeInfo * elementType = collType->GetElementType() ; - while( prop ) - { - wxASSERT_MSG(prop->GetName() == wxT("element") , wxT("A non empty collection must consist of 'element' nodes")) ; - wxXmlNode* elementContent = prop->GetChildren() ; - if ( elementContent ) - { - // we skip empty elements - if ( elementType->IsObjectType() ) - { - int valueId = ReadComponent( elementContent , callbacks ) ; - if ( valueId != wxInvalidObjectID ) - { - if ( pi->GetAccessor()->HasAdder() ) - callbacks->AddToPropertyCollectionAsObject( objectID , classInfo , pi , valueId ) ; - // TODO for collections we must have a notation on taking over ownership or not - if ( elementType->GetKind() == wxT_OBJECT && valueId != wxNullObjectID ) - callbacks->DestroyObject( valueId , GetObjectClassInfo( valueId ) ) ; - } - } - else - { - wxxVariant elementValue = ReadValue( elementContent , elementType ) ; - if ( pi->GetAccessor()->HasAdder() ) - callbacks->AddToPropertyCollection( objectID , classInfo ,pi , elementValue ) ; - } - } - prop = prop->GetNext() ; - } - } - else if ( pi->GetTypeInfo()->IsObjectType() ) - { - int valueId = ReadComponent( prop , callbacks ) ; - if ( valueId != wxInvalidObjectID ) - { - callbacks->SetPropertyAsObject( objectID , classInfo , pi , valueId ) ; - if ( pi->GetTypeInfo()->GetKind() == wxT_OBJECT && valueId != wxNullObjectID ) - callbacks->DestroyObject( valueId , GetObjectClassInfo( valueId ) ) ; - } - } - else if ( pi->GetTypeInfo()->IsDelegateType() ) - { - if ( prop ) - { - wxString resstring = prop->GetContent() ; - wxInt32 pos = resstring.Find('.') ; - assert( pos != wxNOT_FOUND ) ; - int sinkOid = atol(resstring.Left(pos)) ; - wxString handlerName = resstring.Mid(pos+1) ; - wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid ) ; - - callbacks->SetConnect( objectID , classInfo , dynamic_cast(pi->GetTypeInfo()) , sinkClassInfo , - sinkClassInfo->FindHandlerInfo(handlerName) , sinkOid ) ; - } - - } - else - { - wxxVariant nodeval ; - callbacks->SetProperty( objectID, classInfo ,pi , ReadValue( prop , pi->GetTypeInfo() ) ) ; - } - } - } - } - - delete[] createParams ; - delete[] createParamOids ; - delete[] createClassInfos ; - - return objectID; -} - -wxxVariant wxXmlReader::ReadValue(wxXmlNode *node, - const wxTypeInfo *type ) -{ - wxString content ; - if ( node ) - content = node->GetContent() ; - wxxVariant result ; - type->ConvertFromString( content , result ) ; - return result ; -} - -int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks) -{ - wxXmlNode *iter = m_parent->GetChildren() ; - while ( iter ) - { - wxString entryName ; - if ( iter->GetPropVal("name", &entryName) ) - { - if ( entryName == name ) - return ReadComponent( iter->GetChildren() , callbacks ) ; - } - iter = iter->GetNext() ; - } - return wxInvalidObjectID ; -} // ---------------------------------------------------------------------------- -// depersisting to memory +// depersisting to memory // ---------------------------------------------------------------------------- struct wxRuntimeDepersister::wxRuntimeDepersisterInternal @@ -732,15 +420,23 @@ struct wxRuntimeDepersister::wxRuntimeDepersisterInternal void SetObject(int objectID, wxObject *obj ) { - assert( m_objects.find(objectID) == m_objects.end() ) ; + if ( m_objects.find(objectID) != m_objects.end() ) + { + wxLogError( _("Passing a already registered object to SetObject") ) ; + return ; + } m_objects[objectID] = obj ; } wxObject* GetObject( int objectID ) { if ( objectID == wxNullObjectID ) return NULL ; + if ( m_objects.find(objectID) == m_objects.end() ) + { + wxLogError( _("Passing an unkown object to GetObject") ) ; + return NULL ; + } - assert( m_objects.find(objectID) != m_objects.end() ) ; return m_objects[objectID] ; } } ; @@ -756,7 +452,7 @@ wxRuntimeDepersister::~wxRuntimeDepersister() } void wxRuntimeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo , - wxxVariantArray &metadata) + wxxVariantArray &WXUNUSED(metadata)) { wxObject *O; O = classInfo->CreateObject(); @@ -769,7 +465,7 @@ void wxRuntimeDepersister::CreateObject(int objectID, wxxVariant *params, int *objectIdValues, const wxClassInfo **objectClassInfos , - wxxVariantArray &metadata) + wxxVariantArray &WXUNUSED(metadata)) { wxObject *o; o = m_data->GetObject(objectID); @@ -792,7 +488,37 @@ void wxRuntimeDepersister::CreateObject(int objectID, classInfo->Create(o, paramCount, params); } -void wxRuntimeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo)) +void wxRuntimeDepersister::ConstructObject(int objectID, + const wxClassInfo *classInfo, + int paramCount, + wxxVariant *params, + int *objectIdValues, + const wxClassInfo **objectClassInfos , + wxxVariantArray &WXUNUSED(metadata)) +{ + wxObject *o; + for ( int i = 0 ; i < paramCount ; ++i ) + { + if ( objectIdValues[i] != wxInvalidObjectID ) + { + wxObject *o; + o = m_data->GetObject(objectIdValues[i]); + // if this is a dynamic object and we are asked for another class + // than wxDynamicObject we cast it down manually. + wxDynamicObject *dyno = dynamic_cast< wxDynamicObject * > (o) ; + if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) ) + { + o = dyno->GetSuperClassInstance() ; + } + params[i] = objectClassInfos[i]->InstanceToVariant(o) ; + } + } + o = classInfo->ConstructObject(paramCount, params); + m_data->SetObject(objectID, o); +} + + +void wxRuntimeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo)) { wxObject *o; o = m_data->GetObject(objectID); @@ -831,19 +557,32 @@ void wxRuntimeDepersister::SetPropertyAsObject(int objectID, void wxRuntimeDepersister::SetConnect(int eventSourceObjectID, const wxClassInfo *WXUNUSED(eventSourceClassInfo), - const wxDelegateTypeInfo *delegateInfo , + const wxPropertyInfo *delegateInfo , const wxClassInfo *WXUNUSED(eventSinkClassInfo) , const wxHandlerInfo* handlerInfo , int eventSinkObjectID ) { - wxWindow *ehsource = dynamic_cast< wxWindow* >( m_data->GetObject( eventSourceObjectID ) ) ; + wxEvtHandler *ehsource = dynamic_cast< wxEvtHandler* >( m_data->GetObject( eventSourceObjectID ) ) ; wxEvtHandler *ehsink = dynamic_cast< wxEvtHandler *>(m_data->GetObject(eventSinkObjectID) ) ; if ( ehsource && ehsink ) { - ehsource->Connect( ehsource->GetId() , delegateInfo->GetEventType() , - handlerInfo->GetEventFunction() , NULL /*user data*/ , - ehsink ) ; + const wxDelegateTypeInfo *delegateTypeInfo = dynamic_cast(delegateInfo->GetTypeInfo()); + if( delegateTypeInfo && delegateTypeInfo->GetLastEventType() == -1 ) + { + ehsource->Connect( -1 , delegateTypeInfo->GetEventType() , + handlerInfo->GetEventFunction() , NULL /*user data*/ , + ehsink ) ; + } + else + { + for ( wxEventType iter = delegateTypeInfo->GetEventType() ; iter <= delegateTypeInfo->GetLastEventType() ; ++iter ) + { + ehsource->Connect( -1 , iter , + handlerInfo->GetEventFunction() , NULL /*user data*/ , + ehsink ) ; + } + } } } @@ -856,7 +595,7 @@ wxObject *wxRuntimeDepersister::GetObject(int objectID) void wxRuntimeDepersister::AddToPropertyCollection( int objectID , const wxClassInfo *classInfo, const wxPropertyInfo* propertyInfo , - const wxxVariant &value) + const wxxVariant &value) { wxObject *o; o = m_data->GetObject(objectID); @@ -867,7 +606,7 @@ void wxRuntimeDepersister::AddToPropertyCollection( int objectID , void wxRuntimeDepersister::AddToPropertyCollectionAsObject(int objectID, const wxClassInfo *classInfo, const wxPropertyInfo* propertyInfo , - int valueObjectId) + int valueObjectId) { wxObject *o, *valo; o = m_data->GetObject(objectID); @@ -886,29 +625,42 @@ void wxRuntimeDepersister::AddToPropertyCollectionAsObject(int objectID, } // ---------------------------------------------------------------------------- -// depersisting to code +// depersisting to code // ---------------------------------------------------------------------------- struct wxCodeDepersister::wxCodeDepersisterInternal { +#if wxUSE_UNICODE + map m_objectNames ; +#else map m_objectNames ; +#endif void SetObjectName(int objectID, const wxString &name ) { - assert( m_objectNames.find(objectID) == m_objectNames.end() ) ; - m_objectNames[objectID] = (const char *)name; + if ( m_objectNames.find(objectID) != m_objectNames.end() ) + { + wxLogError( _("Passing a already registered object to SetObjectName") ) ; + return ; + } + m_objectNames[objectID] = (const wxChar *)name; } + wxString GetObjectName( int objectID ) { if ( objectID == wxNullObjectID ) - return "NULL" ; + return wxT("NULL") ; - assert( m_objectNames.find(objectID) != m_objectNames.end() ) ; + if ( m_objectNames.find(objectID) == m_objectNames.end() ) + { + wxLogError( _("Passing an unkown object to GetObject") ) ; + return wxEmptyString ; + } return wxString( m_objectNames[objectID].c_str() ) ; } } ; -wxCodeDepersister::wxCodeDepersister(wxTextOutputStream *out) +wxCodeDepersister::wxCodeDepersister(wxTextOutputStream *out) : m_fp(out) { m_data = new wxCodeDepersisterInternal ; @@ -920,20 +672,20 @@ wxCodeDepersister::~wxCodeDepersister() } void wxCodeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo , - wxxVariantArray &metadata) + wxxVariantArray &WXUNUSED(metadata)) { - wxString objectName = wxString::Format( "LocalObject_%d" , objectID ) ; - m_fp->WriteString( wxString::Format( "\t%s *%s = new %s;\n", + wxString objectName = wxString::Format( wxT("LocalObject_%d") , objectID ) ; + m_fp->WriteString( wxString::Format( wxT("\t%s *%s = new %s;\n"), classInfo->GetClassName(), - objectName, + objectName.c_str(), classInfo->GetClassName()) ); m_data->SetObjectName( objectID , objectName ) ; } -void wxCodeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo)) +void wxCodeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo)) { - m_fp->WriteString( wxString::Format( "\tdelete %s;\n", - m_data->GetObjectName( objectID) ) ); + m_fp->WriteString( wxString::Format( wxT("\tdelete %s;\n"), + m_data->GetObjectName( objectID).c_str() ) ); } wxString wxCodeDepersister::ValueAsCode( const wxxVariant ¶m ) @@ -943,16 +695,22 @@ wxString wxCodeDepersister::ValueAsCode( const wxxVariant ¶m ) if ( type->GetKind() == wxT_CUSTOM ) { const wxCustomTypeInfo* cti = dynamic_cast(type) ; - wxASSERT_MSG( cti , wxT("Internal error, illegal wxCustomTypeInfo") ) ; - value.Printf( "%s(%s)",cti->GetTypeName(),param.GetAsString() ); + if ( cti ) + { + value.Printf( wxT("%s(%s)"), cti->GetTypeName().c_str(),param.GetAsString().c_str() ); + } + else + { + wxLogError ( _("Internal error, illegal wxCustomTypeInfo") ) ; + } } else if ( type->GetKind() == wxT_STRING ) { - value.Printf( "\"%s\"",param.GetAsString() ); + value.Printf( wxT("\"%s\""),param.GetAsString().c_str() ); } else { - value.Printf( "%s", param.GetAsString() ); + value.Printf( wxT("%s"), param.GetAsString().c_str() ); } return value ; } @@ -963,23 +721,54 @@ void wxCodeDepersister::CreateObject(int objectID, wxxVariant *params, int *objectIDValues, const wxClassInfo **WXUNUSED(objectClassInfos) , - wxxVariantArray &metadata + wxxVariantArray &WXUNUSED(metadata) + ) +{ + int i; + m_fp->WriteString( wxString::Format( wxT("\t%s->Create("), m_data->GetObjectName(objectID).c_str() ) ); + for (i = 0; i < paramCount; i++) + { + if ( objectIDValues[i] != wxInvalidObjectID ) + m_fp->WriteString( wxString::Format( wxT("%s"), m_data->GetObjectName( objectIDValues[i] ).c_str() ) ); + else + { + m_fp->WriteString( wxString::Format( wxT("%s"), ValueAsCode(params[i]).c_str() ) ); + } + if (i < paramCount - 1) + m_fp->WriteString( wxT(", ")); + } + m_fp->WriteString( wxT(");\n") ); +} + +void wxCodeDepersister::ConstructObject(int objectID, + const wxClassInfo *classInfo, + int paramCount, + wxxVariant *params, + int *objectIDValues, + const wxClassInfo **WXUNUSED(objectClassInfos) , + wxxVariantArray &WXUNUSED(metadata) ) { + wxString objectName = wxString::Format( wxT("LocalObject_%d") , objectID ) ; + m_fp->WriteString( wxString::Format( wxT("\t%s *%s = new %s("), + classInfo->GetClassName(), + objectName.c_str(), + classInfo->GetClassName()) ); + m_data->SetObjectName( objectID , objectName ) ; + int i; - m_fp->WriteString( wxString::Format( "\t%s->Create(", m_data->GetObjectName(objectID) ) ); for (i = 0; i < paramCount; i++) { if ( objectIDValues[i] != wxInvalidObjectID ) - m_fp->WriteString( wxString::Format( "%s", m_data->GetObjectName( objectIDValues[i] ) ) ); + m_fp->WriteString( wxString::Format( wxT("%s"), m_data->GetObjectName( objectIDValues[i] ).c_str() ) ); else { - m_fp->WriteString( wxString::Format( "%s", ValueAsCode(params[i]) ) ); + m_fp->WriteString( wxString::Format( wxT("%s"), ValueAsCode(params[i]).c_str() ) ); } if (i < paramCount - 1) - m_fp->WriteString( ", "); + m_fp->WriteString( wxT(", ") ); } - m_fp->WriteString( ");\n"); + m_fp->WriteString( wxT(");\n") ); } void wxCodeDepersister::SetProperty(int objectID, @@ -987,10 +776,10 @@ void wxCodeDepersister::SetProperty(int objectID, const wxPropertyInfo* propertyInfo, const wxxVariant &value) { - m_fp->WriteString( wxString::Format( "\t%s->%s(%s);\n", - m_data->GetObjectName(objectID), - propertyInfo->GetAccessor()->GetSetterName(), - ValueAsCode(value)) ); + m_fp->WriteString( wxString::Format( wxT("\t%s->%s(%s);\n"), + m_data->GetObjectName(objectID).c_str(), + propertyInfo->GetAccessor()->GetSetterName().c_str(), + ValueAsCode(value).c_str()) ); } void wxCodeDepersister::SetPropertyAsObject(int objectID, @@ -999,40 +788,40 @@ void wxCodeDepersister::SetPropertyAsObject(int objectID, int valueObjectId) { if ( propertyInfo->GetTypeInfo()->GetKind() == wxT_OBJECT ) - m_fp->WriteString( wxString::Format( "\t%s->%s(*%s);\n", - m_data->GetObjectName(objectID), - propertyInfo->GetAccessor()->GetSetterName(), - m_data->GetObjectName( valueObjectId) ) ); + m_fp->WriteString( wxString::Format( wxT("\t%s->%s(*%s);\n"), + m_data->GetObjectName(objectID).c_str(), + propertyInfo->GetAccessor()->GetSetterName().c_str(), + m_data->GetObjectName( valueObjectId).c_str() ) ); else - m_fp->WriteString( wxString::Format( "\t%s->%s(%s);\n", - m_data->GetObjectName(objectID), - propertyInfo->GetAccessor()->GetSetterName(), - m_data->GetObjectName( valueObjectId) ) ); + m_fp->WriteString( wxString::Format( wxT("\t%s->%s(%s);\n"), + m_data->GetObjectName(objectID).c_str(), + propertyInfo->GetAccessor()->GetSetterName().c_str(), + m_data->GetObjectName( valueObjectId).c_str() ) ); } void wxCodeDepersister::AddToPropertyCollection( int objectID , - const wxClassInfo *classInfo, + const wxClassInfo *WXUNUSED(classInfo), const wxPropertyInfo* propertyInfo , - const wxxVariant &value) + const wxxVariant &value) { - m_fp->WriteString( wxString::Format( "\t%s->%s(%s);\n", - m_data->GetObjectName(objectID), - propertyInfo->GetAccessor()->GetAdderName(), - ValueAsCode(value)) ); + m_fp->WriteString( wxString::Format( wxT("\t%s->%s(%s);\n"), + m_data->GetObjectName(objectID).c_str(), + propertyInfo->GetAccessor()->GetAdderName().c_str(), + ValueAsCode(value).c_str()) ); } // sets the corresponding property (value is an object) -void wxCodeDepersister::AddToPropertyCollectionAsObject(int objectID, - const wxClassInfo *classInfo, - const wxPropertyInfo* propertyInfo , - int valueObjectId) +void wxCodeDepersister::AddToPropertyCollectionAsObject(int WXUNUSED(objectID), + const wxClassInfo *WXUNUSED(classInfo), + const wxPropertyInfo* WXUNUSED(propertyInfo) , + int WXUNUSED(valueObjectId)) { // TODO } void wxCodeDepersister::SetConnect(int eventSourceObjectID, const wxClassInfo *WXUNUSED(eventSourceClassInfo), - const wxDelegateTypeInfo *delegateInfo , + const wxPropertyInfo *delegateInfo , const wxClassInfo *eventSinkClassInfo , const wxHandlerInfo* handlerInfo , int eventSinkObjectID ) @@ -1040,11 +829,19 @@ void wxCodeDepersister::SetConnect(int eventSourceObjectID, wxString ehsource = m_data->GetObjectName( eventSourceObjectID ) ; wxString ehsink = m_data->GetObjectName(eventSinkObjectID) ; wxString ehsinkClass = eventSinkClassInfo->GetClassName() ; - int eventType = delegateInfo->GetEventType() ; - wxString handlerName = handlerInfo->GetName() ; + const wxDelegateTypeInfo *delegateTypeInfo = dynamic_cast(delegateInfo->GetTypeInfo()); + if ( delegateTypeInfo ) + { + int eventType = delegateTypeInfo->GetEventType() ; + wxString handlerName = handlerInfo->GetName() ; - m_fp->WriteString( wxString::Format( "\t%s->Connect( %s->GetId() , %d , (wxObjectEventFunction)(wxEventFunction) & %s::%s , NULL , %s ) ;" , - ehsource , ehsource , eventType , ehsinkClass , handlerName , ehsink ) ); + m_fp->WriteString( wxString::Format( wxT("\t%s->Connect( %s->GetId() , %d , (wxObjectEventFunction)(wxEventFunction) & %s::%s , NULL , %s ) ;") , + ehsource.c_str() , ehsource.c_str() , eventType , ehsinkClass.c_str() , handlerName.c_str() , ehsink.c_str() ) ); + } + else + { + wxLogError(_("delegate has no type info")); + } } #include