define {first,second}_type in the struct declared by _WX_DECLARE_PAIR too for compati...

[wxWidgets.git] / src / common / xtistrm.cpp

diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp
index 146dca7b48ee245b943ff289ddefc2d5008ed665..20d21f6f5b366a5e5758d605ff9481ca61f7a529 100644 (file)
--- a/src/common/xtistrm.cpp
+++ b/src/common/xtistrm.cpp
@@ -1,532 +1,847 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/xtistrm.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/xtistrm.cpp

-// Purpose:     streaming runtime metadata information 
+// Purpose:     streaming runtime metadata information

 // Author:      Stefan Csomor
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "xtistrm.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_EXTENDED_RTTI
+
+#include "wx/xtistrm.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/hash.h"

     #include "wx/object.h"
     #include "wx/object.h"

+    #include "wx/hash.h"
+    #include "wx/event.h"

 #endif
 
 #endif
 

-#include "wx/xml/xml.h"

 #include "wx/tokenzr.h"
 #include "wx/tokenzr.h"

-#include "wx/xtistrm.h"

 #include "wx/txtstrm.h"
 
 #include "wx/txtstrm.h"
 

-#if wxUSE_EXTENDED_RTTI
+#include "wx/beforestd.h"

 #include <map>
 #include <vector>
 #include <string>
 #include <map>
 #include <vector>
 #include <string>

+#include "wx/afterstd.h"

 
 using namespace std ;
 
 
 using namespace std ;
 

-// ----------------------------------------------------------------------------
-// streaming xml out 
-// ----------------------------------------------------------------------------
+struct wxWriter::wxWriterInternal
+{
+    map< const wxObject* , int > m_writtenObjects ;
+    int m_nextId ;
+} ;

 
 

-void WriteComponent(wxObject *Object, const wxClassInfo *ClassInfo, wxXmlNode *parent, const wxString& nodeName , int &nextId , map< wxObject* , int > &writtenObjects ) ;
-
-void WriteComponentProperties( wxObject* obj , const wxClassInfo* ci , wxXmlNode *onode , int &nextId, map< wxObject* , int > &writtenObjects, map< string , int > &writtenProperties)
-{
-       const wxPropertyInfo *pi = ci->GetFirstProperty() ;
-       while( pi ) 
-       {
-               if ( writtenProperties.find( pi->GetName() ) == writtenProperties.end() )
-               {
-                       writtenProperties[ pi->GetName() ] = 1 ;
-                       const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( pi->GetTypeInfo() ) ;
-                       if ( cti )
-                       {
-                               const wxClassInfo* pci = cti->GetClassInfo() ;
-                               WriteComponent( pci->VariantToInstance( pi->GetAccessor()->GetProperty(obj) ) , pci , onode , pi->GetName() , nextId , writtenObjects ) ;
-                       }
-                       else
-                       {
-                               const wxDelegateTypeInfo* dti = dynamic_cast< const wxDelegateTypeInfo* > ( pi->GetTypeInfo() ) ;
-                               if ( dti )
-                               {
-                                       // in which form should we stream out these ?
-                               }
-                               else
-                               {
-                                       wxXmlNode *pnode;
-                                       pnode = new wxXmlNode(wxXML_ELEMENT_NODE, pi->GetName() );
-                                       pi->GetAccessor()->WriteValue(pnode, obj ) ;
-                                       onode->AddChild(pnode);
-                               }
-                       }
-               }
-               pi = pi->GetNext() ;
-       }
-       const wxClassInfo** parents = ci->GetParents() ;
-       for ( int i = 0 ; parents[i] ; ++ i )
-       {
-               WriteComponentProperties( obj , parents[i] , onode , nextId , writtenObjects , writtenProperties ) ;
-       }
+wxWriter::wxWriter()
+{
+    m_data = new wxWriterInternal ;
+    m_data->m_nextId = 0 ;

 }
 
 }
 

-/*
- Writing Components does have to take inheritance into account, that's why we are iterating
- over our parents as well
- */
-
-void WriteComponent(wxObject *obj, const wxClassInfo *classInfo, wxXmlNode *parent, const wxString &nodeName)
+wxWriter::~wxWriter()

 {
 {

-       int nextid = 0 ; // 0 is the root element
-       map< wxObject* , int > writtenobjects ;
-       WriteComponent( obj , classInfo, parent, nodeName , nextid , writtenobjects ) ;
+    delete m_data ;

 }
 
 }
 

-void WriteComponent(wxObject *obj, const wxClassInfo *classInfo, wxXmlNode *parent, const wxString& nodeName , int &nextId, map< wxObject* , int > &writtenObjects ) 
+struct wxWriter::wxWriterInternalPropertiesData
+{
+    char nothing ;
+} ;
+
+void wxWriter::ClearObjectContext()

 {
 {

-       map< string , int > writtenProperties ;
-       wxXmlNode *onode;
+    delete m_data ;
+    m_data = new wxWriterInternal() ;
+    m_data->m_nextId = 0 ;
+}

 
 

-    onode = new wxXmlNode(wxXML_ELEMENT_NODE, nodeName);
+void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , const wxString &name , wxxVariantArray &metadata )
+{
+    DoBeginWriteTopLevelEntry( name ) ;
+    WriteObject( object , classInfo , persister , false , metadata) ;
+    DoEndWriteTopLevelEntry( name ) ;
+}

 
 

-       onode->AddProperty(wxString("class"), wxString(classInfo->GetClassName()));
-       if ( obj == NULL )
-       {
-           wxXmlNode* nullnode = new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, "null");
-           onode->AddChild(nullnode);
-       }
-       else
-       {
-               // if we have already written this object, just insert an id
-               if ( writtenObjects.find( obj ) != writtenObjects.end() )
-               {
-                       onode->AddProperty(wxString("id"), wxString::Format( "%d" , writtenObjects[obj] ) );
-               }
-               else
-               {
-                       int id = nextId++ ;
-                       writtenObjects[obj] = id ;
-                       onode->AddProperty(wxString("id"), wxString::Format( "%d" , id ) );
-                       WriteComponentProperties( obj , classInfo , onode , nextId , writtenObjects, writtenProperties) ;
-               }
-       }
+void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , bool isEmbedded, wxxVariantArray &metadata )
+{
+    if ( !classInfo->BeforeWriteObject( object , this , persister , metadata) )
+        return ;

 
 

-       parent->AddChild(onode);
+    if ( persister->BeforeWriteObject( this , object , classInfo , metadata) )
+    {
+        if ( object == NULL )
+            DoWriteNullObject() ;
+        else if ( IsObjectKnown( object ) )
+            DoWriteRepeatedObject( GetObjectID(object) ) ;
+        else
+        {
+            int oid = m_data->m_nextId++ ;
+            if ( !isEmbedded )
+                m_data->m_writtenObjects[object] = oid ;
+
+            // in case this object is a wxDynamicObject we also have to insert is superclass
+            // instance with the same id, so that object relations are streamed out correctly
+            const wxDynamicObject* dynobj = dynamic_cast<const wxDynamicObject *>( object ) ;
+            if ( !isEmbedded && dynobj )
+                m_data->m_writtenObjects[dynobj->GetSuperClassInstance()] = oid ;
+
+            DoBeginWriteObject( object , classInfo , oid , metadata ) ;
+            wxWriterInternalPropertiesData data ;
+            WriteAllProperties( object , classInfo , persister , &data ) ;
+            DoEndWriteObject( object , classInfo , oid  ) ;
+        }
+        persister->AfterWriteObject( this ,object , classInfo ) ;
+    }

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// reading xml in 
-// ----------------------------------------------------------------------------
+void wxWriter::FindConnectEntry(const wxEvtHandler * evSource,const wxDelegateTypeInfo* dti, const wxObject* &sink , const wxHandlerInfo *&handler)
+{
+    wxList *dynamicEvents = evSource->GetDynamicEventTable() ;

 
 

-wxxVariant wxReader::ReadPropertyValueNoAssign(wxXmlNode *Node,
-                                     wxClassInfo *ClassInfo,
-                                         const wxPropertyInfo * &pi ,
-                                     wxIDepersist *Callbacks)
+    if ( dynamicEvents )
+    {
+        wxList::compatibility_iterator node = dynamicEvents->GetFirst();
+        while (node)
+        {
+            wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
+
+            // find the match
+            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() ;
+                const wxHandlerInfo* sinkHandler = sinkClassInfo->GetFirstHandler() ;
+                while ( sinkHandler )
+                {
+                    if ( sinkHandler->GetEventFunction() == entry->m_fn )
+                    {
+                        handler = sinkHandler ;
+                        break ;
+                    }
+                    sinkHandler = sinkHandler->GetNext() ;
+                }
+                break ;
+            }
+            node = node->GetNext();
+        }
+    }
+}
+void wxWriter::WriteAllProperties( const wxObject * obj , const wxClassInfo* ci , wxPersister *persister, wxWriterInternalPropertiesData * data )

 {
 {

-    wxxVariant res;
-    int ChildID;
+    wxPropertyInfoMap map ;
+    ci->GetProperties( map ) ;
+    for ( int i = 0 ; i < ci->GetCreateParamCount() ; ++i )
+    {
+        wxString name = ci->GetCreateParamName(i) ;
+        const wxPropertyInfo* prop = map.find(name)->second ;
+        if ( prop )
+        {
+            WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ;
+        }
+        else
+        {
+            wxLogError( _("Create Parameter not found in declared RTTI Parameters") ) ;
+        }
+        map.erase( name ) ;
+    }
+    { // Extra block for broken compilers
+        for( wxPropertyInfoMap::iterator iter = map.begin() ; iter != map.end() ; ++iter )
+        {
+            const wxPropertyInfo* prop = iter->second ;
+            if ( prop->GetFlags() & wxPROP_OBJECT_GRAPH )
+            {
+                WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ;
+            }
+        }
+    }
+    { // Extra block for broken compilers
+        for( wxPropertyInfoMap::iterator iter = map.begin() ; iter != map.end() ; ++iter )
+        {
+            const wxPropertyInfo* prop = iter->second ;
+            if ( !(prop->GetFlags() & wxPROP_OBJECT_GRAPH) )
+            {
+                WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ;
+            }
+        }
+    }
+}

 
 

-    // form is:
-    // <propname type=foo>value</propname>
+void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , const wxPropertyInfo* pi , wxPersister *persister , wxWriterInternalPropertiesData *WXUNUSED(data) )
+{
+    if ( pi->GetFlags() & wxPROP_DONT_STREAM )
+        return ;

 
 

-    //ISSUE: NULL component references are streamed out as "null" text
-    // node.  This is not in keeping with the XML mindset.
+    // 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<const wxDynamicClassInfo*>(ci) == NULL) )
+        obj = dynobj->GetSuperClassInstance() ;

 
 

-    pi = ClassInfo->FindPropertyInfo(Node->GetName());
-    if (!pi)
+    if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION )

     {
     {

-       // error handling, please
-       assert(!"Property not found in extended class info");
+        wxxVariantArray data ;
+        pi->GetAccessor()->GetPropertyCollection(obj, data) ;
+        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 , obj, pi , value ) )
+            {
+                const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( elementType ) ;
+                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
+                {
+                    DoWriteSimpleType( value ) ;
+                }
+            }
+            DoEndWriteElement() ;
+            if ( i == data.GetCount() - 1 )
+                 DoEndWriteProperty( pi ) ;
+       }
+   }
+    else
+    {
+        const wxDelegateTypeInfo* dti = dynamic_cast< const wxDelegateTypeInfo* > ( pi->GetTypeInfo() ) ;
+        if ( dti )
+        {
+            const wxObject* sink = NULL ;
+            const wxHandlerInfo *handler = NULL ;
+
+            const wxEvtHandler * evSource = dynamic_cast<const wxEvtHandler *>(obj) ;
+            if ( evSource )
+            {
+                FindConnectEntry( evSource , dti , sink , handler ) ;
+                if ( persister->BeforeWriteDelegate( this , obj , ci , pi , sink , 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) ;
+
+            // avoid streaming out void objects
+            if( value.IsEmpty() )
+                return ;
+
+            if ( pi->GetFlags() & wxPROP_ENUM_STORE_LONG )
+            {
+                const wxEnumTypeInfo *eti = dynamic_cast<const wxEnumTypeInfo*>( 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() )
+            {
+                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 ) ;
+                    if ( vobj && pi->GetTypeInfo()->HasStringConverters() )
+                    {
+                        wxString stringValue ;
+                        cti->ConvertToString( value , stringValue ) ;
+                        wxxVariant convertedValue(stringValue) ;
+                        DoWriteSimpleType( convertedValue ) ;
+                    }
+                    else
+                    {
+                        wxxVariantArray md ;
+                        WriteObject( vobj , (vobj ? vobj->GetClassInfo() : pci ) , persister , cti->GetKind()== wxT_OBJECT , md) ;
+                    }
+                }
+                else
+                {
+                    DoWriteSimpleType( value ) ;
+                }
+                DoEndWriteProperty( pi ) ;
+            }
+        }

     }
     }

+}

 
 

-       const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( pi->GetTypeInfo() ) ;
-       if ( cti )
-       {
-               const wxClassInfo* eci = cti->GetClassInfo() ;
-
-               ChildID = ReadComponent(Node , Callbacks);
-               if (ChildID != -1)
-               {
-                       if (genCode)
-                               res = wxxVariant(GetObjectName(ChildID));
-                       else
-                               res = eci->InstanceToVariant(GetObject(ChildID));
-               }
-               else
-               {
-                       if (genCode)
-                               res = wxxVariant(wxString("NULL"));
-                       else
-                               res = eci->InstanceToVariant(NULL);
-               }
-       }
-       else
-       {
-               const wxDelegateTypeInfo* dti = dynamic_cast< const wxDelegateTypeInfo* > ( pi->GetTypeInfo() ) ;
-               if ( dti )
-               {
-                       if (genCode)
-                       {
-                               // in which form should we code these ?
-                               res = wxxVariant( wxXmlGetContentFromNode(Node) ) ;
-                       }
-                       else
-                       {
-                               res = wxxVariant( wxXmlGetContentFromNode(Node) ) ;
-                       }
-               }
-               else
-               {
-                       if (genCode)
-                       {
-                               if ( pi->GetTypeInfo()->GetKind() == wxT_STRING )
-                                       res = wxxVariant( wxString::Format("wxString(\"%s\")",wxXmlGetContentFromNode(Node)));
-                               else
-                                       res = wxxVariant( wxString::Format("%s(%s)",pi->GetTypeName(),wxXmlGetContentFromNode(Node) ) );
-                       }
-                       else
-                               res = pi->GetAccessor()->ReadValue(Node) ;
-               }
-       }
-       return res ;
-}
-
-void wxReader::ReadPropertyValue(wxXmlNode *Node,
-                                     wxClassInfo *ClassInfo,
-                                         int ObjectID ,
-                                     wxIDepersist *Callbacks)
-{
-       const wxPropertyInfo *pi;
-       wxxVariant res = ReadPropertyValueNoAssign( Node , ClassInfo, pi , Callbacks ) ;
-
-       const wxDelegateTypeInfo* dti = dynamic_cast< const wxDelegateTypeInfo* > ( pi->GetTypeInfo() ) ;
-
-       if ( dti )
-       {
-               wxString resstring = res.Get<wxString>() ;
-               wxInt32 pos = resstring.Find('.') ;
-               assert( pos != wxNOT_FOUND ) ;
-               int handlerOid = atol(resstring.Left(pos)) ;
-               wxString handlerName = resstring.Mid(pos+1) ;
-               
-               if (Callbacks)
-                       Callbacks->SetConnect( ObjectID , ClassInfo , dti->GetEventType() , handlerName , handlerOid ) ;
-       }
-       else
-       {
-               if (Callbacks)
-                       Callbacks->SetProperty(ObjectID, ClassInfo, pi , res);
-       }
+int wxWriter::GetObjectID(const wxObject *obj)
+{
+    if ( !IsObjectKnown( obj ) )
+        return wxInvalidObjectID ;
+
+    return m_data->m_writtenObjects[obj] ;
+}
+
+bool wxWriter::IsObjectKnown( const wxObject *obj )
+{
+    return m_data->m_writtenObjects.find( obj ) != m_data->m_writtenObjects.end() ;

 }
 
 }
 

+
+// ----------------------------------------------------------------------------
+// reading objects in
+// ----------------------------------------------------------------------------
+

 struct wxReader::wxReaderInternal
 {
 struct wxReader::wxReaderInternal
 {

-    /*
-       Code streamer will be storing names here.  Runtime object streamer
-       will be storing actual pointers to objects here.  The two are never
-       mixed.  So the Objects array either has data, or the ObjectNames
-       array has data.  Never both. Keyed by ObjectID (int)
-    */
-    map<int,wxObject *> Objects;
-
-    map<int,string> ObjectNames;
-       // only used when generating code, since the names loose the type info
-    map<int,wxClassInfo*> ObjectClasses;
+    map<int,wxClassInfo*> m_classInfos;

 };
 
 };
 

-wxReader::wxReader(bool GenerateCode) : genCode(GenerateCode)
+wxReader::wxReader()

 {
 {

-    Data = new wxReaderInternal;
+    m_data = new wxReaderInternal;

 }
 
 wxReader::~wxReader()
 {
 }
 
 wxReader::~wxReader()
 {

-    delete Data;
+    delete m_data;

 }
 
 }
 

-wxObject *wxReader::GetObject(int id)
+wxClassInfo* wxReader::GetObjectClassInfo(int objectID)

 {
 {

-    assert( Data->Objects.find(id) != Data->Objects.end() );
-    return Data->Objects[id];
+    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] ;

 }
 
 }
 

-wxString wxReader::GetObjectName(int id)
+void wxReader::SetObjectClassInfo(int objectID, wxClassInfo *classInfo )

 {
 {

-    assert( Data->ObjectNames.find(id) != Data->ObjectNames.end() );
-    return wxString(Data->ObjectNames[id].c_str());
+    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 ;

 }
 
 }
 

-wxClassInfo* wxReader::GetObjectClassInfo(int id)
+bool wxReader::HasObjectClassInfo( int objectID )

 {
 {

-    assert( Data->ObjectClasses.find(id) != Data->ObjectClasses.end() );
-    return Data->ObjectClasses[id] ;
+    if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
+    {
+        wxLogError( _("Invalid or Null Object ID passed to HasObjectClassInfo" ) ) ;
+        return false ;
+    }
+    return m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() ;

 }
 
 }
 

-void wxReader::SetObject(int id, wxObject *Object)
+
+// ----------------------------------------------------------------------------
+// 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
+*/
+
+
+// ----------------------------------------------------------------------------
+// depersisting to memory
+// ----------------------------------------------------------------------------
+
+struct wxRuntimeDepersister::wxRuntimeDepersisterInternal

 {
 {

-       assert(  Data->Objects.find(id) == Data->Objects.end()  ) ;
-    Data->Objects[id] = Object;
+    map<int,wxObject *> m_objects;
+
+    void SetObject(int objectID, wxObject *obj )
+    {
+        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 ;
+        }
+
+        return m_objects[objectID] ;
+    }
+} ;
+
+wxRuntimeDepersister::wxRuntimeDepersister()
+{
+    m_data = new wxRuntimeDepersisterInternal() ;

 }
 
 }
 

-void wxReader::SetObjectName(int id, const wxString &Name, wxClassInfo *ClassInfo )
+wxRuntimeDepersister::~wxRuntimeDepersister()

 {
 {

-       assert(  Data->ObjectNames.find(id) == Data->ObjectNames.end()  ) ;
-    Data->ObjectNames[id] = (const char *)Name;
-       Data->ObjectClasses[id] = ClassInfo ;
+    delete m_data ;

 }
 
 }
 

-/* 
-       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
-*/
+void wxRuntimeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo ,
+                                          wxxVariantArray &WXUNUSED(metadata))
+{
+    wxObject *O;
+    O = classInfo->CreateObject();
+    m_data->SetObject(objectID, O);
+}

 
 

-int wxReader::ReadComponent(wxXmlNode *Node, wxIDepersist *Callbacks)
+void wxRuntimeDepersister::CreateObject(int objectID,
+                                        const wxClassInfo *classInfo,
+                                        int paramCount,
+                                        wxxVariant *params,
+                                        int *objectIdValues,
+                                        const wxClassInfo **objectClassInfos ,
+                                        wxxVariantArray &WXUNUSED(metadata))

 {
 {

-    wxString ClassName;
-    wxClassInfo *ClassInfo;
+    wxObject *o;
+    o = m_data->GetObject(objectID);
+    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) ;
+        }
+    }
+    classInfo->Create(o, paramCount, params);
+}

 
 

-       wxxVariant *CreateParams ;
-    wxXmlNode *Children;
-    int ObjectID;
+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);
+}

 
 

-    Callbacks->NotifyReader(this);

 
 

-    Children = Node->GetChildren();
-    if (!Node->GetPropVal("class", &ClassName))
+void wxRuntimeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo))
+{
+    wxObject *o;
+    o = m_data->GetObject(objectID);
+    delete o ;
+}
+
+void wxRuntimeDepersister::SetProperty(int objectID,
+                                       const wxClassInfo *classInfo,
+                                       const wxPropertyInfo* propertyInfo,
+                                       const wxxVariant &value)
+{
+    wxObject *o;
+    o = m_data->GetObject(objectID);
+    classInfo->SetProperty( o , propertyInfo->GetName() , value ) ;
+}
+
+void wxRuntimeDepersister::SetPropertyAsObject(int objectID,
+                                               const wxClassInfo *classInfo,
+                                               const wxPropertyInfo* propertyInfo,
+                                               int valueObjectId)
+{
+    wxObject *o, *valo;
+    o = m_data->GetObject(objectID);
+    valo = m_data->GetObject(valueObjectId);
+    const wxClassInfo* valClassInfo = (dynamic_cast<const wxClassTypeInfo*>(propertyInfo->GetTypeInfo()))->GetClassInfo() ;
+    // if this is a dynamic object and we are asked for another class
+    // than wxDynamicObject we cast it down manually.
+    wxDynamicObject *dynvalo = dynamic_cast< wxDynamicObject * > (valo) ;
+    if ( dynvalo!=NULL  && (valClassInfo != dynvalo->GetClassInfo()) )

     {
     {

-               // No class name.  Eek. FIXME: error handling
-               return -1;
+        valo = dynvalo->GetSuperClassInstance() ;

     }
     }

-       ClassInfo = wxClassInfo::FindClass(ClassName);
-    if (Node->GetType() == wxXML_TEXT_NODE)
+
+    classInfo->SetProperty( o , propertyInfo->GetName() , valClassInfo->InstanceToVariant(valo) ) ;
+}
+
+void wxRuntimeDepersister::SetConnect(int eventSourceObjectID,
+                                      const wxClassInfo *WXUNUSED(eventSourceClassInfo),
+                                      const wxPropertyInfo *delegateInfo ,
+                                      const wxClassInfo *WXUNUSED(eventSinkClassInfo) ,
+                                      const wxHandlerInfo* handlerInfo ,
+                                      int eventSinkObjectID )
+{
+    wxEvtHandler *ehsource = dynamic_cast< wxEvtHandler* >( m_data->GetObject( eventSourceObjectID ) ) ;
+    wxEvtHandler *ehsink = dynamic_cast< wxEvtHandler *>(m_data->GetObject(eventSinkObjectID) ) ;
+
+    if ( ehsource && ehsink )

     {
     {

-               assert( wxXmlGetContentFromNode(Node) == "null" ) ;
-               // this must be a NULL component reference.  We just bail out
-               return -1;
-       }
+        const wxDelegateTypeInfo *delegateTypeInfo = dynamic_cast<const wxDelegateTypeInfo*>(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 ) ;
+            }
+        }
+    }
+}

 
 

-       wxString ObjectIdString ;
-    if (!Node->GetPropVal("id", &ObjectIdString))
+wxObject *wxRuntimeDepersister::GetObject(int objectID)
+{
+    return m_data->GetObject( objectID ) ;
+}
+
+// adds an element to a property collection
+void wxRuntimeDepersister::AddToPropertyCollection( int objectID ,
+                                                   const wxClassInfo *classInfo,
+                                                   const wxPropertyInfo* propertyInfo ,
+                                                   const wxxVariant &value)
+{
+    wxObject *o;
+    o = m_data->GetObject(objectID);
+    classInfo->AddToPropertyCollection( o , propertyInfo->GetName() , value ) ;
+}
+
+// sets the corresponding property (value is an object)
+void wxRuntimeDepersister::AddToPropertyCollectionAsObject(int objectID,
+                                                           const wxClassInfo *classInfo,
+                                                           const wxPropertyInfo* propertyInfo ,
+                                                           int valueObjectId)
+{
+    wxObject *o, *valo;
+    o = m_data->GetObject(objectID);
+    valo = m_data->GetObject(valueObjectId);
+    const wxCollectionTypeInfo * collectionTypeInfo = dynamic_cast< const wxCollectionTypeInfo * >(propertyInfo->GetTypeInfo() ) ;
+    const wxClassInfo* valClassInfo = (dynamic_cast<const wxClassTypeInfo*>(collectionTypeInfo->GetElementType()))->GetClassInfo() ;
+    // if this is a dynamic object and we are asked for another class
+    // than wxDynamicObject we cast it down manually.
+    wxDynamicObject *dynvalo = dynamic_cast< wxDynamicObject * > (valo) ;
+    if ( dynvalo!=NULL  && (valClassInfo != dynvalo->GetClassInfo()) )

     {
     {

-               // No object id.  Eek. FIXME: error handling
-               return -1;
+        valo = dynvalo->GetSuperClassInstance() ;

     }
 
     }
 

-    ObjectID = atoi( ObjectIdString.c_str() ) ;
-       // is this object already has been streamed in, return it here
-       if ( genCode )
-       {
-               if ( Data->ObjectNames.find( ObjectID ) != Data->ObjectNames.end() )
-                       return ObjectID ;
-       }
-       else
-       {
-               if ( Data->Objects.find( ObjectID ) != Data->Objects.end() )
-                       return ObjectID ;
-       }
-
-       // new object, start with allocation
-    Callbacks->AllocateObject(ObjectID, ClassInfo);
-
-       // 
-    // stream back the Create parameters first
-       CreateParams = new wxxVariant[ ClassInfo->GetCreateParamCount() ] ;
-
-       typedef map<string, wxXmlNode *> PropertyNodes ;
-       typedef vector<string> PropertyNames ;
-
-       PropertyNodes propertyNodes ;
-       PropertyNames propertyNames ;
-
-       while( Children )
-       {
-               propertyNames.push_back( Children->GetName().c_str() ) ;
-               propertyNodes[Children->GetName().c_str()] = Children ;
-               Children = Children->GetNext() ;
-       }
-
-       for ( int i = 0 ; i <ClassInfo->GetCreateParamCount() ; ++i )
-       {
-               const wxChar* paramName = ClassInfo->GetCreateParamName(i) ;
-               PropertyNodes::iterator propiter = propertyNodes.find( 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 ;
-                       wxPropertyInfo* pi ;
-                       CreateParams[i] = ReadPropertyValueNoAssign( prop , ClassInfo , pi , Callbacks ) ;
-                       // CreateParams[i] = ClassInfo->FindPropertyInfo( ClassInfo->GetCreateParamName(i) ->GetAccessor()->ReadValue( prop ) ;
-                       for ( size_t j = 0 ; j < propertyNames.size() ; ++j )
-                       {
-                               if ( propertyNames[j] == paramName )
-                               {
-                                       propertyNames[j] = "" ;
-                                       break ;
-                               }
-                       }
-               }
-               else
-               {
-                       CreateParams[i] = ClassInfo->FindPropertyInfo( paramName )->GetDefaultValue() ;
-               }
-       }
-
-    // got the parameters.  Call the Create method
-    Callbacks->CreateObject(ObjectID,
-                           ClassInfo,
-                           ClassInfo->GetCreateParamCount(),
-                           &CreateParams[0]);
-
-    // 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 ;
-                               string name = propiter->first ;
-                               ReadPropertyValue( prop , ClassInfo , ObjectID , Callbacks  ) ;
-                       }
-               }
-       }
-       /*
-       for( PropertyNodes::iterator propiter = propertyNodes.begin() ; propiter != propertyNodes.end() ; propiter++ )
-       {
-               wxXmlNode* prop = propiter->second ;
-               string name = propiter->first ;
-               ReadPropertyValue( prop , ClassInfo , ObjectID , Callbacks  ) ;
-       }
-       */
-
-    // FIXME: if the list of children is not NULL now, then that means that
-    // there were properties in the XML not represented in the meta data
-    // this just needs error handling.
-    assert(!Children);
-
-       delete[] CreateParams ;
-
-    return ObjectID;
+    classInfo->AddToPropertyCollection( o , propertyInfo->GetName() , valClassInfo->InstanceToVariant(valo) ) ;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// depersisting to memory 
+// depersisting to code

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxIDepersistRuntime::AllocateObject(int ObjectID, wxClassInfo *ClassInfo)
+struct wxCodeDepersister::wxCodeDepersisterInternal

 {
 {

-    wxObject *O;
-    O = ClassInfo->CreateObject();
-    Reader->SetObject(ObjectID, O);
-}
+#if wxUSE_UNICODE
+    map<int,wstring> m_objectNames ;
+#else
+    map<int,string> m_objectNames ;
+#endif

 
 

-void wxIDepersistRuntime::CreateObject(int ObjectID,
-                                      wxClassInfo *ClassInfo,
-                                      int ParamCount,
-                                          wxxVariant *Params)
+    void SetObjectName(int objectID, const wxString &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 wxT("NULL") ;
+
+        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)
+: m_fp(out)

 {
 {

-    wxObject *O;
-    O = Reader->GetObject(ObjectID);
-    ClassInfo->Create(O, ParamCount, Params);
+    m_data = new wxCodeDepersisterInternal ;

 }
 
 }
 

-void wxIDepersistRuntime::SetProperty(int ObjectID,
-                                     wxClassInfo *WXUNUSED(ClassInfo),
-                                     const wxPropertyInfo* PropertyInfo,
-                                     const wxxVariant &Value)
+wxCodeDepersister::~wxCodeDepersister()

 {
 {

-    wxObject *O;
-    O = Reader->GetObject(ObjectID);
-       PropertyInfo->GetAccessor()->SetProperty( O , Value ) ;
+    delete m_data ;

 }
 
 }
 

-void wxIDepersistRuntime::SetConnect(int EventSourceObjectID,
-                            wxClassInfo *WXUNUSED(EventSourceClassInfo),
-                                int eventType ,
-                                const wxString &handlerName ,
-                                int EventSinkObjectID ) 
+void wxCodeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo ,
+                                       wxxVariantArray &WXUNUSED(metadata))

 {
 {

-               wxWindow *ehsource = dynamic_cast< wxWindow* >( Reader->GetObject( EventSourceObjectID ) ) ;
-               wxEvtHandler *ehsink = dynamic_cast< wxEvtHandler *>(Reader->GetObject(EventSinkObjectID) ) ;
-
-               if ( ehsource && ehsink )
-               {
-                       ehsource->Connect( ehsource->GetId() , eventType , 
-                               ehsink->GetClassInfo()->FindHandlerInfo(handlerName)->GetEventFunction() , NULL /*user data*/ , 
-                               ehsink ) ;
-               }
+    wxString objectName = wxString::Format( wxT("LocalObject_%d") , objectID ) ;
+    m_fp->WriteString( wxString::Format( wxT("\t%s *%s = new %s;\n"),
+        classInfo->GetClassName(),
+        objectName.c_str(),
+        classInfo->GetClassName()) );
+    m_data->SetObjectName( objectID , objectName ) ;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// depersisting to code 
-// ----------------------------------------------------------------------------
+void wxCodeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo))
+{
+    m_fp->WriteString( wxString::Format( wxT("\tdelete %s;\n"),
+        m_data->GetObjectName( objectID).c_str() ) );
+}

 
 

+wxString wxCodeDepersister::ValueAsCode( const wxxVariant &param )
+{
+    wxString value ;
+    const wxTypeInfo* type = param.GetTypeInfo() ;
+    if ( type->GetKind() == wxT_CUSTOM )
+    {
+        const wxCustomTypeInfo* cti = dynamic_cast<const wxCustomTypeInfo*>(type) ;
+        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( wxT("\"%s\""),param.GetAsString().c_str() );
+    }
+    else
+    {
+        value.Printf( wxT("%s"), param.GetAsString().c_str() );
+    }
+    return value ;
+}

 
 

-void wxIDepersistCode::AllocateObject(int ObjectID, wxClassInfo *ClassInfo)
+void wxCodeDepersister::CreateObject(int objectID,
+                                     const wxClassInfo *WXUNUSED(classInfo),
+                                     int paramCount,
+                                     wxxVariant *params,
+                                     int *objectIDValues,
+                                     const wxClassInfo **WXUNUSED(objectClassInfos) ,
+                                     wxxVariantArray &WXUNUSED(metadata)
+                                     )

 {
 {

-       wxString objectName = wxString::Format( "LocalObject_%d" , ObjectID ) ;
-       fp->WriteString( wxString::Format( "\t%s *%s = new %s;\n",
-           ClassInfo->GetClassName(),
-           objectName,
-           ClassInfo->GetClassName()) );
-    Reader->SetObjectName(ObjectID, objectName, ClassInfo);
+    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 wxIDepersistCode::CreateObject(int ObjectID,
-                                   wxClassInfo *WXUNUSED(ClassInfo),
-                                   int ParamCount,
-                                   wxxVariant *Params)
+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;
     int i;

-       fp->WriteString( wxString::Format( "\t%s->Create(", Reader->GetObjectName(ObjectID) ) );
-    for (i = 0; i < ParamCount; i++)
+    for (i = 0; i < paramCount; i++)

     {
     {

-               fp->WriteString( wxString::Format( "%s", (const char *)Params[i].Get<wxString>() ) );
-               if (i < ParamCount - 1)
-                       fp->WriteString( ", ");
+        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(", ") );

     }
     }

-    fp->WriteString( ");\n");
+    m_fp->WriteString( wxT(");\n") );

 }
 
 }
 

-void wxIDepersistCode::SetProperty(int ObjectID,
-                                  wxClassInfo *WXUNUSED(ClassInfo),
-                                  const wxPropertyInfo* PropertyInfo,
-                                  const wxxVariant &Value)
+void wxCodeDepersister::SetProperty(int objectID,
+                                    const wxClassInfo *WXUNUSED(classInfo),
+                                    const wxPropertyInfo* propertyInfo,
+                                    const wxxVariant &value)

 {
 {

-       wxString d = Value.Get<wxString>() ;
-    fp->WriteString( wxString::Format( "\t%s->%s(%s);\n",
-           Reader->GetObjectName(ObjectID),
-           PropertyInfo->GetAccessor()->GetSetterName(),
-           d) );
+    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 wxIDepersistCode::SetConnect(int EventSourceObjectID,
-                            wxClassInfo *WXUNUSED(EventSourceClassInfo),
-                                int eventType ,
-                                const wxString &handlerName ,
-                                int EventSinkObjectID ) 
+void wxCodeDepersister::SetPropertyAsObject(int objectID,
+                                            const wxClassInfo *WXUNUSED(classInfo),
+                                            const wxPropertyInfo* propertyInfo,
+                                            int valueObjectId)

 {
 {

-       wxString ehsource = Reader->GetObjectName( EventSourceObjectID ) ;
-       wxString ehsink = Reader->GetObjectName(EventSinkObjectID) ;
-       wxString ehsinkClass = Reader->GetObjectClassInfo(EventSinkObjectID)->GetClassName() ;
+    if ( propertyInfo->GetTypeInfo()->GetKind() == wxT_OBJECT )
+        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( wxT("\t%s->%s(%s);\n"),
+        m_data->GetObjectName(objectID).c_str(),
+        propertyInfo->GetAccessor()->GetSetterName().c_str(),
+        m_data->GetObjectName( valueObjectId).c_str() ) );
+}

 
 

-       fp->WriteString( wxString::Format(  "\t%s->Connect( %s->GetId() , %d , (wxObjectEventFunction)(wxEventFunction) & %s::%s , NULL , %s ) ;" , 
-               ehsource , ehsource , eventType , ehsinkClass , handlerName , ehsink ) );
+void wxCodeDepersister::AddToPropertyCollection( int objectID ,
+                                                const wxClassInfo *WXUNUSED(classInfo),
+                                                const wxPropertyInfo* propertyInfo ,
+                                                const wxxVariant &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()) );

 }
 
 }
 

-#endif
+// sets the corresponding property (value is an object)
+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 wxPropertyInfo *delegateInfo ,
+                                   const wxClassInfo *eventSinkClassInfo ,
+                                   const wxHandlerInfo* handlerInfo ,
+                                   int eventSinkObjectID )
+{
+    wxString ehsource = m_data->GetObjectName( eventSourceObjectID ) ;
+    wxString ehsink = m_data->GetObjectName(eventSinkObjectID) ;
+    wxString ehsinkClass = eventSinkClassInfo->GetClassName() ;
+    const wxDelegateTypeInfo *delegateTypeInfo = dynamic_cast<const wxDelegateTypeInfo*>(delegateInfo->GetTypeInfo());
+    if ( delegateTypeInfo )
+    {
+        int eventType = delegateTypeInfo->GetEventType() ;
+        wxString handlerName = handlerInfo->GetName() ;
+
+        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 "wx/arrimpl.cpp"
+
+WX_DEFINE_OBJARRAY(wxxVariantArray);
+
+#endif // wxUSE_EXTENDED_RTTI