was missing in xti merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
@@ -29,24 +29,28 @@
|
||||
#include "wx/xml/xml.h"
|
||||
#include "wx/tokenzr.h"
|
||||
#include "wx/txtstrm.h"
|
||||
|
||||
#include "wx/xtistrm.h"
|
||||
|
||||
// STL headers
|
||||
|
||||
#include "wx/beforestd.h"
|
||||
#include <map>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include "wx/afterstd.h"
|
||||
|
||||
using namespace std ;
|
||||
using namespace std;
|
||||
|
||||
//
|
||||
// XML Streaming
|
||||
//
|
||||
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxObjectXmlWriter
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// 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 ) );
|
||||
}
|
||||
@@ -54,147 +58,144 @@ void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data )
|
||||
wxString wxXmlGetContentFromNode( wxXmlNode *node )
|
||||
{
|
||||
if ( node->GetChildren() )
|
||||
return node->GetChildren()->GetContent() ;
|
||||
return node->GetChildren()->GetContent();
|
||||
else
|
||||
return wxEmptyString ;
|
||||
return wxEmptyString;
|
||||
}
|
||||
|
||||
struct wxXmlWriter::wxXmlWriterInternal
|
||||
struct wxObjectXmlWriter::wxObjectXmlWriterInternal
|
||||
{
|
||||
wxXmlNode *m_root ;
|
||||
wxXmlNode *m_current ;
|
||||
vector< wxXmlNode * > m_objectStack ;
|
||||
wxXmlNode *m_root;
|
||||
wxXmlNode *m_current;
|
||||
vector< wxXmlNode * > m_objectStack;
|
||||
|
||||
void Push( wxXmlNode *newCurrent )
|
||||
{
|
||||
m_objectStack.push_back( m_current ) ;
|
||||
m_current = newCurrent ;
|
||||
m_objectStack.push_back( m_current );
|
||||
m_current = newCurrent;
|
||||
}
|
||||
|
||||
void Pop()
|
||||
{
|
||||
m_current = m_objectStack.back() ;
|
||||
m_objectStack.pop_back() ;
|
||||
m_current = m_objectStack.back();
|
||||
m_objectStack.pop_back();
|
||||
}
|
||||
} ;
|
||||
};
|
||||
|
||||
wxXmlWriter::wxXmlWriter( wxXmlNode * rootnode )
|
||||
wxObjectXmlWriter::wxObjectXmlWriter( wxXmlNode * rootnode )
|
||||
{
|
||||
m_data = new wxXmlWriterInternal() ;
|
||||
m_data->m_root = rootnode ;
|
||||
m_data->m_current = rootnode ;
|
||||
m_data = new wxObjectXmlWriterInternal();
|
||||
m_data->m_root = 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;
|
||||
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("entry"));
|
||||
pnode->AddAttribute(wxString(wxT("name")), name);
|
||||
m_data->m_current->AddChild(pnode) ;
|
||||
m_data->Push( pnode ) ;
|
||||
pnode->AddProperty(wxString(wxT("name")), name);
|
||||
m_data->m_current->AddChild(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;
|
||||
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
|
||||
pnode->AddAttribute(wxT("class"), wxString(classInfo->GetClassName()));
|
||||
pnode->AddAttribute(wxT("id"), wxString::Format( wxT("%d") , objectID ) );
|
||||
pnode->AddProperty(wxT("class"), wxString(classInfo->GetClassName()));
|
||||
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->Push( pnode ) ;
|
||||
m_data->m_current->AddChild(pnode);
|
||||
m_data->Push( pnode );
|
||||
}
|
||||
|
||||
// end of writing the root object
|
||||
void wxXmlWriter::DoEndWriteObject(const wxObject *WXUNUSED(object), const wxClassInfo *WXUNUSED(classInfo), int WXUNUSED(objectID) )
|
||||
void wxObjectXmlWriter::DoEndWriteObject(const wxObject *WXUNUSED(object),
|
||||
const wxClassInfo *WXUNUSED(classInfo),
|
||||
int WXUNUSED(objectID) )
|
||||
{
|
||||
m_data->Pop() ;
|
||||
m_data->Pop();
|
||||
}
|
||||
|
||||
// writes a property in the stream format
|
||||
void wxXmlWriter::DoWriteSimpleType( wxxVariant &value )
|
||||
void wxObjectXmlWriter::DoWriteSimpleType( wxVariantBase &value )
|
||||
{
|
||||
wxXmlAddContentToNode( m_data->m_current ,value.GetAsString() ) ;
|
||||
wxXmlAddContentToNode( m_data->m_current,value.GetAsString() );
|
||||
}
|
||||
|
||||
void wxXmlWriter::DoBeginWriteElement()
|
||||
void wxObjectXmlWriter::DoBeginWriteElement()
|
||||
{
|
||||
wxXmlNode *pnode;
|
||||
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("element") );
|
||||
m_data->m_current->AddChild(pnode) ;
|
||||
m_data->Push( pnode ) ;
|
||||
m_data->m_current->AddChild(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;
|
||||
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("prop") );
|
||||
pnode->AddAttribute(wxT("name"), pi->GetName() );
|
||||
m_data->m_current->AddChild(pnode) ;
|
||||
m_data->Push( pnode ) ;
|
||||
pnode->AddProperty(wxT("name"), pi->GetName() );
|
||||
m_data->m_current->AddChild(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();
|
||||
}
|
||||
|
||||
|
||||
|
||||
// insert an object reference to an already written object
|
||||
void wxXmlWriter::DoWriteRepeatedObject( int objectID )
|
||||
void wxObjectXmlWriter::DoWriteRepeatedObject( int objectID )
|
||||
{
|
||||
wxXmlNode *pnode;
|
||||
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
|
||||
pnode->AddAttribute(wxString(wxT("href")), wxString::Format( wxT("%d") , objectID ) );
|
||||
m_data->m_current->AddChild(pnode) ;
|
||||
pnode->AddProperty(wxString(wxT("href")), wxString::Format( wxT("%d"), objectID ) );
|
||||
m_data->m_current->AddChild(pnode);
|
||||
}
|
||||
|
||||
// insert a null reference
|
||||
void wxXmlWriter::DoWriteNullObject()
|
||||
void wxObjectXmlWriter::DoWriteNullObject()
|
||||
{
|
||||
wxXmlNode *pnode;
|
||||
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 wxXmlWriter::DoWriteDelegate( const wxObject *WXUNUSED(object), const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(pi) ,
|
||||
const wxObject *eventSink, int sinkObjectID , const wxClassInfo* WXUNUSED(eventSinkClassInfo) , const wxHandlerInfo* handlerInfo )
|
||||
void wxObjectXmlWriter::DoWriteDelegate( const wxObject *WXUNUSED(object),
|
||||
const wxClassInfo* WXUNUSED(classInfo),
|
||||
const wxPropertyInfo *WXUNUSED(pi),
|
||||
const wxObject *eventSink, int sinkObjectID,
|
||||
const wxClassInfo* WXUNUSED(eventSinkClassInfo),
|
||||
const wxHandlerInfo* handlerInfo )
|
||||
{
|
||||
if ( eventSink != NULL && handlerInfo != NULL )
|
||||
{
|
||||
wxXmlAddContentToNode( m_data->m_current ,wxString::Format(wxT("%d.%s"), sinkObjectID , handlerInfo->GetName().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
|
||||
*/
|
||||
|
||||
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;
|
||||
wxClassInfo *classInfo;
|
||||
|
||||
wxxVariant *createParams ;
|
||||
int *createParamOids ;
|
||||
const wxClassInfo** createClassInfos ;
|
||||
wxVariantBase *createParams;
|
||||
int *createParamOids;
|
||||
const wxClassInfo** createClassInfos;
|
||||
wxXmlNode *children;
|
||||
int objectID;
|
||||
wxString ObjectIdString ;
|
||||
wxString ObjectIdString;
|
||||
|
||||
children = node->GetChildren();
|
||||
if (!children)
|
||||
{
|
||||
// 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 ) )
|
||||
{
|
||||
return objectID ;
|
||||
return objectID;
|
||||
}
|
||||
else
|
||||
{
|
||||
wxLogError( _("Forward hrefs are not supported") ) ;
|
||||
return wxInvalidObjectID ;
|
||||
wxLogError( _("Forward hrefs are not supported") );
|
||||
return wxInvalidObjectID;
|
||||
}
|
||||
}
|
||||
if ( !node->GetAttribute(wxT("id") , &ObjectIdString ) )
|
||||
if ( !node->GetPropVal(wxT("id"), &ObjectIdString ) )
|
||||
{
|
||||
return wxNullObjectID;
|
||||
}
|
||||
}
|
||||
if (!node->GetAttribute(wxT("class"), &className))
|
||||
if (!node->GetPropVal(wxT("class"), &className))
|
||||
{
|
||||
// No class name. Eek. FIXME: error handling
|
||||
return wxInvalidObjectID;
|
||||
}
|
||||
|
||||
classInfo = wxClassInfo::FindClass(className);
|
||||
if ( classInfo == NULL )
|
||||
{
|
||||
wxLogError( wxString::Format(_("unknown class %s"),className ) ) ;
|
||||
return wxInvalidObjectID ;
|
||||
wxLogError( wxString::Format(_("unknown class %s"),className ) );
|
||||
return wxInvalidObjectID;
|
||||
}
|
||||
|
||||
if ( children != NULL && children->GetType() == wxXML_TEXT_NODE )
|
||||
{
|
||||
wxLogError(_("objects cannot have XML Text Nodes") ) ;
|
||||
wxLogError(_("objects cannot have XML Text Nodes") );
|
||||
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
|
||||
return wxInvalidObjectID;
|
||||
}
|
||||
objectID = atoi( ObjectIdString.ToAscii() ) ;
|
||||
objectID = atoi( ObjectIdString.ToAscii() );
|
||||
|
||||
// is this object already has been streamed in, return it here
|
||||
if ( HasObjectClassInfo( objectID ) )
|
||||
{
|
||||
wxLogError ( wxString::Format(_("Doubly used id : %d"), objectID ) ) ;
|
||||
return wxInvalidObjectID ;
|
||||
wxLogError ( wxString::Format(_("Doubly used id : %d"), objectID ) );
|
||||
return wxInvalidObjectID;
|
||||
}
|
||||
|
||||
// new object, start with allocation
|
||||
// first make the object know to our internal registry
|
||||
SetObjectClassInfo( objectID , classInfo ) ;
|
||||
SetObjectClassInfo( objectID, classInfo );
|
||||
|
||||
wxxVariantArray metadata ;
|
||||
wxXmlAttribute *xp = node->GetAttributes() ;
|
||||
wxVariantBaseArray metadata;
|
||||
wxXmlProperty *xp = node->GetProperties();
|
||||
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() )
|
||||
callbacks->AllocateObject(objectID, classInfo, metadata);
|
||||
|
||||
//
|
||||
// stream back the Create parameters first
|
||||
createParams = new wxxVariant[ classInfo->GetCreateParamCount() ] ;
|
||||
createParamOids = new int[classInfo->GetCreateParamCount() ] ;
|
||||
createClassInfos = new const wxClassInfo*[classInfo->GetCreateParamCount() ] ;
|
||||
createParams = new wxVariantBase[ classInfo->GetCreateParamCount() ];
|
||||
createParamOids = new int[classInfo->GetCreateParamCount() ];
|
||||
createClassInfos = new const wxClassInfo*[classInfo->GetCreateParamCount() ];
|
||||
|
||||
#if wxUSE_UNICODE
|
||||
typedef map<wstring, wxXmlNode *> PropertyNodes ;
|
||||
typedef vector<wstring> PropertyNames ;
|
||||
typedef map<wstring, wxXmlNode *> PropertyNodes;
|
||||
typedef vector<wstring> PropertyNames;
|
||||
#else
|
||||
typedef map<string, wxXmlNode *> PropertyNodes ;
|
||||
typedef vector<string> PropertyNames ;
|
||||
typedef map<string, wxXmlNode *> PropertyNodes;
|
||||
typedef vector<string> PropertyNames;
|
||||
#endif
|
||||
PropertyNodes propertyNodes ;
|
||||
PropertyNames propertyNames ;
|
||||
PropertyNodes propertyNodes;
|
||||
PropertyNames propertyNames;
|
||||
|
||||
while( children )
|
||||
{
|
||||
wxString name ;
|
||||
children->GetAttribute( wxT("name") , &name ) ;
|
||||
propertyNames.push_back( (const wxChar*)name.c_str() ) ;
|
||||
propertyNodes[(const wxChar*)name.c_str()] = children->GetChildren() ;
|
||||
children = children->GetNext() ;
|
||||
wxString name;
|
||||
children->GetPropVal( wxT("name"), &name );
|
||||
propertyNames.push_back( (const wxChar*)name.c_str() );
|
||||
propertyNodes[(const wxChar*)name.c_str()] = children->GetChildren();
|
||||
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) ;
|
||||
PropertyNodes::iterator propiter = propertyNodes.find( paramName ) ;
|
||||
const wxPropertyInfo* pi = classInfo->FindPropertyInfo( paramName ) ;
|
||||
const wxChar* paramName = classInfo->GetCreateParamName(i);
|
||||
PropertyNodes::iterator propiter = propertyNodes.find( paramName );
|
||||
const wxPropertyInfo* pi = classInfo->FindPropertyInfo( paramName );
|
||||
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
|
||||
// we use the default value
|
||||
if ( propiter != propertyNodes.end() )
|
||||
{
|
||||
wxXmlNode* prop = propiter->second ;
|
||||
wxXmlNode* prop = propiter->second;
|
||||
if ( pi->GetTypeInfo()->IsObjectType() )
|
||||
{
|
||||
createParamOids[i] = ReadComponent( prop , callbacks ) ;
|
||||
createClassInfos[i] = dynamic_cast<const wxClassTypeInfo*>(pi->GetTypeInfo())->GetClassInfo() ;
|
||||
createParamOids[i] = ReadComponent( prop, callbacks );
|
||||
createClassInfos[i] =
|
||||
wx_dynamic_cast(const wxClassTypeInfo*, pi->GetTypeInfo())->GetClassInfo();
|
||||
}
|
||||
else
|
||||
{
|
||||
createParamOids[i] = wxInvalidObjectID ;
|
||||
createParams[i] = ReadValue( prop , pi->GetTypeInfo() ) ;
|
||||
createParamOids[i] = wxInvalidObjectID;
|
||||
createParams[i] = ReadValue( prop, pi->GetTypeInfo() );
|
||||
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 )
|
||||
{
|
||||
long realval ;
|
||||
eti->ConvertToLong( createParams[i] , realval ) ;
|
||||
createParams[i] = wxxVariant( realval ) ;
|
||||
long realval;
|
||||
eti->ConvertToLong( createParams[i], realval );
|
||||
createParams[i] = wxVariantBase( realval );
|
||||
}
|
||||
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 )
|
||||
{
|
||||
propertyNames[j] = wxEmptyString ;
|
||||
break ;
|
||||
propertyNames[j] = wxEmptyString;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -364,13 +370,14 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
|
||||
{
|
||||
if ( pi->GetTypeInfo()->IsObjectType() )
|
||||
{
|
||||
createParamOids[i] = wxNullObjectID ;
|
||||
createClassInfos[i] = dynamic_cast<const wxClassTypeInfo*>(pi->GetTypeInfo())->GetClassInfo() ;
|
||||
createParamOids[i] = wxNullObjectID;
|
||||
createClassInfos[i] =
|
||||
wx_dynamic_cast(const wxClassTypeInfo*, pi->GetTypeInfo())->GetClassInfo();
|
||||
}
|
||||
else
|
||||
{
|
||||
createParams[i] = pi->GetDefaultValue() ;
|
||||
createParamOids[i] = wxInvalidObjectID ;
|
||||
createParams[i] = pi->GetDefaultValue();
|
||||
createParamOids[i] = wxInvalidObjectID;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -385,51 +392,55 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
|
||||
classInfo->GetCreateParamCount(),
|
||||
createParams, createParamOids, createClassInfos, metadata );
|
||||
|
||||
// now stream in the rest of the properties, in the sequence their properties were written in the xml
|
||||
for ( size_t j = 0 ; j < propertyNames.size() ; ++j )
|
||||
// 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] ) ;
|
||||
PropertyNodes::iterator propiter = propertyNodes.find( propertyNames[j] );
|
||||
if ( propiter != propertyNodes.end() )
|
||||
{
|
||||
wxXmlNode* prop = propiter->second ;
|
||||
const wxPropertyInfo* pi = classInfo->FindPropertyInfo( propertyNames[j].c_str() ) ;
|
||||
wxXmlNode* prop = propiter->second;
|
||||
const wxPropertyInfo* pi =
|
||||
classInfo->FindPropertyInfo( propertyNames[j].c_str() );
|
||||
if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION )
|
||||
{
|
||||
const wxCollectionTypeInfo* collType = dynamic_cast< const wxCollectionTypeInfo* >( pi->GetTypeInfo() ) ;
|
||||
const wxTypeInfo * elementType = collType->GetElementType() ;
|
||||
const wxCollectionTypeInfo* collType =
|
||||
wx_dynamic_cast( const wxCollectionTypeInfo*, pi->GetTypeInfo() );
|
||||
const wxTypeInfo * elementType = collType->GetElementType();
|
||||
while( prop )
|
||||
{
|
||||
if ( prop->GetName() != wxT("element") )
|
||||
{
|
||||
wxLogError( _("A non empty collection must consist of 'element' nodes" ) ) ;
|
||||
break ;
|
||||
wxLogError( _("A non empty collection must consist of 'element' nodes" ) );
|
||||
break;
|
||||
}
|
||||
wxXmlNode* elementContent = prop->GetChildren() ;
|
||||
|
||||
wxXmlNode* elementContent = prop->GetChildren();
|
||||
if ( elementContent )
|
||||
{
|
||||
// we skip empty elements
|
||||
if ( elementType->IsObjectType() )
|
||||
{
|
||||
int valueId = ReadComponent( elementContent , callbacks ) ;
|
||||
int valueId = ReadComponent( elementContent, callbacks );
|
||||
if ( valueId != wxInvalidObjectID )
|
||||
{
|
||||
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
|
||||
if ( elementType->GetKind() == wxT_OBJECT && valueId != wxNullObjectID )
|
||||
callbacks->DestroyObject( valueId , GetObjectClassInfo( valueId ) ) ;
|
||||
callbacks->DestroyObject( valueId, GetObjectClassInfo( valueId ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
wxxVariant elementValue = ReadValue( elementContent , elementType ) ;
|
||||
wxVariantBase elementValue = ReadValue( elementContent, elementType );
|
||||
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() )
|
||||
@@ -440,19 +451,19 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
|
||||
{
|
||||
if ( prop->GetName() == wxT("object") )
|
||||
{
|
||||
int valueId = ReadComponent( prop , callbacks ) ;
|
||||
int valueId = ReadComponent( prop, callbacks );
|
||||
if ( valueId != wxInvalidObjectID )
|
||||
{
|
||||
callbacks->SetPropertyAsObject( objectID , classInfo , pi , valueId ) ;
|
||||
callbacks->SetPropertyAsObject( objectID, classInfo, pi, valueId );
|
||||
if ( pi->GetTypeInfo()->GetKind() == wxT_OBJECT && valueId != wxNullObjectID )
|
||||
callbacks->DestroyObject( valueId , GetObjectClassInfo( valueId ) ) ;
|
||||
callbacks->DestroyObject( valueId, GetObjectClassInfo( valueId ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
wxASSERT( pi->GetTypeInfo()->HasStringConverters() ) ;
|
||||
wxxVariant nodeval = ReadValue( prop , pi->GetTypeInfo() ) ;
|
||||
callbacks->SetProperty( objectID, classInfo ,pi , nodeval ) ;
|
||||
wxASSERT( pi->GetTypeInfo()->HasStringConverters() );
|
||||
wxVariantBase nodeval = ReadValue( prop, pi->GetTypeInfo() );
|
||||
callbacks->SetProperty( objectID, classInfo,pi, nodeval );
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -460,79 +471,80 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
|
||||
{
|
||||
if ( prop )
|
||||
{
|
||||
wxString resstring = prop->GetContent() ;
|
||||
wxInt32 pos = resstring.Find('.') ;
|
||||
wxString resstring = prop->GetContent();
|
||||
wxInt32 pos = resstring.Find('.');
|
||||
if ( pos != wxNOT_FOUND )
|
||||
{
|
||||
int sinkOid = atol(resstring.Left(pos).ToAscii()) ;
|
||||
wxString handlerName = resstring.Mid(pos+1) ;
|
||||
wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid ) ;
|
||||
int sinkOid = atol(resstring.Left(pos).ToAscii());
|
||||
wxString handlerName = resstring.Mid(pos+1);
|
||||
wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid );
|
||||
|
||||
callbacks->SetConnect( objectID , classInfo , pi , sinkClassInfo ,
|
||||
sinkClassInfo->FindHandlerInfo(handlerName) , sinkOid ) ;
|
||||
callbacks->SetConnect( objectID, classInfo, pi, sinkClassInfo,
|
||||
sinkClassInfo->FindHandlerInfo(handlerName), sinkOid );
|
||||
}
|
||||
else
|
||||
{
|
||||
wxLogError( _("incorrect event handler string, missing dot") ) ;
|
||||
wxLogError( _("incorrect event handler string, missing dot") );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
wxxVariant nodeval = ReadValue( prop , pi->GetTypeInfo() ) ;
|
||||
wxVariantBase nodeval = ReadValue( prop, pi->GetTypeInfo() );
|
||||
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 )
|
||||
{
|
||||
long realval ;
|
||||
eti->ConvertToLong( nodeval , realval ) ;
|
||||
nodeval = wxxVariant( realval ) ;
|
||||
long realval;
|
||||
eti->ConvertToLong( nodeval, realval );
|
||||
nodeval = wxVariantBase( realval );
|
||||
}
|
||||
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[] createParamOids ;
|
||||
delete[] createClassInfos ;
|
||||
delete[] createParams;
|
||||
delete[] createParamOids;
|
||||
delete[] createClassInfos;
|
||||
|
||||
return objectID;
|
||||
}
|
||||
|
||||
wxxVariant wxXmlReader::ReadValue(wxXmlNode *node,
|
||||
wxVariantBase wxObjectXmlReader::ReadValue(wxXmlNode *node,
|
||||
const wxTypeInfo *type )
|
||||
{
|
||||
wxString content ;
|
||||
wxString content;
|
||||
if ( node )
|
||||
content = node->GetContent() ;
|
||||
wxxVariant result ;
|
||||
type->ConvertFromString( content , result ) ;
|
||||
return result ;
|
||||
content = node->GetContent();
|
||||
wxVariantBase result;
|
||||
type->ConvertFromString( content, 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 )
|
||||
{
|
||||
wxString entryName ;
|
||||
if ( iter->GetAttribute(wxT("name"), &entryName) )
|
||||
wxString entryName;
|
||||
if ( iter->GetPropVal(wxT("name"), &entryName) )
|
||||
{
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user