Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

was missing in xti merge

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-01-05 09:56:32 +00:00
parent 9dbd8fc741
commit 5e8b5272d8
1 changed files with 201 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

390
src/common/xtixml.cpp
View File

@@ -29,24 +29,28 @@
#include "wx/xml/xml.h" #include "wx/xml/xml.h"
#include "wx/tokenzr.h" #include "wx/tokenzr.h"
#include "wx/txtstrm.h" #include "wx/txtstrm.h"
#include "wx/xtistrm.h" #include "wx/xtistrm.h"
// STL headers
#include "wx/beforestd.h" #include "wx/beforestd.h"
#include <map> #include <map>
#include <vector> #include <vector>
#include <string> #include <string>
#include "wx/afterstd.h" #include "wx/afterstd.h"
using namespace std ; using namespace std;
//
// XML Streaming
//
// ----------------------------------------------------------------------------
// wxObjectXmlWriter
// ----------------------------------------------------------------------------
// convenience functions // convenience functions
void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data ) void wxXmlAddContentToNode( wxXmlNode* node, const wxString& data )
{ {
node->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxT("value"), data ) ); node->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxT("value"), data ) );
} }
@@ -54,147 +58,144 @@ void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data )
wxString wxXmlGetContentFromNode( wxXmlNode *node ) wxString wxXmlGetContentFromNode( wxXmlNode *node )
{ {
if ( node->GetChildren() ) if ( node->GetChildren() )
return node->GetChildren()->GetContent() ; return node->GetChildren()->GetContent();
else else
return wxEmptyString ; return wxEmptyString;
} }
struct wxXmlWriter::wxXmlWriterInternal struct wxObjectXmlWriter::wxObjectXmlWriterInternal
{ {
wxXmlNode *m_root ; wxXmlNode *m_root;
wxXmlNode *m_current ; wxXmlNode *m_current;
vector< wxXmlNode * > m_objectStack ; vector< wxXmlNode * > m_objectStack;
void Push( wxXmlNode *newCurrent ) void Push( wxXmlNode *newCurrent )
{ {
m_objectStack.push_back( m_current ) ; m_objectStack.push_back( m_current );
m_current = newCurrent ; m_current = newCurrent;
} }
void Pop() void Pop()
{ {
m_current = m_objectStack.back() ; m_current = m_objectStack.back();
m_objectStack.pop_back() ; m_objectStack.pop_back();
} }
} ; };
wxXmlWriter::wxXmlWriter( wxXmlNode * rootnode ) wxObjectXmlWriter::wxObjectXmlWriter( wxXmlNode * rootnode )
{ {
m_data = new wxXmlWriterInternal() ; m_data = new wxObjectXmlWriterInternal();
m_data->m_root = rootnode ; m_data->m_root = rootnode;
m_data->m_current = rootnode ; m_data->m_current = rootnode;
} }
wxXmlWriter::~wxXmlWriter() wxObjectXmlWriter::~wxObjectXmlWriter()
{ {
delete m_data ; delete m_data;
} }
void wxXmlWriter::DoBeginWriteTopLevelEntry( const wxString &name ) void wxObjectXmlWriter::DoBeginWriteTopLevelEntry( const wxString &name )
{ {
wxXmlNode *pnode; wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("entry")); pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("entry"));
pnode->AddAttribute(wxString(wxT("name")), name); pnode->AddProperty(wxString(wxT("name")), name);
m_data->m_current->AddChild(pnode) ; m_data->m_current->AddChild(pnode);
m_data->Push( pnode ) ; m_data->Push( pnode );
} }
void wxXmlWriter::DoEndWriteTopLevelEntry( const wxString &WXUNUSED(name) ) void wxObjectXmlWriter::DoEndWriteTopLevelEntry( const wxString &WXUNUSED(name) )
{ {
m_data->Pop() ; m_data->Pop();
} }
void wxXmlWriter::DoBeginWriteObject(const wxObject *WXUNUSED(object), const wxClassInfo *classInfo, int objectID , wxxVariantArray &metadata ) void wxObjectXmlWriter::DoBeginWriteObject(const wxObject *WXUNUSED(object),
const wxClassInfo *classInfo,
int objectID, wxVariantBaseArray &metadata )
{ {
wxXmlNode *pnode; wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
pnode->AddAttribute(wxT("class"), wxString(classInfo->GetClassName())); pnode->AddProperty(wxT("class"), wxString(classInfo->GetClassName()));
pnode->AddAttribute(wxT("id"), wxString::Format( wxT("%d") , objectID ) ); pnode->AddProperty(wxT("id"), wxString::Format( wxT("%d"), objectID ) );
for ( size_t i = 0 ; i < metadata.GetCount() ; ++i ) for ( size_t i = 0; i < metadata.GetCount(); ++i )
{ {
pnode->AddAttribute( metadata[i].GetName() , metadata[i].GetAsString() ) ; pnode->AddProperty( metadata[i].GetName(), metadata[i].GetAsString() );
} }
m_data->m_current->AddChild(pnode) ; m_data->m_current->AddChild(pnode);
m_data->Push( pnode ) ; m_data->Push( pnode );
} }
// end of writing the root object void wxObjectXmlWriter::DoEndWriteObject(const wxObject *WXUNUSED(object),
void wxXmlWriter::DoEndWriteObject(const wxObject *WXUNUSED(object), const wxClassInfo *WXUNUSED(classInfo), int WXUNUSED(objectID) ) const wxClassInfo *WXUNUSED(classInfo),
int WXUNUSED(objectID) )
{ {
m_data->Pop() ; m_data->Pop();
} }
// writes a property in the stream format void wxObjectXmlWriter::DoWriteSimpleType( wxVariantBase &value )
void wxXmlWriter::DoWriteSimpleType( wxxVariant &value )
{ {
wxXmlAddContentToNode( m_data->m_current ,value.GetAsString() ) ; wxXmlAddContentToNode( m_data->m_current,value.GetAsString() );
} }
void wxXmlWriter::DoBeginWriteElement() void wxObjectXmlWriter::DoBeginWriteElement()
{ {
wxXmlNode *pnode; wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("element") ); pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("element") );
m_data->m_current->AddChild(pnode) ; m_data->m_current->AddChild(pnode);
m_data->Push( pnode ) ; m_data->Push( pnode );
} }
void wxXmlWriter::DoEndWriteElement() void wxObjectXmlWriter::DoEndWriteElement()
{ {
m_data->Pop() ; m_data->Pop();
} }
void wxXmlWriter::DoBeginWriteProperty(const wxPropertyInfo *pi ) void wxObjectXmlWriter::DoBeginWriteProperty(const wxPropertyInfo *pi )
{ {
wxXmlNode *pnode; wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("prop") ); pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("prop") );
pnode->AddAttribute(wxT("name"), pi->GetName() ); pnode->AddProperty(wxT("name"), pi->GetName() );
m_data->m_current->AddChild(pnode) ; m_data->m_current->AddChild(pnode);
m_data->Push( pnode ) ; m_data->Push( pnode );
} }
void wxXmlWriter::DoEndWriteProperty(const wxPropertyInfo *WXUNUSED(propInfo) ) void wxObjectXmlWriter::DoEndWriteProperty(const wxPropertyInfo *WXUNUSED(propInfo) )
{ {
m_data->Pop() ; m_data->Pop();
} }
void wxObjectXmlWriter::DoWriteRepeatedObject( int objectID )
// insert an object reference to an already written object
void wxXmlWriter::DoWriteRepeatedObject( int objectID )
{ {
wxXmlNode *pnode; wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
pnode->AddAttribute(wxString(wxT("href")), wxString::Format( wxT("%d") , objectID ) ); pnode->AddProperty(wxString(wxT("href")), wxString::Format( wxT("%d"), objectID ) );
m_data->m_current->AddChild(pnode) ; m_data->m_current->AddChild(pnode);
} }
// insert a null reference void wxObjectXmlWriter::DoWriteNullObject()
void wxXmlWriter::DoWriteNullObject()
{ {
wxXmlNode *pnode; wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
m_data->m_current->AddChild(pnode) ; m_data->m_current->AddChild(pnode);
} }
// writes a delegate in the stream format void wxObjectXmlWriter::DoWriteDelegate( const wxObject *WXUNUSED(object),
void wxXmlWriter::DoWriteDelegate( const wxObject *WXUNUSED(object), const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(pi) , const wxClassInfo* WXUNUSED(classInfo),
const wxObject *eventSink, int sinkObjectID , const wxClassInfo* WXUNUSED(eventSinkClassInfo) , const wxHandlerInfo* handlerInfo ) const wxPropertyInfo *WXUNUSED(pi),
const wxObject *eventSink, int sinkObjectID,
const wxClassInfo* WXUNUSED(eventSinkClassInfo),
const wxHandlerInfo* handlerInfo )
{ {
if ( eventSink != NULL && handlerInfo != NULL ) if ( eventSink != NULL && handlerInfo != NULL )
{ {
wxXmlAddContentToNode( m_data->m_current ,wxString::Format(wxT("%d.%s"), sinkObjectID , handlerInfo->GetName().c_str()) ) ; wxXmlAddContentToNode( m_data->m_current,
wxString::Format(wxT("%d.%s"), sinkObjectID, handlerInfo->GetName().c_str()) );
} }
} }
// ----------------------------------------------------------------------------
// reading objects in
// ----------------------------------------------------------------------------
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// reading xml in // wxObjectXmlReader
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
/* /*
@@ -203,160 +204,165 @@ as properties are always sought by typeinfo over all levels
and create params are always toplevel class only and create params are always toplevel class only
*/ */
int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) int wxObjectXmlReader::ReadComponent(wxXmlNode *node, wxObjectWriterCallback *callbacks)
{ {
wxASSERT_MSG( callbacks , wxT("Does not support reading without a Depersistor") ) ; wxASSERT_MSG( callbacks, wxT("Does not support reading without a Depersistor") );
wxString className; wxString className;
wxClassInfo *classInfo; wxClassInfo *classInfo;
wxxVariant *createParams ; wxVariantBase *createParams;
int *createParamOids ; int *createParamOids;
const wxClassInfo** createClassInfos ; const wxClassInfo** createClassInfos;
wxXmlNode *children; wxXmlNode *children;
int objectID; int objectID;
wxString ObjectIdString ; wxString ObjectIdString;
children = node->GetChildren(); children = node->GetChildren();
if (!children) if (!children)
{ {
// check for a null object or href // check for a null object or href
if (node->GetAttribute(wxT("href") , &ObjectIdString ) ) if (node->GetPropVal(wxT("href"), &ObjectIdString ) )
{ {
objectID = atoi( ObjectIdString.ToAscii() ) ; objectID = atoi( ObjectIdString.ToAscii() );
if ( HasObjectClassInfo( objectID ) ) if ( HasObjectClassInfo( objectID ) )
{ {
return objectID ; return objectID;
} }
else else
{ {
wxLogError( _("Forward hrefs are not supported") ) ; wxLogError( _("Forward hrefs are not supported") );
return wxInvalidObjectID ; return wxInvalidObjectID;
} }
} }
if ( !node->GetAttribute(wxT("id") , &ObjectIdString ) ) if ( !node->GetPropVal(wxT("id"), &ObjectIdString ) )
{ {
return wxNullObjectID; return wxNullObjectID;
} }
} }
if (!node->GetAttribute(wxT("class"), &className)) if (!node->GetPropVal(wxT("class"), &className))
{ {
// No class name. Eek. FIXME: error handling // No class name. Eek. FIXME: error handling
return wxInvalidObjectID; return wxInvalidObjectID;
} }
classInfo = wxClassInfo::FindClass(className); classInfo = wxClassInfo::FindClass(className);
if ( classInfo == NULL ) if ( classInfo == NULL )
{ {
wxLogError( wxString::Format(_("unknown class %s"),className ) ) ; wxLogError( wxString::Format(_("unknown class %s"),className ) );
return wxInvalidObjectID ; return wxInvalidObjectID;
} }
if ( children != NULL && children->GetType() == wxXML_TEXT_NODE ) if ( children != NULL && children->GetType() == wxXML_TEXT_NODE )
{ {
wxLogError(_("objects cannot have XML Text Nodes") ) ; wxLogError(_("objects cannot have XML Text Nodes") );
return wxInvalidObjectID; return wxInvalidObjectID;
} }
if (!node->GetAttribute(wxT("id"), &ObjectIdString)) if (!node->GetPropVal(wxT("id"), &ObjectIdString))
{ {
wxLogError(_("Objects must have an id attribute") ) ; wxLogError(_("Objects must have an id attribute") );
// No object id. Eek. FIXME: error handling // No object id. Eek. FIXME: error handling
return wxInvalidObjectID; return wxInvalidObjectID;
} }
objectID = atoi( ObjectIdString.ToAscii() ) ; objectID = atoi( ObjectIdString.ToAscii() );
// is this object already has been streamed in, return it here // is this object already has been streamed in, return it here
if ( HasObjectClassInfo( objectID ) ) if ( HasObjectClassInfo( objectID ) )
{ {
wxLogError ( wxString::Format(_("Doubly used id : %d"), objectID ) ) ; wxLogError ( wxString::Format(_("Doubly used id : %d"), objectID ) );
return wxInvalidObjectID ; return wxInvalidObjectID;
} }
// new object, start with allocation // new object, start with allocation
// first make the object know to our internal registry // first make the object know to our internal registry
SetObjectClassInfo( objectID , classInfo ) ; SetObjectClassInfo( objectID, classInfo );
wxxVariantArray metadata ; wxVariantBaseArray metadata;
wxXmlAttribute *xp = node->GetAttributes() ; wxXmlProperty *xp = node->GetProperties();
while ( xp ) while ( xp )
{ {
if ( xp->GetName() != wxString(wxT("class")) && xp->GetName() != wxString(wxT("id")) ) if ( xp->GetName() != wxString(wxT("class")) &&
xp->GetName() != wxString(wxT("id")) )
{ {
metadata.Add( new wxxVariant( xp->GetValue() , xp->GetName() ) ) ; metadata.Add( new wxVariantBase( xp->GetValue(), xp->GetName() ) );
} }
xp = xp->GetNext() ; xp = xp->GetNext();
} }
if ( !classInfo->NeedsDirectConstruction() ) if ( !classInfo->NeedsDirectConstruction() )
callbacks->AllocateObject(objectID, classInfo, metadata); callbacks->AllocateObject(objectID, classInfo, metadata);
// //
// stream back the Create parameters first // stream back the Create parameters first
createParams = new wxxVariant[ classInfo->GetCreateParamCount() ] ; createParams = new wxVariantBase[ classInfo->GetCreateParamCount() ];
createParamOids = new int[classInfo->GetCreateParamCount() ] ; createParamOids = new int[classInfo->GetCreateParamCount() ];
createClassInfos = new const wxClassInfo*[classInfo->GetCreateParamCount() ] ; createClassInfos = new const wxClassInfo*[classInfo->GetCreateParamCount() ];
#if wxUSE_UNICODE #if wxUSE_UNICODE
typedef map<wstring, wxXmlNode *> PropertyNodes ; typedef map<wstring, wxXmlNode *> PropertyNodes;
typedef vector<wstring> PropertyNames ; typedef vector<wstring> PropertyNames;
#else #else
typedef map<string, wxXmlNode *> PropertyNodes ; typedef map<string, wxXmlNode *> PropertyNodes;
typedef vector<string> PropertyNames ; typedef vector<string> PropertyNames;
#endif #endif
PropertyNodes propertyNodes ; PropertyNodes propertyNodes;
PropertyNames propertyNames ; PropertyNames propertyNames;
while( children ) while( children )
{ {
wxString name ; wxString name;
children->GetAttribute( wxT("name") , &name ) ; children->GetPropVal( wxT("name"), &name );
propertyNames.push_back( (const wxChar*)name.c_str() ) ; propertyNames.push_back( (const wxChar*)name.c_str() );
propertyNodes[(const wxChar*)name.c_str()] = children->GetChildren() ; propertyNodes[(const wxChar*)name.c_str()] = children->GetChildren();
children = children->GetNext() ; children = children->GetNext();
} }
for ( int i = 0 ; i <classInfo->GetCreateParamCount() ; ++i ) for ( int i = 0; i <classInfo->GetCreateParamCount(); ++i )
{ {
const wxChar* paramName = classInfo->GetCreateParamName(i) ; const wxChar* paramName = classInfo->GetCreateParamName(i);
PropertyNodes::iterator propiter = propertyNodes.find( paramName ) ; PropertyNodes::iterator propiter = propertyNodes.find( paramName );
const wxPropertyInfo* pi = classInfo->FindPropertyInfo( paramName ) ; const wxPropertyInfo* pi = classInfo->FindPropertyInfo( paramName );
if ( pi == 0 ) if ( pi == 0 )
{ {
wxLogError( wxString::Format(_("Unknown Property %s"),paramName) ) ; wxLogError( wxString::Format(_("Unkown Property %s"),paramName) );
} }
// if we don't have the value of a create param set in the xml // if we don't have the value of a create param set in the xml
// we use the default value // we use the default value
if ( propiter != propertyNodes.end() ) if ( propiter != propertyNodes.end() )
{ {
wxXmlNode* prop = propiter->second ; wxXmlNode* prop = propiter->second;
if ( pi->GetTypeInfo()->IsObjectType() ) if ( pi->GetTypeInfo()->IsObjectType() )
{ {
createParamOids[i] = ReadComponent( prop , callbacks ) ; createParamOids[i] = ReadComponent( prop, callbacks );
createClassInfos[i] = dynamic_cast<const wxClassTypeInfo*>(pi->GetTypeInfo())->GetClassInfo() ; createClassInfos[i] =
wx_dynamic_cast(const wxClassTypeInfo*, pi->GetTypeInfo())->GetClassInfo();
} }
else else
{ {
createParamOids[i] = wxInvalidObjectID ; createParamOids[i] = wxInvalidObjectID;
createParams[i] = ReadValue( prop , pi->GetTypeInfo() ) ; createParams[i] = ReadValue( prop, pi->GetTypeInfo() );
if( pi->GetFlags() & wxPROP_ENUM_STORE_LONG ) if( pi->GetFlags() & wxPROP_ENUM_STORE_LONG )
{ {
const wxEnumTypeInfo *eti = dynamic_cast<const wxEnumTypeInfo*>( pi->GetTypeInfo() ) ; const wxEnumTypeInfo *eti =
wx_dynamic_cast(const wxEnumTypeInfo*, pi->GetTypeInfo() );
if ( eti ) if ( eti )
{ {
long realval ; long realval;
eti->ConvertToLong( createParams[i] , realval ) ; eti->ConvertToLong( createParams[i], realval );
createParams[i] = wxxVariant( realval ) ; createParams[i] = wxVariantBase( realval );
} }
else else
{ {
wxLogError( _("Type must have enum - long conversion") ) ; wxLogError( _("Type must have enum - long conversion") );
} }
} }
createClassInfos[i] = NULL ; createClassInfos[i] = NULL;
} }
for ( size_t j = 0 ; j < propertyNames.size() ; ++j ) for ( size_t j = 0; j < propertyNames.size(); ++j )
{ {
if ( propertyNames[j] == paramName ) if ( propertyNames[j] == paramName )
{ {
propertyNames[j] = wxEmptyString ; propertyNames[j] = wxEmptyString;
break ; break;
} }
} }
} }
@@ -364,13 +370,14 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
{ {
if ( pi->GetTypeInfo()->IsObjectType() ) if ( pi->GetTypeInfo()->IsObjectType() )
{ {
createParamOids[i] = wxNullObjectID ; createParamOids[i] = wxNullObjectID;
createClassInfos[i] = dynamic_cast<const wxClassTypeInfo*>(pi->GetTypeInfo())->GetClassInfo() ; createClassInfos[i] =
wx_dynamic_cast(const wxClassTypeInfo*, pi->GetTypeInfo())->GetClassInfo();
} }
else else
{ {
createParams[i] = pi->GetDefaultValue() ; createParams[i] = pi->GetDefaultValue();
createParamOids[i] = wxInvalidObjectID ; createParamOids[i] = wxInvalidObjectID;
} }
} }
} }
@@ -385,51 +392,55 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
classInfo->GetCreateParamCount(), classInfo->GetCreateParamCount(),
createParams, createParamOids, createClassInfos, metadata ); createParams, createParamOids, createClassInfos, metadata );
// now stream in the rest of the properties, in the sequence their properties were written in the xml // now stream in the rest of the properties, in the sequence their
for ( size_t j = 0 ; j < propertyNames.size() ; ++j ) // properties were written in the xml
for ( size_t j = 0; j < propertyNames.size(); ++j )
{ {
if ( propertyNames[j].length() ) if ( propertyNames[j].length() )
{ {
PropertyNodes::iterator propiter = propertyNodes.find( propertyNames[j] ) ; PropertyNodes::iterator propiter = propertyNodes.find( propertyNames[j] );
if ( propiter != propertyNodes.end() ) if ( propiter != propertyNodes.end() )
{ {
wxXmlNode* prop = propiter->second ; wxXmlNode* prop = propiter->second;
const wxPropertyInfo* pi = classInfo->FindPropertyInfo( propertyNames[j].c_str() ) ; const wxPropertyInfo* pi =
classInfo->FindPropertyInfo( propertyNames[j].c_str() );
if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION ) if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION )
{ {
const wxCollectionTypeInfo* collType = dynamic_cast< const wxCollectionTypeInfo* >( pi->GetTypeInfo() ) ; const wxCollectionTypeInfo* collType =
const wxTypeInfo * elementType = collType->GetElementType() ; wx_dynamic_cast( const wxCollectionTypeInfo*, pi->GetTypeInfo() );
const wxTypeInfo * elementType = collType->GetElementType();
while( prop ) while( prop )
{ {
if ( prop->GetName() != wxT("element") ) if ( prop->GetName() != wxT("element") )
{ {
wxLogError( _("A non empty collection must consist of 'element' nodes" ) ) ; wxLogError( _("A non empty collection must consist of 'element' nodes" ) );
break ; break;
} }
wxXmlNode* elementContent = prop->GetChildren() ;
wxXmlNode* elementContent = prop->GetChildren();
if ( elementContent ) if ( elementContent )
{ {
// we skip empty elements // we skip empty elements
if ( elementType->IsObjectType() ) if ( elementType->IsObjectType() )
{ {
int valueId = ReadComponent( elementContent , callbacks ) ; int valueId = ReadComponent( elementContent, callbacks );
if ( valueId != wxInvalidObjectID ) if ( valueId != wxInvalidObjectID )
{ {
if ( pi->GetAccessor()->HasAdder() ) if ( pi->GetAccessor()->HasAdder() )
callbacks->AddToPropertyCollectionAsObject( objectID , classInfo , pi , valueId ) ; callbacks->AddToPropertyCollectionAsObject( objectID, classInfo, pi, valueId );
// TODO for collections we must have a notation on taking over ownership or not // TODO for collections we must have a notation on taking over ownership or not
if ( elementType->GetKind() == wxT_OBJECT && valueId != wxNullObjectID ) if ( elementType->GetKind() == wxT_OBJECT && valueId != wxNullObjectID )
callbacks->DestroyObject( valueId , GetObjectClassInfo( valueId ) ) ; callbacks->DestroyObject( valueId, GetObjectClassInfo( valueId ) );
} }
} }
else else
{ {
wxxVariant elementValue = ReadValue( elementContent , elementType ) ; wxVariantBase elementValue = ReadValue( elementContent, elementType );
if ( pi->GetAccessor()->HasAdder() ) if ( pi->GetAccessor()->HasAdder() )
callbacks->AddToPropertyCollection( objectID , classInfo ,pi , elementValue ) ; callbacks->AddToPropertyCollection( objectID, classInfo,pi, elementValue );
} }
} }
prop = prop->GetNext() ; prop = prop->GetNext();
} }
} }
else if ( pi->GetTypeInfo()->IsObjectType() ) else if ( pi->GetTypeInfo()->IsObjectType() )
@@ -440,19 +451,19 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
{ {
if ( prop->GetName() == wxT("object") ) if ( prop->GetName() == wxT("object") )
{ {
int valueId = ReadComponent( prop , callbacks ) ; int valueId = ReadComponent( prop, callbacks );
if ( valueId != wxInvalidObjectID ) if ( valueId != wxInvalidObjectID )
{ {
callbacks->SetPropertyAsObject( objectID , classInfo , pi , valueId ) ; callbacks->SetPropertyAsObject( objectID, classInfo, pi, valueId );
if ( pi->GetTypeInfo()->GetKind() == wxT_OBJECT && valueId != wxNullObjectID ) if ( pi->GetTypeInfo()->GetKind() == wxT_OBJECT && valueId != wxNullObjectID )
callbacks->DestroyObject( valueId , GetObjectClassInfo( valueId ) ) ; callbacks->DestroyObject( valueId, GetObjectClassInfo( valueId ) );
} }
} }
else else
{ {
wxASSERT( pi->GetTypeInfo()->HasStringConverters() ) ; wxASSERT( pi->GetTypeInfo()->HasStringConverters() );
wxxVariant nodeval = ReadValue( prop , pi->GetTypeInfo() ) ; wxVariantBase nodeval = ReadValue( prop, pi->GetTypeInfo() );
callbacks->SetProperty( objectID, classInfo ,pi , nodeval ) ; callbacks->SetProperty( objectID, classInfo,pi, nodeval );
} }
} }
} }
@@ -460,79 +471,80 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
{ {
if ( prop ) if ( prop )
{ {
wxString resstring = prop->GetContent() ; wxString resstring = prop->GetContent();
wxInt32 pos = resstring.Find('.') ; wxInt32 pos = resstring.Find('.');
if ( pos != wxNOT_FOUND ) if ( pos != wxNOT_FOUND )
{ {
int sinkOid = atol(resstring.Left(pos).ToAscii()) ; int sinkOid = atol(resstring.Left(pos).ToAscii());
wxString handlerName = resstring.Mid(pos+1) ; wxString handlerName = resstring.Mid(pos+1);
wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid ) ; wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid );
callbacks->SetConnect( objectID , classInfo , pi , sinkClassInfo , callbacks->SetConnect( objectID, classInfo, pi, sinkClassInfo,
sinkClassInfo->FindHandlerInfo(handlerName) , sinkOid ) ; sinkClassInfo->FindHandlerInfo(handlerName), sinkOid );
} }
else else
{ {
wxLogError( _("incorrect event handler string, missing dot") ) ; wxLogError( _("incorrect event handler string, missing dot") );
} }
} }
} }
else else
{ {
wxxVariant nodeval = ReadValue( prop , pi->GetTypeInfo() ) ; wxVariantBase nodeval = ReadValue( prop, pi->GetTypeInfo() );
if( pi->GetFlags() & wxPROP_ENUM_STORE_LONG ) if( pi->GetFlags() & wxPROP_ENUM_STORE_LONG )
{ {
const wxEnumTypeInfo *eti = dynamic_cast<const wxEnumTypeInfo*>( pi->GetTypeInfo() ) ; const wxEnumTypeInfo *eti =
wx_dynamic_cast(const wxEnumTypeInfo*, pi->GetTypeInfo() );
if ( eti ) if ( eti )
{ {
long realval ; long realval;
eti->ConvertToLong( nodeval , realval ) ; eti->ConvertToLong( nodeval, realval );
nodeval = wxxVariant( realval ) ; nodeval = wxVariantBase( realval );
} }
else else
{ {
wxLogError( _("Type must have enum - long conversion") ) ; wxLogError( _("Type must have enum - long conversion") );
} }
} }
callbacks->SetProperty( objectID, classInfo ,pi , nodeval ) ; callbacks->SetProperty( objectID, classInfo,pi, nodeval );
} }
} }
} }
} }
delete[] createParams ; delete[] createParams;
delete[] createParamOids ; delete[] createParamOids;
delete[] createClassInfos ; delete[] createClassInfos;
return objectID; return objectID;
} }
wxxVariant wxXmlReader::ReadValue(wxXmlNode *node, wxVariantBase wxObjectXmlReader::ReadValue(wxXmlNode *node,
const wxTypeInfo *type ) const wxTypeInfo *type )
{ {
wxString content ; wxString content;
if ( node ) if ( node )
content = node->GetContent() ; content = node->GetContent();
wxxVariant result ; wxVariantBase result;
type->ConvertFromString( content , result ) ; type->ConvertFromString( content, result );
return result ; return result;
} }
int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks) int wxObjectXmlReader::ReadObject( const wxString &name, wxObjectWriterCallback *callbacks)
{ {
wxXmlNode *iter = m_parent->GetChildren() ; wxXmlNode *iter = m_parent->GetChildren();
while ( iter ) while ( iter )
{ {
wxString entryName ; wxString entryName;
if ( iter->GetAttribute(wxT("name"), &entryName) ) if ( iter->GetPropVal(wxT("name"), &entryName) )
{ {
if ( entryName == name ) if ( entryName == name )
return ReadComponent( iter->GetChildren() , callbacks ) ; return ReadComponent( iter->GetChildren(), callbacks );
} }
iter = iter->GetNext() ; iter = iter->GetNext();
} }
return wxInvalidObjectID ; return wxInvalidObjectID;
} }
#endif // wxUSE_EXTENDED_RTTI #endif // wxUSE_EXTENDED_RTTI