X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70e881039bfeab2f3cdd42ea8093f7313c5623a6..d485bda109d5ef0fef36a3f737549e9b9f54baab:/src/common/xtistrm.cpp

diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp
index 146dca7b48..ed4a7a557c 100644
--- a/src/common/xtistrm.cpp
+++ b/src/common/xtistrm.cpp
@@ -1,532 +1,681 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xtistrm.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_EXTENDED_RTTI
+
+#include "wx/xtistrm.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/hash.h"
     #include "wx/object.h"
+    #include "wx/hash.h"
+    #include "wx/event.h"
 #endif
 
-#include "wx/xml/xml.h"
 #include "wx/tokenzr.h"
-#include "wx/xtistrm.h"
 #include "wx/txtstrm.h"
 
-#if wxUSE_EXTENDED_RTTI
+// STL headers:
+
+#include "wx/beforestd.h"
 #include <map>
 #include <vector>
 #include <string>
+#include "wx/afterstd.h"
+using namespace std;
 
-using namespace std ;
 
 // ----------------------------------------------------------------------------
-// streaming xml out 
+// wxObjectWriter
 // ----------------------------------------------------------------------------
 
-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 ) ;
-	}
-}
-
-/*
- Writing Components does have to take inheritance into account, that's why we are iterating
- over our parents as well
- */
+struct wxObjectWriter::wxObjectWriterInternal
+{
+    map< const wxObject*, int > m_writtenObjects;
+    int m_nextId;
+};
 
-void WriteComponent(wxObject *obj, const wxClassInfo *classInfo, wxXmlNode *parent, const wxString &nodeName)
+wxObjectWriter::wxObjectWriter()
 {
-	int nextid = 0 ; // 0 is the root element
-	map< wxObject* , int > writtenobjects ;
-	WriteComponent( obj , classInfo, parent, nodeName , nextid , writtenobjects ) ;
+    m_data = new wxObjectWriterInternal;
+    m_data->m_nextId = 0;
 }
 
-void WriteComponent(wxObject *obj, const wxClassInfo *classInfo, wxXmlNode *parent, const wxString& nodeName , int &nextId, map< wxObject* , int > &writtenObjects ) 
-{
-	map< string , int > writtenProperties ;
-	wxXmlNode *onode;
-
-    onode = new wxXmlNode(wxXML_ELEMENT_NODE, nodeName);
-
-	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) ;
-		}
-	}
-
-	parent->AddChild(onode);
+wxObjectWriter::~wxObjectWriter()
+{
+    delete m_data;
 }
 
-// ----------------------------------------------------------------------------
-// reading xml in 
-// ----------------------------------------------------------------------------
+struct wxObjectWriter::wxObjectWriterInternalPropertiesData
+{
+    char nothing;
+};
 
-wxxVariant wxReader::ReadPropertyValueNoAssign(wxXmlNode *Node,
-				      wxClassInfo *ClassInfo,
-					  const wxPropertyInfo * &pi ,
-				      wxIDepersist *Callbacks)
+void wxObjectWriter::ClearObjectContext()
 {
-    wxxVariant res;
-    int ChildID;
+    delete m_data;
+    m_data = new wxObjectWriterInternal();
+    m_data->m_nextId = 0;
+}
 
-    // form is:
-    // <propname type=foo>value</propname>
+void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo, 
+                           wxObjectWriterCallback *writercallback, const wxString &name, 
+                           const wxStringToAnyHashMap &metadata )
+{
+    DoBeginWriteTopLevelEntry( name );
+    WriteObject( object, classInfo, writercallback, false, metadata);
+    DoEndWriteTopLevelEntry( name );
+}
 
-    //ISSUE: NULL component references are streamed out as "null" text
-    // node.  This is not in keeping with the XML mindset.
+void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo, 
+                           wxObjectWriterCallback *writercallback, bool isEmbedded, 
+                           const wxStringToAnyHashMap &metadata )
+{
+    if ( !classInfo->BeforeWriteObject( object, this, writercallback, metadata) )
+        return;
 
-    pi = ClassInfo->FindPropertyInfo(Node->GetName());
-    if (!pi)
+    if ( writercallback->BeforeWriteObject( this, object, classInfo, metadata) )
     {
-	// error handling, please
-	assert(!"Property not found in extended class info");
+        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 = wx_dynamic_cast(const wxDynamicObject*, object);
+            if ( !isEmbedded && dynobj )
+                m_data->m_writtenObjects[dynobj->GetSuperClassInstance()] = oid;
+
+            DoBeginWriteObject( object, classInfo, oid, metadata );
+            wxObjectWriterInternalPropertiesData data;
+            WriteAllProperties( object, classInfo, writercallback, &data );
+            DoEndWriteObject( object, classInfo, oid  );
+        }
+        writercallback->AfterWriteObject( this,object, classInfo );
     }
-
-	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);
-	}
-}
+void wxObjectWriter::FindConnectEntry(const wxEvtHandler * evSource,
+                                const wxEventSourceTypeInfo* dti, 
+                                const wxObject* &sink, 
+                                const wxHandlerInfo *&handler)
+{
+    wxList *dynamicEvents = evSource->GetDynamicEventTable();
 
-struct wxReader::wxReaderInternal
+    if ( dynamicEvents )
+    {
+        for ( wxList::const_iterator node = dynamicEvents->begin(); node != dynamicEvents->end(); ++node )
+        {
+            wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)(*node);
+
+            // find the match
+            if ( entry->m_fn &&
+                (dti->GetEventType() == entry->m_eventType) &&
+                (entry->m_id == -1 ) &&
+                (entry->m_fn->GetEvtHandler() != NULL ) )
+            {
+                sink = entry->m_fn->GetEvtHandler();
+                const wxClassInfo* sinkClassInfo = sink->GetClassInfo();
+                const wxHandlerInfo* sinkHandler = sinkClassInfo->GetFirstHandler();
+                while ( sinkHandler )
+                {
+                    if ( sinkHandler->GetEventFunction() == entry->m_fn->GetEvtMethod() )
+                    {
+                        handler = sinkHandler;
+                        break;
+                    }
+                    sinkHandler = sinkHandler->GetNext();
+                }
+                break;
+            }
+        }
+    }
+}
+void wxObjectWriter::WriteAllProperties( const wxObject * obj, const wxClassInfo* ci, 
+                                   wxObjectWriterCallback *writercallback, 
+                                   wxObjectWriterInternalPropertiesData * data )
 {
-    /*
-	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;
+    wxPropertyInfoMap map;
+    ci->GetProperties( map );
+    for ( int i = 0; i < ci->GetCreateParamCount(); ++i )
+    {
+        wxString name = ci->GetCreateParamName(i);
+        wxPropertyInfoMap::const_iterator iter = map.find(name);
+        const wxPropertyInfo* prop = iter == map.end() ? NULL : iter->second;
+        if ( prop )
+        {
+            WriteOneProperty( obj, prop->GetDeclaringClass(), prop, writercallback, data );
+        }
+        else
+        {
+            wxLogError( _("Create Parameter %s not found in declared RTTI Parameters"), name.c_str() );
+        }
+        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, writercallback, 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, writercallback, data );
+            }
+        }
+    }
+}
 
-    map<int,string> ObjectNames;
-	// only used when generating code, since the names loose the type info
-    map<int,wxClassInfo*> ObjectClasses;
+class WXDLLIMPEXP_BASE wxObjectPropertyWriter: public wxObjectWriterFunctor
+{
+public:
+    wxObjectPropertyWriter(const wxClassTypeInfo* cti,
+        wxObjectWriterCallback *writercallback,
+        wxObjectWriter* writer,
+        wxStringToAnyHashMap &props) : 
+    m_cti(cti),m_persister(writercallback),m_writer(writer),m_props(props)
+    {}
+
+    virtual void operator()(const wxObject *vobj)
+    {
+        m_writer->WriteObject( vobj, (vobj ? vobj->GetClassInfo() : m_cti->GetClassInfo() ), 
+            m_persister, m_cti->GetKind()== wxT_OBJECT, m_props );
+    }
+private:
+    const wxClassTypeInfo* m_cti;
+    wxObjectWriterCallback *m_persister;
+    wxObjectWriter* m_writer;
+    wxStringToAnyHashMap& m_props;
 };
 
-wxReader::wxReader(bool GenerateCode) : genCode(GenerateCode)
+void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* ci, 
+                                 const wxPropertyInfo* pi, wxObjectWriterCallback *writercallback, 
+                                 wxObjectWriterInternalPropertiesData *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 = wx_dynamic_cast(const wxDynamicObject*, obj );
+    if ( dynobj && (wx_dynamic_cast(const wxDynamicClassInfo*, ci) == NULL) )
+        obj = dynobj->GetSuperClassInstance();
+
+    if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION )
+    {
+        wxAnyList data;
+        pi->GetAccessor()->GetPropertyCollection(obj, data);
+        const wxTypeInfo * elementType = 
+            wx_dynamic_cast( const wxCollectionTypeInfo*, pi->GetTypeInfo() )->GetElementType();
+        if ( !data.empty() )
+        {
+            DoBeginWriteProperty( pi );
+            for ( wxAnyList::const_iterator iter = data.begin(); iter != data.end(); ++iter )
+            {
+                DoBeginWriteElement();
+                const wxAny* valptr = *iter;
+                if ( writercallback->BeforeWriteProperty( this, obj, pi, *valptr ) )
+                {
+                    const wxClassTypeInfo* cti = 
+                        wx_dynamic_cast( const wxClassTypeInfo*, elementType );
+                    if ( cti )
+                    {
+                        wxStringToAnyHashMap md;
+                        wxObjectPropertyWriter pw(cti,writercallback,this, md);
+
+                        const wxClassInfo* pci = cti->GetClassInfo();
+                        pci->CallOnAny( *valptr, &pw);
+                    }
+                    else
+                    {
+                        DoWriteSimpleType( *valptr );
+                    }
+                }
+                DoEndWriteElement();
+            }
+            DoEndWriteProperty( pi );
+        }
+    }
+    else
+    {
+        const wxEventSourceTypeInfo* dti = 
+            wx_dynamic_cast( const wxEventSourceTypeInfo* , pi->GetTypeInfo() );
+        if ( dti )
+        {
+            const wxObject* sink = NULL;
+            const wxHandlerInfo *handler = NULL;
+
+            const wxEvtHandler * evSource = wx_dynamic_cast(const wxEvtHandler *, obj);
+            if ( evSource )
+            {
+                FindConnectEntry( evSource, dti, sink, handler );
+                if ( writercallback->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( wxT("Streaming delegates for not already ")
+                                        wxT("streamed objects not yet supported") );
+                        }
+                    }
+                }
+            }
+            else
+            {
+                wxLogError(_("Illegal Object Class (Non-wxEvtHandler) as Event Source") );
+            }
+        }
+        else
+        {
+            wxAny value;
+            pi->GetAccessor()->GetProperty(obj, value);
+
+            // avoid streaming out void objects
+            // TODO Verify
+            if( value.IsNull() )
+                return;
+
+            if ( pi->GetFlags() & wxPROP_ENUM_STORE_LONG )
+            {
+                const wxEnumTypeInfo *eti = 
+                    wx_dynamic_cast(const wxEnumTypeInfo*,  pi->GetTypeInfo() );
+                if ( eti )
+                {
+                    eti->ConvertFromLong( wxANY_AS(value, long ), value );
+                }
+                else
+                {
+                    wxLogError( _("Type must have enum - long conversion") );
+                }
+            }
+
+            // avoid streaming out default values
+            if ( pi->GetTypeInfo()->HasStringConverters() && 
+                 !pi->GetDefaultValue().IsNull() ) // TODO Verify
+            {
+                if ( wxAnyGetAsString(value) == wxAnyGetAsString(pi->GetDefaultValue()) )
+                    return;
+            }
+
+            // avoid streaming out null objects
+            const wxClassTypeInfo* cti = 
+                wx_dynamic_cast( const wxClassTypeInfo* , pi->GetTypeInfo() );
+
+            if ( cti && cti->GetKind() == wxT_OBJECT_PTR && wxAnyGetAsObjectPtr(value) == NULL )
+                return;
+
+            if ( writercallback->BeforeWriteProperty( this, obj, pi, value ) )
+            {
+                DoBeginWriteProperty( pi );
+                if ( cti )
+                {
+                    if ( cti->HasStringConverters() )
+                    {
+                        wxString stringValue;
+                        cti->ConvertToString( value, stringValue );
+                        wxAny convertedValue(stringValue);
+                        DoWriteSimpleType( convertedValue );
+                    }
+                    else
+                    {
+                        wxStringToAnyHashMap md;
+                        wxObjectPropertyWriter pw(cti,writercallback,this, md);
+
+                        const wxClassInfo* pci = cti->GetClassInfo();
+                        pci->CallOnAny(value, &pw);
+                    }
+                }
+                else
+                {
+                    DoWriteSimpleType( value );
+                }
+                DoEndWriteProperty( pi );
+            }
+        }
+    }
+}
+
+int wxObjectWriter::GetObjectID(const wxObject *obj)
 {
-    Data = new wxReaderInternal;
+    if ( !IsObjectKnown( obj ) )
+        return wxInvalidObjectID;
+
+    return m_data->m_writtenObjects[obj];
 }
 
-wxReader::~wxReader()
+bool wxObjectWriter::IsObjectKnown( const wxObject *obj )
 {
-    delete Data;
+    return m_data->m_writtenObjects.find( obj ) != m_data->m_writtenObjects.end();
 }
 
-wxObject *wxReader::GetObject(int id)
+
+// ----------------------------------------------------------------------------
+// wxObjectReader
+// ----------------------------------------------------------------------------
+
+struct wxObjectReader::wxObjectReaderInternal
 {
-    assert( Data->Objects.find(id) != Data->Objects.end() );
-    return Data->Objects[id];
+    map<int,wxClassInfo*> m_classInfos;
+};
+
+wxObjectReader::wxObjectReader()
+{
+    m_data = new wxObjectReaderInternal;
 }
 
-wxString wxReader::GetObjectName(int id)
+wxObjectReader::~wxObjectReader()
 {
-    assert( Data->ObjectNames.find(id) != Data->ObjectNames.end() );
-    return wxString(Data->ObjectNames[id].c_str());
+    delete m_data;
 }
 
-wxClassInfo* wxReader::GetObjectClassInfo(int id)
+wxClassInfo* wxObjectReader::GetObjectClassInfo(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 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::SetObject(int id, wxObject *Object)
+void wxObjectReader::SetObjectClassInfo(int objectID, wxClassInfo *classInfo )
 {
-	assert(  Data->Objects.find(id) == Data->Objects.end()  ) ;
-    Data->Objects[id] = Object;
+    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;
 }
 
-void wxReader::SetObjectName(int id, const wxString &Name, wxClassInfo *ClassInfo )
+bool wxObjectReader::HasObjectClassInfo( int objectID )
 {
-	assert(  Data->ObjectNames.find(id) == Data->ObjectNames.end()  ) ;
-    Data->ObjectNames[id] = (const char *)Name;
-	Data->ObjectClasses[id] = ClassInfo ;
+    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();
 }
 
-/* 
-	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
+
+// ----------------------------------------------------------------------------
+// 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 wxReader::ReadComponent(wxXmlNode *Node, wxIDepersist *Callbacks)
-{
-    wxString ClassName;
-    wxClassInfo *ClassInfo;
 
-	wxxVariant *CreateParams ;
-    wxXmlNode *Children;
-    int ObjectID;
+// ----------------------------------------------------------------------------
+// wxObjectRuntimeReaderCallback - depersisting to memory
+// ----------------------------------------------------------------------------
 
-    Callbacks->NotifyReader(this);
+struct wxObjectRuntimeReaderCallback::wxObjectRuntimeReaderCallbackInternal
+{
+    map<int,wxObject *> m_objects;
 
-    Children = Node->GetChildren();
-    if (!Node->GetPropVal("class", &ClassName))
+    void SetObject(int objectID, wxObject *obj )
     {
-		// No class name.  Eek. FIXME: error handling
-		return -1;
+        if ( m_objects.find(objectID) != m_objects.end() )
+        {
+            wxLogError( _("Passing a already registered object to SetObject") );
+            return ;
+        }
+        m_objects[objectID] = obj;
     }
-	ClassInfo = wxClassInfo::FindClass(ClassName);
-    if (Node->GetType() == wxXML_TEXT_NODE)
-    {
-		assert( wxXmlGetContentFromNode(Node) == "null" ) ;
-		// this must be a NULL component reference.  We just bail out
-		return -1;
-	}
-
- 	wxString ObjectIdString ;
-    if (!Node->GetPropVal("id", &ObjectIdString))
+    wxObject* GetObject( int objectID )
     {
-		// No object id.  Eek. FIXME: error handling
-		return -1;
+        if ( objectID == wxNullObjectID )
+            return NULL;
+        if ( m_objects.find(objectID) == m_objects.end() )
+        {
+            wxLogError( _("Passing an unknown object to GetObject") );
+            return NULL;
+        }
+
+        return m_objects[objectID];
     }
+};
 
-    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;
+wxObjectRuntimeReaderCallback::wxObjectRuntimeReaderCallback()
+{
+    m_data = new wxObjectRuntimeReaderCallbackInternal();
 }
 
-// ----------------------------------------------------------------------------
-// depersisting to memory 
-// ----------------------------------------------------------------------------
-
-void wxIDepersistRuntime::AllocateObject(int ObjectID, wxClassInfo *ClassInfo)
+wxObjectRuntimeReaderCallback::~wxObjectRuntimeReaderCallback()
 {
-    wxObject *O;
-    O = ClassInfo->CreateObject();
-    Reader->SetObject(ObjectID, O);
+    delete m_data;
 }
 
-void wxIDepersistRuntime::CreateObject(int ObjectID,
-				       wxClassInfo *ClassInfo,
-				       int ParamCount,
-					   wxxVariant *Params)
+void wxObjectRuntimeReaderCallback::AllocateObject(int objectID, wxClassInfo *classInfo,
+                                          wxStringToAnyHashMap &WXUNUSED(metadata))
 {
     wxObject *O;
-    O = Reader->GetObject(ObjectID);
-    ClassInfo->Create(O, ParamCount, Params);
+    O = classInfo->CreateObject();
+    m_data->SetObject(objectID, O);
 }
 
-void wxIDepersistRuntime::SetProperty(int ObjectID,
-				      wxClassInfo *WXUNUSED(ClassInfo),
-				      const wxPropertyInfo* PropertyInfo,
-				      const wxxVariant &Value)
+void wxObjectRuntimeReaderCallback::CreateObject(int objectID,
+                                        const wxClassInfo *classInfo,
+                                        int paramCount,
+                                        wxAny *params,
+                                        int *objectIdValues,
+                                        const wxClassInfo **objectClassInfos,
+                                        wxStringToAnyHashMap &WXUNUSED(metadata))
 {
-    wxObject *O;
-    O = Reader->GetObject(ObjectID);
-	PropertyInfo->GetAccessor()->SetProperty( O , Value ) ;
+    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 = wx_dynamic_cast( wxDynamicObject *, o);
+            if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) )
+            {
+                o = dyno->GetSuperClassInstance();
+            }
+            params[i] = objectClassInfos[i]->ObjectPtrToAny(o);
+        }
+    }
+    classInfo->Create(o, paramCount, params);
 }
 
-void wxIDepersistRuntime::SetConnect(int EventSourceObjectID,
-			     wxClassInfo *WXUNUSED(EventSourceClassInfo),
-				 int eventType ,
-				 const wxString &handlerName ,
-				 int EventSinkObjectID ) 
-{
-		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 ) ;
-		}
+void wxObjectRuntimeReaderCallback::ConstructObject(int objectID,
+                                        const wxClassInfo *classInfo,
+                                        int paramCount,
+                                        wxAny *params,
+                                        int *objectIdValues,
+                                        const wxClassInfo **objectClassInfos,
+                                        wxStringToAnyHashMap &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 = wx_dynamic_cast( wxDynamicObject *, o);
+            if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) )
+            {
+                o = dyno->GetSuperClassInstance();
+            }
+            params[i] = objectClassInfos[i]->ObjectPtrToAny(o);
+        }
+    }
+    o = classInfo->ConstructObject(paramCount, params);
+    m_data->SetObject(objectID, o);
 }
 
-// ----------------------------------------------------------------------------
-// depersisting to code 
-// ----------------------------------------------------------------------------
 
+void wxObjectRuntimeReaderCallback::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo))
+{
+    wxObject *o;
+    o = m_data->GetObject(objectID);
+    delete o;
+}
+
+void wxObjectRuntimeReaderCallback::SetProperty(int objectID,
+                                       const wxClassInfo *classInfo,
+                                       const wxPropertyInfo* propertyInfo,
+                                       const wxAny &value)
+{
+    wxObject *o;
+    o = m_data->GetObject(objectID);
+    classInfo->SetProperty( o, propertyInfo->GetName().c_str(), value );
+}
 
-void wxIDepersistCode::AllocateObject(int ObjectID, wxClassInfo *ClassInfo)
+void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID,
+                                               const wxClassInfo *classInfo,
+                                               const wxPropertyInfo* propertyInfo,
+                                               int valueObjectId)
 {
-	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);
+    wxObject *o, *valo;
+    o = m_data->GetObject(objectID);
+    valo = m_data->GetObject(valueObjectId);
+    const wxClassInfo* valClassInfo = 
+        (wx_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 = wx_dynamic_cast( wxDynamicObject *, valo);
+    if ( dynvalo!=NULL  && (valClassInfo != dynvalo->GetClassInfo()) )
+    {
+        valo = dynvalo->GetSuperClassInstance();
+    }
+
+    classInfo->SetProperty( o, propertyInfo->GetName().c_str(),
+                            valClassInfo->ObjectPtrToAny(valo) );
 }
 
-void wxIDepersistCode::CreateObject(int ObjectID,
-				    wxClassInfo *WXUNUSED(ClassInfo),
-				    int ParamCount,
-				    wxxVariant *Params)
+void wxObjectRuntimeReaderCallback::SetConnect(int eventSourceObjectID,
+                                      const wxClassInfo *WXUNUSED(eventSourceClassInfo),
+                                      const wxPropertyInfo *delegateInfo,
+                                      const wxClassInfo *WXUNUSED(eventSinkClassInfo),
+                                      const wxHandlerInfo* handlerInfo,
+                                      int eventSinkObjectID )
 {
-    int i;
-	fp->WriteString( wxString::Format( "\t%s->Create(", Reader->GetObjectName(ObjectID) ) );
-    for (i = 0; i < ParamCount; i++)
+    wxEvtHandler *ehsource = 
+        wx_dynamic_cast( wxEvtHandler* , m_data->GetObject( eventSourceObjectID ) );
+    wxEvtHandler *ehsink = 
+        wx_dynamic_cast( wxEvtHandler *,m_data->GetObject(eventSinkObjectID) );
+
+    if ( ehsource && ehsink )
     {
-		fp->WriteString( wxString::Format( "%s", (const char *)Params[i].Get<wxString>() ) );
-		if (i < ParamCount - 1)
-			fp->WriteString( ", ");
+        const wxEventSourceTypeInfo *delegateTypeInfo = 
+            wx_dynamic_cast(const wxEventSourceTypeInfo*,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 );
+            }
+        }
     }
-    fp->WriteString( ");\n");
 }
 
-void wxIDepersistCode::SetProperty(int ObjectID,
-				   wxClassInfo *WXUNUSED(ClassInfo),
-				   const wxPropertyInfo* PropertyInfo,
-				   const wxxVariant &Value)
+wxObject *wxObjectRuntimeReaderCallback::GetObject(int objectID)
 {
-	wxString d = Value.Get<wxString>() ;
-    fp->WriteString( wxString::Format( "\t%s->%s(%s);\n",
-	    Reader->GetObjectName(ObjectID),
-	    PropertyInfo->GetAccessor()->GetSetterName(),
-	    d) );
+    return m_data->GetObject( objectID );
 }
 
-void wxIDepersistCode::SetConnect(int EventSourceObjectID,
-			     wxClassInfo *WXUNUSED(EventSourceClassInfo),
-				 int eventType ,
-				 const wxString &handlerName ,
-				 int EventSinkObjectID ) 
+void wxObjectRuntimeReaderCallback::AddToPropertyCollection( int objectID,
+                                                   const wxClassInfo *classInfo,
+                                                   const wxPropertyInfo* propertyInfo,
+                                                   const wxAny &value)
 {
-	wxString ehsource = Reader->GetObjectName( EventSourceObjectID ) ;
-	wxString ehsink = Reader->GetObjectName(EventSinkObjectID) ;
-	wxString ehsinkClass = Reader->GetObjectClassInfo(EventSinkObjectID)->GetClassName() ;
+    wxObject *o;
+    o = m_data->GetObject(objectID);
+    classInfo->AddToPropertyCollection( o, propertyInfo->GetName().c_str(), value );
+}
+
+void wxObjectRuntimeReaderCallback::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 = 
+        wx_dynamic_cast( const wxCollectionTypeInfo *, propertyInfo->GetTypeInfo() );
+    const wxClassInfo* valClassInfo = 
+        (wx_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 = wx_dynamic_cast( wxDynamicObject *, valo);
+    if ( dynvalo!=NULL  && (valClassInfo != dynvalo->GetClassInfo()) )
+    {
+        valo = dynvalo->GetSuperClassInstance();
+    }
 
-	fp->WriteString( wxString::Format(  "\t%s->Connect( %s->GetId() , %d , (wxObjectEventFunction)(wxEventFunction) & %s::%s , NULL , %s ) ;" , 
-		ehsource , ehsource , eventType , ehsinkClass , handlerName , ehsink ) );
+    classInfo->AddToPropertyCollection( o, propertyInfo->GetName().c_str(),
+                                        valClassInfo->ObjectPtrToAny(valo) );
 }
 
-#endif
+#endif // wxUSE_EXTENDED_RTTI