/////////////////////////////////////////////////////////////////////////////
// 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
#include "wx/object.h"
#endif
-#include "wx/xml/xml.h"
#include "wx/tokenzr.h"
-#include "wx/xtistrm.h"
#include "wx/txtstrm.h"
+#include "wx/event.h"
#if wxUSE_EXTENDED_RTTI
+
+#include "wx/xtistrm.h"
+
+#include "wx/beforestd.h"
#include <map>
#include <vector>
#include <string>
+#include "wx/afterstd.h"
using namespace std ;
struct wxWriter::wxWriterInternalPropertiesData
{
- map< string , int > m_writtenProperties ;
+ char nothing ;
} ;
-void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , const wxString &name )
+void wxWriter::ClearObjectContext()
{
- if ( persister->BeforeWriteObject( object , classInfo , name ) )
+ delete m_data ;
+ m_data = new wxWriterInternal() ;
+ m_data->m_nextId = 0 ;
+}
+
+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 ) ;
+}
+
+void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , bool isEmbedded, wxxVariantArray &metadata )
+{
+ if ( !classInfo->BeforeWriteObject( object , this , persister , metadata) )
+ return ;
+
+ if ( persister->BeforeWriteObject( this , object , classInfo , metadata) )
{
- int oid = m_data->m_nextId++ ;
- m_data->m_writtenObjects[object] = oid ;
- DoBeginWriteObject( object , classInfo , oid , name ) ;
- wxWriterInternalPropertiesData data ;
- WriteAllProperties( object , classInfo , persister , &data ) ;
- DoEndWriteObject( object , classInfo , oid , name ) ;
+ 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 ) ;
}
}
+void wxWriter::FindConnectEntry(const wxEvtHandler * evSource,const wxDelegateTypeInfo* dti, const wxObject* &sink , const wxHandlerInfo *&handler)
+{
+ wxList *dynamicEvents = evSource->GetDynamicEventTable() ;
+
+ 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 )
{
- const wxPropertyInfo *pi = ci->GetFirstProperty() ;
- while( pi )
+ wxPropertyInfoMap map ;
+ ci->GetProperties( map ) ;
+ for ( int i = 0 ; i < ci->GetCreateParamCount() ; ++i )
{
- if ( data->m_writtenProperties.find( pi->GetName() ) == data->m_writtenProperties.end() )
+ wxString name = ci->GetCreateParamName(i) ;
+ const wxPropertyInfo* prop = map.find(name)->second ;
+ if ( prop )
{
- data->m_writtenProperties[ pi->GetName() ] = 1 ;
- const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( pi->GetTypeInfo() ) ;
- if ( cti )
+ 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 )
{
- const wxClassInfo* pci = cti->GetClassInfo() ;
- wxxVariant value = pi->GetAccessor()->GetProperty(obj) ;
- if ( persister->BeforeWritePropertyAsObject( obj , ci , pi , value ) )
+ 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 ) ;
+ }
+ }
+ }
+}
+
+void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , const wxPropertyInfo* pi , wxPersister *persister , wxWriterInternalPropertiesData *WXUNUSED(data) )
+{
+ if ( pi->GetFlags() & wxPROP_DONT_STREAM )
+ return ;
+
+ // make sure that we are picking the correct object for accessing the property
+ const wxDynamicObject* dynobj = dynamic_cast< const wxDynamicObject* > (obj ) ;
+ if ( dynobj && (dynamic_cast<const wxDynamicClassInfo*>(ci) == NULL) )
+ obj = dynobj->GetSuperClassInstance() ;
+
+ if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION )
+ {
+ 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 ) ;
- bool embeddedObject = cti->GetKind() == wxT_OBJECT ;
+ 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 ;
- if ( vobj == NULL || IsObjectKnown( vobj ) )
- {
- DoWriteObjectReference( obj , ci , vobj , pci , GetObjectID(vobj) , pi ) ;
- }
- else
+ 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 )
{
- int oid = m_data->m_nextId++ ;
- if ( !embeddedObject)
- m_data->m_writtenObjects[vobj] = oid ;
-
- DoBeginWriteParamAsObject( obj , ci , vobj , pci , oid , pi ) ;
- if ( vobj != NULL )
+ DoBeginWriteProperty( pi ) ;
+ if ( IsObjectKnown( sink ) )
+ {
+ DoWriteDelegate( obj , ci , pi , sink , GetObjectID( sink ) , sink->GetClassInfo() , handler ) ;
+ DoEndWriteProperty( pi ) ;
+ }
+ else
{
- wxWriterInternalPropertiesData data ;
- WriteAllProperties( vobj , pci , persister , &data ) ;
+ wxLogError( _("Streaming delegates for not already streamed objects not yet supported") ) ;
}
- DoEndWriteParamAsObject( obj , ci , vobj , pci , oid , pi ) ;
}
}
}
else
{
- const wxDelegateTypeInfo* dti = dynamic_cast< const wxDelegateTypeInfo* > ( pi->GetTypeInfo() ) ;
- if ( dti )
+ 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
{
- const wxObject* sink = NULL ;
- const wxHandlerInfo *handler = NULL ;
-
- const wxWindow * evSource = dynamic_cast<const wxWindow *>(obj) ;
- wxASSERT_MSG( evSource , wxT("Illegal Object Class (Non-Window) as Event Source") ) ;
+ 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 ;
+ }
- wxList *dynamicEvents = evSource->GetDynamicEventTable() ;
+ // avoid streaming out null objects
+ const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( pi->GetTypeInfo() ) ;
- if ( dynamicEvents )
+ 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() )
{
- 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_lastId == -1 && evSource->GetId() == entry->m_id) ||
- (entry->m_lastId != -1 &&
- (evSource->GetId() >= entry->m_id && evSource->GetId() <= entry->m_lastId) ) ) &&
- entry->m_eventSink
- )
- {
- 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();
- }
- }
- if ( persister->BeforeWriteDelegate( obj , ci , pi , sink , handler ) )
+ wxString stringValue ;
+ cti->ConvertToString( value , stringValue ) ;
+ wxxVariant convertedValue(stringValue) ;
+ DoWriteSimpleType( convertedValue ) ;
+ }
+ else
{
- if ( sink != NULL && handler != NULL )
- {
- wxASSERT_MSG( IsObjectKnown( sink ) , wxT("Streaming delegates for not already streamed objects not yet supported") ) ;
- DoWriteDelegate( obj , ci , pi , sink , GetObjectID( sink ) , sink->GetClassInfo() , handler ) ;
- }
+ wxxVariantArray md ;
+ WriteObject( vobj , (vobj ? vobj->GetClassInfo() : pci ) , persister , cti->GetKind()== wxT_OBJECT , md) ;
}
}
else
{
- wxxVariant value = pi->GetAccessor()->GetProperty(obj) ;
- if ( persister->BeforeWriteProperty( obj , ci , pi , value ) )
- {
- DoWriteProperty( obj , ci , pi , value ) ;
- }
+ DoWriteSimpleType( value ) ;
}
+ DoEndWriteProperty( pi ) ;
}
}
- pi = pi->GetNext() ;
- }
- const wxClassInfo** parents = ci->GetParents() ;
- for ( int i = 0 ; parents[i] ; ++ i )
- {
- WriteAllProperties( obj , parents[i] , persister , data ) ;
}
}
-int wxWriter::GetObjectID(const wxObject *obj)
+int wxWriter::GetObjectID(const wxObject *obj)
{
if ( !IsObjectKnown( obj ) )
return wxInvalidObjectID ;
return m_data->m_writtenObjects[obj] ;
}
-bool wxWriter::IsObjectKnown( const wxObject *obj )
+bool wxWriter::IsObjectKnown( const wxObject *obj )
{
return m_data->m_writtenObjects.find( obj ) != m_data->m_writtenObjects.end() ;
}
-//
-// XML Streaming
-//
-
-// convenience functions
-
-void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data )
-{
- node->AddChild(new wxXmlNode(wxXML_TEXT_NODE, "value", data ) );
-}
-
-wxString wxXmlGetContentFromNode( wxXmlNode *node )
-{
- if ( node->GetChildren() )
- return node->GetChildren()->GetContent() ;
- else
- return wxEmptyString ;
-}
-
-struct wxXmlWriter::wxXmlWriterInternal
-{
- wxXmlNode *m_root ;
- wxXmlNode *m_current ;
- vector< wxXmlNode * > m_objectStack ;
-} ;
-
-wxXmlWriter::wxXmlWriter( wxXmlNode * rootnode )
-{
- m_data = new wxXmlWriterInternal() ;
- m_data->m_root = rootnode ;
- m_data->m_current = rootnode ;
-}
-
-wxXmlWriter::~wxXmlWriter()
-{
- delete m_data ;
-}
-
-// start of writing the root object
-void wxXmlWriter::DoBeginWriteObject(const wxObject *WXUNUSED(object), const wxClassInfo *classInfo, int objectID , const wxString &name )
-{
- wxXmlNode *onode;
- onode = new wxXmlNode(wxXML_ELEMENT_NODE, name);
- onode->AddProperty(wxString("class"), wxString(classInfo->GetClassName()));
- onode->AddProperty(wxString("id"), wxString::Format( "%d" , objectID ) );
-
- m_data->m_current->AddChild(onode) ;
- m_data->m_objectStack.push_back( m_data->m_current ) ;
- m_data->m_current = onode ;
-}
-
-// end of writing the root object
-void wxXmlWriter::DoEndWriteObject(const wxObject *WXUNUSED(object), const wxClassInfo *WXUNUSED(classInfo), int WXUNUSED(objectID) , const wxString &WXUNUSED(name) )
-{
- m_data->m_current = m_data->m_objectStack.back() ;
- m_data->m_objectStack.pop_back() ;
-}
-
-// writes a property in the stream format
-void wxXmlWriter::DoWriteProperty( const wxObject *WXUNUSED(obj), const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *pi , wxxVariant &value )
-{
- wxXmlNode *pnode;
- pnode = new wxXmlNode(wxXML_ELEMENT_NODE, pi->GetName() );
- wxXmlAddContentToNode( pnode ,value.GetAsString() ) ;
- m_data->m_current->AddChild(pnode);
-}
-
-void wxXmlWriter::DoBeginWriteParamAsObject(const wxObject *WXUNUSED(parentObject), const wxClassInfo *WXUNUSED(parentClassInfo), const wxObject *WXUNUSED(valueObject),
- const wxClassInfo *valueObjectClassInfo, int valueObjectID , const wxPropertyInfo *propInfo )
-{
- wxXmlNode *onode;
- onode = new wxXmlNode(wxXML_ELEMENT_NODE, propInfo->GetName());
- onode->AddProperty(wxString("class"), wxString(valueObjectClassInfo->GetClassName()));
- onode->AddProperty(wxString("id"), wxString::Format( "%d" , valueObjectID ) );
- m_data->m_current->AddChild(onode) ;
- m_data->m_objectStack.push_back( m_data->m_current ) ;
- m_data->m_current = onode ;
-}
-
-// insert an object reference to an already written object
-void wxXmlWriter::DoWriteObjectReference(const wxObject *WXUNUSED(parentObject), const wxClassInfo *WXUNUSED(parentClassInfo), const wxObject *valueObject,
- const wxClassInfo *valueObjectClassInfo, int valueObjectID , const wxPropertyInfo *propInfo )
-{
- wxXmlNode *onode;
- onode = new wxXmlNode(wxXML_ELEMENT_NODE, propInfo->GetName());
- onode->AddProperty(wxString("class"), wxString(valueObjectClassInfo->GetClassName()));
- if ( valueObject == NULL )
- {
- wxXmlNode* nullnode = new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, "null");
- onode->AddChild(nullnode);
- }
- else
- {
- onode->AddProperty(wxString("id"), wxString::Format( "%d" , valueObjectID ) );
- }
-
- m_data->m_current->AddChild(onode) ;
-}
-
-void wxXmlWriter::DoEndWriteParamAsObject(const wxObject *WXUNUSED(parentObject), const wxClassInfo *WXUNUSED(parentClassInfo), const wxObject *WXUNUSED(valueObject),
- const wxClassInfo *WXUNUSED(valueObjectClassInfo), int WXUNUSED(valueObjectID) , const wxPropertyInfo *WXUNUSED(propInfo) )
-{
- m_data->m_current = m_data->m_objectStack.back() ;
- m_data->m_objectStack.pop_back() ;
-}
-
-
-// writes a delegate in the stream format
-void wxXmlWriter::DoWriteDelegate( const wxObject *WXUNUSED(object), const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *pi ,
- const wxObject *eventSink, int sinkObjectID , const wxClassInfo* WXUNUSED(eventSinkClassInfo) , const wxHandlerInfo* handlerInfo )
-{
- if ( eventSink != NULL && handlerInfo != NULL )
- {
- wxXmlNode *pnode;
- pnode = new wxXmlNode(wxXML_ELEMENT_NODE, pi->GetName() );
- wxString s ;
- s.Printf(wxT("%d.%s"), sinkObjectID , handlerInfo->GetName() ) ;
- wxXmlAddContentToNode( pnode ,s ) ;
- m_data->m_current->AddChild(pnode);
- }
-}
// ----------------------------------------------------------------------------
-// reading objects in
+// reading objects in
// ----------------------------------------------------------------------------
struct wxReader::wxReaderInternal
map<int,wxClassInfo*> m_classInfos;
};
-wxReader::wxReader()
+wxReader::wxReader()
{
m_data = new wxReaderInternal;
}
wxClassInfo* wxReader::GetObjectClassInfo(int objectID)
{
- assert( m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() );
+ if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
+ {
+ wxLogError( _("Invalid or Null Object ID passed to GetObjectClassInfo" ) ) ;
+ return NULL ;
+ }
+ if ( m_data->m_classInfos.find(objectID) == m_data->m_classInfos.end() )
+ {
+ wxLogError( _("Unknown Object passed to GetObjectClassInfo" ) ) ;
+ return NULL ;
+ }
return m_data->m_classInfos[objectID] ;
}
void wxReader::SetObjectClassInfo(int objectID, wxClassInfo *classInfo )
{
- assert( m_data->m_classInfos.find(objectID) == m_data->m_classInfos.end() ) ;
+ if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
+ {
+ wxLogError( _("Invalid or Null Object ID passed to GetObjectClassInfo" ) ) ;
+ return ;
+ }
+ if ( m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() )
+ {
+ wxLogError( _("Already Registered Object passed to SetObjectClassInfo" ) ) ;
+ return ;
+ }
m_data->m_classInfos[objectID] = classInfo ;
}
-bool wxReader::HasObjectClassInfo( int objectID )
+bool wxReader::HasObjectClassInfo( int objectID )
{
+ if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
+ {
+ wxLogError( _("Invalid or Null Object ID passed to HasObjectClassInfo" ) ) ;
+ return NULL ;
+ }
return m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() ;
}
// ----------------------------------------------------------------------------
-// reading xml in
+// reading xml in
// ----------------------------------------------------------------------------
-/*
+/*
Reading components has not to be extended for components
as properties are always sought by typeinfo over all levels
and create params are always toplevel class only
*/
-int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
-{
- wxString className;
- wxClassInfo *classInfo;
-
- wxxVariant *createParams ;
- int *createParamOids ;
- const wxClassInfo** createClassInfos ;
- wxXmlNode *children;
- int objectID;
-
- children = node->GetChildren();
- if (!node->GetPropVal("class", &className))
- {
- // No class name. Eek. FIXME: error handling
- return wxInvalidObjectID;
- }
- classInfo = wxClassInfo::FindClass(className);
- if (children && children->GetType() == wxXML_TEXT_NODE)
- {
- assert( wxXmlGetContentFromNode(node) == "null" ) ;
- // this must be a NULL component reference. We just bail out
- return wxNullObjectID;
- }
-
- wxString ObjectIdString ;
- if (!node->GetPropVal("id", &ObjectIdString))
- {
- // No object id. Eek. FIXME: error handling
- return wxInvalidObjectID;
- }
-
- objectID = atoi( ObjectIdString.c_str() ) ;
- // is this object already has been streamed in, return it here
- if ( HasObjectClassInfo( objectID ) )
- return objectID ;
-
- // new object, start with allocation
- // first make the object know to our internal registry
- SetObjectClassInfo( objectID , classInfo ) ;
-
- callbacks->AllocateObject(objectID, classInfo);
-
- //
- // stream back the Create parameters first
- createParams = new wxxVariant[ classInfo->GetCreateParamCount() ] ;
- createParamOids = new int[classInfo->GetCreateParamCount() ] ;
- createClassInfos = new const wxClassInfo*[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 ) ;
- const wxPropertyInfo* pi = classInfo->FindPropertyInfo( paramName ) ;
- // if we don't have the value of a create param set in the xml
- // we use the default value
- if ( propiter != propertyNodes.end() )
- {
- wxXmlNode* prop = propiter->second ;
- if ( pi->GetTypeInfo()->IsObjectType() )
- {
- createParamOids[i] = ReadComponent( prop , callbacks ) ;
- createClassInfos[i] = dynamic_cast<const wxClassTypeInfo*>(pi->GetTypeInfo())->GetClassInfo() ;
- }
- else
- {
- createParamOids[i] = wxInvalidObjectID ;
- createParams[i] = ReadValue( prop , pi->GetAccessor() ) ;
- createClassInfos[i] = NULL ;
- }
-
- for ( size_t j = 0 ; j < propertyNames.size() ; ++j )
- {
- if ( propertyNames[j] == paramName )
- {
- propertyNames[j] = "" ;
- break ;
- }
- }
- }
- else
- {
- createParams[i] = pi->GetDefaultValue() ;
- }
- }
-
- // got the parameters. Call the Create method
- callbacks->CreateObject(objectID, classInfo,
- classInfo->GetCreateParamCount(),
- createParams, createParamOids, createClassInfos);
-
- // now stream in the rest of the properties, in the sequence their properties were written in the xml
- for ( size_t j = 0 ; j < propertyNames.size() ; ++j )
- {
- if ( propertyNames[j].length() )
- {
- PropertyNodes::iterator propiter = propertyNodes.find( propertyNames[j] ) ;
- if ( propiter != propertyNodes.end() )
- {
- wxXmlNode* prop = propiter->second ;
- const wxPropertyInfo* pi = classInfo->FindPropertyInfo( propertyNames[j].c_str() ) ;
- if ( pi->GetTypeInfo()->IsObjectType() )
- {
- int valueId = ReadComponent( prop , callbacks ) ;
- if ( callbacks )
- {
- if ( valueId != wxInvalidObjectID )
- {
- callbacks->SetPropertyAsObject( objectID , classInfo , pi , valueId ) ;
- if ( pi->GetTypeInfo()->GetKind() == wxT_OBJECT && valueId != wxNullObjectID )
- callbacks->DestroyObject( valueId , GetObjectClassInfo( valueId ) ) ;
- }
- }
- }
- else if ( pi->GetTypeInfo()->IsDelegateType() )
- {
- wxString resstring = wxXmlGetContentFromNode(prop) ;
- wxInt32 pos = resstring.Find('.') ;
- assert( pos != wxNOT_FOUND ) ;
- int sinkOid = atol(resstring.Left(pos)) ;
- wxString handlerName = resstring.Mid(pos+1) ;
- wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid ) ;
-
- if (callbacks)
- callbacks->SetConnect( objectID , classInfo , dynamic_cast<const wxDelegateTypeInfo*>(pi->GetTypeInfo()) , sinkClassInfo ,
- sinkClassInfo->FindHandlerInfo(handlerName) , sinkOid ) ;
-
- }
- else
- {
- if ( callbacks )
- callbacks->SetProperty( objectID, classInfo ,pi , ReadValue( prop , pi->GetAccessor() ) ) ;
- }
- }
- }
- }
-
- delete[] createParams ;
- delete[] createParamOids ;
- delete[] createClassInfos ;
-
- return objectID;
-}
-
-wxxVariant wxXmlReader::ReadValue(wxXmlNode *node,
- wxPropertyAccessor *accessor )
-{
- return accessor->ReadValue(wxXmlGetContentFromNode( node ) ) ;
-}
-
-int wxXmlReader::ReadObject(wxDepersister *callbacks)
-{
- return ReadComponent( m_parent , callbacks ) ;
-}
// ----------------------------------------------------------------------------
-// depersisting to memory
+// depersisting to memory
// ----------------------------------------------------------------------------
struct wxRuntimeDepersister::wxRuntimeDepersisterInternal
void SetObject(int objectID, wxObject *obj )
{
- assert( m_objects.find(objectID) == m_objects.end() ) ;
+ if ( m_objects.find(objectID) != m_objects.end() )
+ {
+ wxLogError( _("Passing a already registered object to SetObject") ) ;
+ return ;
+ }
m_objects[objectID] = obj ;
}
wxObject* GetObject( int objectID )
{
if ( objectID == wxNullObjectID )
return NULL ;
+ if ( m_objects.find(objectID) == m_objects.end() )
+ {
+ wxLogError( _("Passing an unkown object to GetObject") ) ;
+ return NULL ;
+ }
- assert( m_objects.find(objectID) != m_objects.end() ) ;
return m_objects[objectID] ;
}
} ;
delete m_data ;
}
-void wxRuntimeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo)
+void wxRuntimeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo ,
+ wxxVariantArray &WXUNUSED(metadata))
{
wxObject *O;
O = classInfo->CreateObject();
int paramCount,
wxxVariant *params,
int *objectIdValues,
- const wxClassInfo **objectClassInfos)
+ const wxClassInfo **objectClassInfos ,
+ wxxVariantArray &WXUNUSED(metadata))
{
wxObject *o;
o = m_data->GetObject(objectID);
{
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);
}
-void wxRuntimeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo))
+void wxRuntimeDepersister::ConstructObject(int objectID,
+ const wxClassInfo *classInfo,
+ int paramCount,
+ wxxVariant *params,
+ int *objectIdValues,
+ const wxClassInfo **objectClassInfos ,
+ wxxVariantArray &WXUNUSED(metadata))
+{
+ wxObject *o;
+ for ( int i = 0 ; i < paramCount ; ++i )
+ {
+ if ( objectIdValues[i] != wxInvalidObjectID )
+ {
+ wxObject *o;
+ o = m_data->GetObject(objectIdValues[i]);
+ // if this is a dynamic object and we are asked for another class
+ // than wxDynamicObject we cast it down manually.
+ wxDynamicObject *dyno = dynamic_cast< wxDynamicObject * > (o) ;
+ if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) )
+ {
+ o = dyno->GetSuperClassInstance() ;
+ }
+ params[i] = objectClassInfos[i]->InstanceToVariant(o) ;
+ }
+ }
+ o = classInfo->ConstructObject(paramCount, params);
+ m_data->SetObject(objectID, o);
+}
+
+
+void wxRuntimeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo))
{
wxObject *o;
o = m_data->GetObject(objectID);
}
void wxRuntimeDepersister::SetProperty(int objectID,
- const wxClassInfo *WXUNUSED(classInfo),
+ const wxClassInfo *classInfo,
const wxPropertyInfo* propertyInfo,
const wxxVariant &value)
{
wxObject *o;
o = m_data->GetObject(objectID);
- propertyInfo->GetAccessor()->SetProperty( o , value ) ;
+ classInfo->SetProperty( o , propertyInfo->GetName() , value ) ;
}
void wxRuntimeDepersister::SetPropertyAsObject(int objectID,
- const wxClassInfo *WXUNUSED(classInfo),
+ const wxClassInfo *classInfo,
const wxPropertyInfo* propertyInfo,
int valueObjectId)
{
wxObject *o, *valo;
o = m_data->GetObject(objectID);
valo = m_data->GetObject(valueObjectId);
- propertyInfo->GetAccessor()->SetProperty( o ,
- (dynamic_cast<const wxClassTypeInfo*>(propertyInfo->GetTypeInfo()))->GetClassInfo()->InstanceToVariant(valo) ) ;
+ 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()) )
+ {
+ valo = dynvalo->GetSuperClassInstance() ;
+ }
+
+ classInfo->SetProperty( o , propertyInfo->GetName() , valClassInfo->InstanceToVariant(valo) ) ;
}
void wxRuntimeDepersister::SetConnect(int eventSourceObjectID,
const wxClassInfo *WXUNUSED(eventSourceClassInfo),
- const wxDelegateTypeInfo *delegateInfo ,
+ const wxPropertyInfo *delegateInfo ,
const wxClassInfo *WXUNUSED(eventSinkClassInfo) ,
const wxHandlerInfo* handlerInfo ,
int eventSinkObjectID )
{
- wxWindow *ehsource = dynamic_cast< wxWindow* >( m_data->GetObject( eventSourceObjectID ) ) ;
+ wxEvtHandler *ehsource = dynamic_cast< wxEvtHandler* >( m_data->GetObject( eventSourceObjectID ) ) ;
wxEvtHandler *ehsink = dynamic_cast< wxEvtHandler *>(m_data->GetObject(eventSinkObjectID) ) ;
if ( ehsource && ehsink )
{
- ehsource->Connect( ehsource->GetId() , delegateInfo->GetEventType() ,
- handlerInfo->GetEventFunction() , NULL /*user data*/ ,
- ehsink ) ;
+ const wxDelegateTypeInfo *delegateTypeInfo = dynamic_cast<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 ) ;
+ }
+ }
}
}
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()) )
+ {
+ valo = dynvalo->GetSuperClassInstance() ;
+ }
+
+ classInfo->AddToPropertyCollection( o , propertyInfo->GetName() , valClassInfo->InstanceToVariant(valo) ) ;
+}
// ----------------------------------------------------------------------------
-// depersisting to code
+// depersisting to code
// ----------------------------------------------------------------------------
struct wxCodeDepersister::wxCodeDepersisterInternal
{
+#if wxUSE_UNICODE
+ map<int,wstring> m_objectNames ;
+#else
map<int,string> m_objectNames ;
+#endif
void SetObjectName(int objectID, const wxString &name )
{
- assert( m_objectNames.find(objectID) == m_objectNames.end() ) ;
- m_objectNames[objectID] = (const char *)name;
+ if ( m_objectNames.find(objectID) != m_objectNames.end() )
+ {
+ wxLogError( _("Passing a already registered object to SetObjectName") ) ;
+ return ;
+ }
+ m_objectNames[objectID] = (const wxChar *)name;
}
+
wxString GetObjectName( int objectID )
{
if ( objectID == wxNullObjectID )
- return "NULL" ;
+ return wxT("NULL") ;
- assert( m_objectNames.find(objectID) != m_objectNames.end() ) ;
+ if ( m_objectNames.find(objectID) == m_objectNames.end() )
+ {
+ wxLogError( _("Passing an unkown object to GetObject") ) ;
+ return wxEmptyString ;
+ }
return wxString( m_objectNames[objectID].c_str() ) ;
}
} ;
-wxCodeDepersister::wxCodeDepersister(wxTextOutputStream *out)
+wxCodeDepersister::wxCodeDepersister(wxTextOutputStream *out)
: m_fp(out)
{
m_data = new wxCodeDepersisterInternal ;
delete m_data ;
}
-void wxCodeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo)
+void wxCodeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo ,
+ wxxVariantArray &WXUNUSED(metadata))
{
- wxString objectName = wxString::Format( "LocalObject_%d" , objectID ) ;
- m_fp->WriteString( wxString::Format( "\t%s *%s = new %s;\n",
+ wxString objectName = wxString::Format( wxT("LocalObject_%d") , objectID ) ;
+ m_fp->WriteString( wxString::Format( wxT("\t%s *%s = new %s;\n"),
classInfo->GetClassName(),
- objectName,
+ objectName.c_str(),
classInfo->GetClassName()) );
m_data->SetObjectName( objectID , objectName ) ;
}
-void wxCodeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo))
+void wxCodeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo))
{
- m_fp->WriteString( wxString::Format( "\tdelete %s;\n",
- m_data->GetObjectName( objectID) ) );
+ m_fp->WriteString( wxString::Format( wxT("\tdelete %s;\n"),
+ m_data->GetObjectName( objectID).c_str() ) );
}
wxString wxCodeDepersister::ValueAsCode( const wxxVariant ¶m )
if ( type->GetKind() == wxT_CUSTOM )
{
const wxCustomTypeInfo* cti = dynamic_cast<const wxCustomTypeInfo*>(type) ;
- wxASSERT_MSG( cti , wxT("Internal error, illegal wxCustomTypeInfo") ) ;
- value.Printf( "%s(%s)",cti->GetTypeName(),param.GetAsString() );
+ if ( cti )
+ {
+ value.Printf( wxT("%s(%s)"), cti->GetTypeName().c_str(),param.GetAsString().c_str() );
+ }
+ else
+ {
+ wxLogError ( _("Internal error, illegal wxCustomTypeInfo") ) ;
+ }
}
else if ( type->GetKind() == wxT_STRING )
{
- value.Printf( "\"%s\"",param.GetAsString() );
+ value.Printf( wxT("\"%s\""),param.GetAsString().c_str() );
}
else
{
- value.Printf( "%s", param.GetAsString() );
+ value.Printf( wxT("%s"), param.GetAsString().c_str() );
}
return value ;
}
int paramCount,
wxxVariant *params,
int *objectIDValues,
- const wxClassInfo **WXUNUSED(objectClassInfos)
+ const wxClassInfo **WXUNUSED(objectClassInfos) ,
+ wxxVariantArray &WXUNUSED(metadata)
+ )
+{
+ int i;
+ m_fp->WriteString( wxString::Format( wxT("\t%s->Create("), m_data->GetObjectName(objectID).c_str() ) );
+ for (i = 0; i < paramCount; i++)
+ {
+ if ( objectIDValues[i] != wxInvalidObjectID )
+ m_fp->WriteString( wxString::Format( wxT("%s"), m_data->GetObjectName( objectIDValues[i] ).c_str() ) );
+ else
+ {
+ m_fp->WriteString( wxString::Format( wxT("%s"), ValueAsCode(params[i]).c_str() ) );
+ }
+ if (i < paramCount - 1)
+ m_fp->WriteString( wxT(", "));
+ }
+ m_fp->WriteString( wxT(");\n") );
+}
+
+void wxCodeDepersister::ConstructObject(int objectID,
+ const wxClassInfo *classInfo,
+ int paramCount,
+ wxxVariant *params,
+ int *objectIDValues,
+ const wxClassInfo **WXUNUSED(objectClassInfos) ,
+ wxxVariantArray &WXUNUSED(metadata)
)
{
+ wxString objectName = wxString::Format( wxT("LocalObject_%d") , objectID ) ;
+ m_fp->WriteString( wxString::Format( wxT("\t%s *%s = new %s("),
+ classInfo->GetClassName(),
+ objectName.c_str(),
+ classInfo->GetClassName()) );
+ m_data->SetObjectName( objectID , objectName ) ;
+
int i;
- m_fp->WriteString( wxString::Format( "\t%s->Create(", m_data->GetObjectName(objectID) ) );
for (i = 0; i < paramCount; i++)
{
if ( objectIDValues[i] != wxInvalidObjectID )
- m_fp->WriteString( wxString::Format( "%s", m_data->GetObjectName( objectIDValues[i] ) ) );
+ m_fp->WriteString( wxString::Format( wxT("%s"), m_data->GetObjectName( objectIDValues[i] ).c_str() ) );
else
{
- m_fp->WriteString( wxString::Format( "%s", ValueAsCode(params[i]) ) );
+ m_fp->WriteString( wxString::Format( wxT("%s"), ValueAsCode(params[i]).c_str() ) );
}
if (i < paramCount - 1)
- m_fp->WriteString( ", ");
+ m_fp->WriteString( wxT(", ") );
}
- m_fp->WriteString( ");\n");
+ m_fp->WriteString( wxT(");\n") );
}
void wxCodeDepersister::SetProperty(int objectID,
const wxPropertyInfo* propertyInfo,
const wxxVariant &value)
{
- m_fp->WriteString( wxString::Format( "\t%s->%s(%s);\n",
- m_data->GetObjectName(objectID),
- propertyInfo->GetAccessor()->GetSetterName(),
- ValueAsCode(value)) );
+ m_fp->WriteString( wxString::Format( wxT("\t%s->%s(%s);\n"),
+ m_data->GetObjectName(objectID).c_str(),
+ propertyInfo->GetAccessor()->GetSetterName().c_str(),
+ ValueAsCode(value).c_str()) );
}
void wxCodeDepersister::SetPropertyAsObject(int objectID,
int valueObjectId)
{
if ( propertyInfo->GetTypeInfo()->GetKind() == wxT_OBJECT )
- m_fp->WriteString( wxString::Format( "\t%s->%s(*%s);\n",
- m_data->GetObjectName(objectID),
- propertyInfo->GetAccessor()->GetSetterName(),
- m_data->GetObjectName( valueObjectId) ) );
+ m_fp->WriteString( wxString::Format( wxT("\t%s->%s(*%s);\n"),
+ m_data->GetObjectName(objectID).c_str(),
+ propertyInfo->GetAccessor()->GetSetterName().c_str(),
+ m_data->GetObjectName( valueObjectId).c_str() ) );
else
- m_fp->WriteString( wxString::Format( "\t%s->%s(%s);\n",
- m_data->GetObjectName(objectID),
- propertyInfo->GetAccessor()->GetSetterName(),
- m_data->GetObjectName( valueObjectId) ) );
+ m_fp->WriteString( wxString::Format( wxT("\t%s->%s(%s);\n"),
+ m_data->GetObjectName(objectID).c_str(),
+ propertyInfo->GetAccessor()->GetSetterName().c_str(),
+ m_data->GetObjectName( valueObjectId).c_str() ) );
+}
+
+void wxCodeDepersister::AddToPropertyCollection( int objectID ,
+ const wxClassInfo *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()) );
+}
+
+// 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 wxDelegateTypeInfo *delegateInfo ,
+ 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() ;
- int eventType = delegateInfo->GetEventType() ;
- wxString handlerName = handlerInfo->GetName() ;
+ const wxDelegateTypeInfo *delegateTypeInfo = dynamic_cast<const wxDelegateTypeInfo*>(delegateInfo->GetTypeInfo());
+ if ( delegateTypeInfo )
+ {
+ int eventType = delegateTypeInfo->GetEventType() ;
+ wxString handlerName = handlerInfo->GetName() ;
- m_fp->WriteString( wxString::Format( "\t%s->Connect( %s->GetId() , %d , (wxObjectEventFunction)(wxEventFunction) & %s::%s , NULL , %s ) ;" ,
- ehsource , ehsource , eventType , ehsinkClass , handlerName , ehsink ) );
+ m_fp->WriteString( wxString::Format( wxT("\t%s->Connect( %s->GetId() , %d , (wxObjectEventFunction)(wxEventFunction) & %s::%s , NULL , %s ) ;") ,
+ ehsource.c_str() , ehsource.c_str() , eventType , ehsinkClass.c_str() , handlerName.c_str() , ehsink.c_str() ) );
+ }
+ else
+ {
+ wxLogError(_("delegate has no type info"));
+ }
}
+#include <wx/arrimpl.cpp>
+
+WX_DEFINE_OBJARRAY(wxxVariantArray);
+
#endif
projects / wxWidgets.git / blobdiff