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

redistribution of code for different library parts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-08-23 19:40:04 +00:00
parent 9d5f4fbbd4
commit 9c8046dded
7 changed files with 727 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

444
src/common/xtistrm.cpp
View File

@@ -25,10 +25,10 @@
#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
@@ -78,11 +78,7 @@ void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo
void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , bool isEmbedded, wxxVariantArray &metadata )
{
// hack to avoid writing out embedded windows, these are windows that are constructed as part of other windows, they would
// doubly constructed afterwards
const wxWindow * win = dynamic_cast<const wxWindow*>(object) ;
if ( win && win->GetId() < 0 )
if ( !classInfo->BeforeWriteObject( object , this , persister , metadata) )
return ;
if ( persister->BeforeWriteObject( this , object , classInfo , metadata) )
@@ -112,7 +108,7 @@ void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo
}
}
void wxWriter::FindConnectEntry(const wxWindow * evSource,const wxDelegateTypeInfo* dti, const wxObject* &sink , const wxHandlerInfo *&handler)
void wxWriter::FindConnectEntry(const wxEvtHandler * evSource,const wxDelegateTypeInfo* dti, const wxObject* &sink , const wxHandlerInfo *&handler)
{
wxList *dynamicEvents = evSource->GetDynamicEventTable() ;
@@ -124,13 +120,10 @@ void wxWriter::FindConnectEntry(const wxWindow * evSource,const wxDelegateTypeIn
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
)
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() ;
@@ -182,8 +175,11 @@ void wxWriter::WriteAllProperties( const wxObject * obj , const wxClassInfo* ci
}
}
void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , const wxPropertyInfo* pi , wxPersister *persister , wxWriterInternalPropertiesData *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) )
@@ -225,8 +221,8 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c
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") ) ;
const wxEvtHandler * evSource = dynamic_cast<const wxEvtHandler *>(obj) ;
wxASSERT_MSG( evSource , wxT("Illegal Object Class (Non-wxEvtHandler) as Event Source") ) ;
FindConnectEntry( evSource , dti , sink , handler ) ;
if ( persister->BeforeWriteDelegate( this , obj , ci , pi , sink , handler ) )
@@ -281,152 +277,6 @@ 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 ;
void Push( wxXmlNode *newCurrent )
{
m_objectStack.push_back( m_current ) ;
m_current = newCurrent ;
}
void Pop()
{
m_current = m_objectStack.back() ;
m_objectStack.pop_back() ;
}
} ;
wxXmlWriter::wxXmlWriter( wxXmlNode * rootnode )
{
m_data = new wxXmlWriterInternal() ;
m_data->m_root = rootnode ;
m_data->m_current = rootnode ;
}
wxXmlWriter::~wxXmlWriter()
{
delete m_data ;
}
void wxXmlWriter::DoBeginWriteTopLevelEntry( const wxString &name )
{
wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("entry"));
pnode->AddProperty(wxString("name"), name);
m_data->m_current->AddChild(pnode) ;
m_data->Push( pnode ) ;
}
void wxXmlWriter::DoEndWriteTopLevelEntry( const wxString &WXUNUSED(name) )
{
m_data->Pop() ;
}
void wxXmlWriter::DoBeginWriteObject(const wxObject *WXUNUSED(object), const wxClassInfo *classInfo, int objectID , wxxVariantArray &metadata )
{
wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
pnode->AddProperty(wxT("class"), wxString(classInfo->GetClassName()));
pnode->AddProperty(wxT("id"), wxString::Format( "%d" , objectID ) );
for ( size_t i = 0 ; i < metadata.GetCount() ; ++i )
{
pnode->AddProperty( metadata[i].GetName() , metadata[i].GetAsString() ) ;
}
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) )
{
m_data->Pop() ;
}
// writes a property in the stream format
void wxXmlWriter::DoWriteSimpleType( wxxVariant &value )
{
wxXmlAddContentToNode( m_data->m_current ,value.GetAsString() ) ;
}
void wxXmlWriter::DoBeginWriteElement()
{
wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, "element" );
m_data->m_current->AddChild(pnode) ;
m_data->Push( pnode ) ;
}
void wxXmlWriter::DoEndWriteElement()
{
m_data->Pop() ;
}
void wxXmlWriter::DoBeginWriteProperty(const wxPropertyInfo *pi )
{
wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, "prop" );
pnode->AddProperty(wxT("name"), pi->GetName() );
m_data->m_current->AddChild(pnode) ;
m_data->Push( pnode ) ;
}
void wxXmlWriter::DoEndWriteProperty(const wxPropertyInfo *WXUNUSED(propInfo) )
{
m_data->Pop() ;
}
// insert an object reference to an already written object
void wxXmlWriter::DoWriteRepeatedObject( int objectID )
{
wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
pnode->AddProperty(wxString("href"), wxString::Format( "%d" , objectID ) );
m_data->m_current->AddChild(pnode) ;
}
// insert a null reference
void wxXmlWriter::DoWriteNullObject()
{
wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
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 )
{
if ( eventSink != NULL && handlerInfo != NULL )
{
wxXmlAddContentToNode( m_data->m_current ,wxString::Format(wxT("%d.%s"), sinkObjectID , handlerInfo->GetName()) ) ;
}
}
// ----------------------------------------------------------------------------
// reading objects in
@@ -475,252 +325,6 @@ 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)
{
wxASSERT_MSG( callbacks , wxT("Does not support reading without a Depersistor") ) ;
wxString className;
wxClassInfo *classInfo;
wxxVariant *createParams ;
int *createParamOids ;
const wxClassInfo** createClassInfos ;
wxXmlNode *children;
int objectID;
wxString ObjectIdString ;
children = node->GetChildren();
if (!children)
{
// check for a null object or href
if (node->GetPropVal("href" , &ObjectIdString ) )
{
objectID = atoi( ObjectIdString.c_str() ) ;
wxASSERT_MSG( HasObjectClassInfo( objectID ) , wxT("Forward hrefs are not supported") ) ;
return objectID ;
}
if ( !node->GetPropVal("id" , &ObjectIdString ) )
{
return wxNullObjectID;
}
}
if (!node->GetPropVal("class", &className))
{
// No class name. Eek. FIXME: error handling
return wxInvalidObjectID;
}
classInfo = wxClassInfo::FindClass(className);
wxASSERT_MSG( classInfo , wxString::Format(wxT("unknown class %s"),className ) ) ;
wxASSERT_MSG( !children || children->GetType() != wxXML_TEXT_NODE , wxT("objects cannot have XML Text Nodes") ) ;
if (!node->GetPropVal("id", &ObjectIdString))
{
wxASSERT_MSG(0,wxT("Objects must have an id attribute") ) ;
// 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
wxASSERT_MSG( !HasObjectClassInfo( objectID ) , wxString::Format(wxT("Doubly used id : %d"), objectID ) ) ;
// new object, start with allocation
// first make the object know to our internal registry
SetObjectClassInfo( objectID , classInfo ) ;
wxxVariantArray metadata ;
wxXmlProperty *xp = node->GetProperties() ;
while ( xp )
{
if ( xp->GetName() != wxString("class") && xp->GetName() != wxString("id") )
{
metadata.Add( new wxxVariant( xp->GetValue() , xp->GetName() ) ) ;
}
xp = xp->GetNext() ;
}
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() ] ;
typedef map<string, wxXmlNode *> PropertyNodes ;
typedef vector<string> PropertyNames ;
PropertyNodes propertyNodes ;
PropertyNames propertyNames ;
while( children )
{
wxString name ;
children->GetPropVal( wxT("name") , &name ) ;
propertyNames.push_back( name.c_str() ) ;
propertyNodes[name.c_str()] = children->GetChildren() ;
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 ) ;
wxASSERT_MSG(pi,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 ;
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->GetTypeInfo() ) ;
if( pi->GetFlags() & wxPROP_ENUM_STORE_LONG )
{
const wxEnumTypeInfo *eti = dynamic_cast<const wxEnumTypeInfo*>( pi->GetTypeInfo() ) ;
wxASSERT_MSG( eti , wxT("Type must have enum - long conversion") ) ;
long realval ;
eti->ConvertToLong( createParams[i] , realval ) ;
createParams[i] = wxxVariant( realval ) ;
}
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, 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 )
{
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()->GetKind() == wxT_COLLECTION )
{
const wxCollectionTypeInfo* collType = dynamic_cast< const wxCollectionTypeInfo* >( pi->GetTypeInfo() ) ;
const wxTypeInfo * elementType = collType->GetElementType() ;
while( prop )
{
wxASSERT_MSG(prop->GetName() == wxT("element") , wxT("A non empty collection must consist of 'element' nodes")) ;
wxXmlNode* elementContent = prop->GetChildren() ;
if ( elementContent )
{
// we skip empty elements
if ( elementType->IsObjectType() )
{
int valueId = ReadComponent( elementContent , callbacks ) ;
if ( valueId != wxInvalidObjectID )
{
if ( pi->GetAccessor()->HasAdder() )
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 ) ) ;
}
}
else
{
wxxVariant elementValue = ReadValue( elementContent , elementType ) ;
if ( pi->GetAccessor()->HasAdder() )
callbacks->AddToPropertyCollection( objectID , classInfo ,pi , elementValue ) ;
}
}
prop = prop->GetNext() ;
}
}
else if ( pi->GetTypeInfo()->IsObjectType() )
{
int valueId = ReadComponent( prop , 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() )
{
if ( prop )
{
wxString resstring = prop->GetContent() ;
wxInt32 pos = resstring.Find('.') ;
assert( pos != wxNOT_FOUND ) ;
int sinkOid = atol(resstring.Left(pos)) ;
wxString handlerName = resstring.Mid(pos+1) ;
wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid ) ;
callbacks->SetConnect( objectID , classInfo , dynamic_cast<const wxDelegateTypeInfo*>(pi->GetTypeInfo()) , sinkClassInfo ,
sinkClassInfo->FindHandlerInfo(handlerName) , sinkOid ) ;
}
}
else
{
wxxVariant nodeval ;
callbacks->SetProperty( objectID, classInfo ,pi , ReadValue( prop , pi->GetTypeInfo() ) ) ;
}
}
}
}
delete[] createParams ;
delete[] createParamOids ;
delete[] createClassInfos ;
return objectID;
}
wxxVariant wxXmlReader::ReadValue(wxXmlNode *node,
const wxTypeInfo *type )
{
wxString content ;
if ( node )
content = node->GetContent() ;
wxxVariant result ;
type->ConvertFromString( content , result ) ;
return result ;
}
int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks)
{
wxXmlNode *iter = m_parent->GetChildren() ;
while ( iter )
{
wxString entryName ;
if ( iter->GetPropVal("name", &entryName) )
{
if ( entryName == name )
return ReadComponent( iter->GetChildren() , callbacks ) ;
}
iter = iter->GetNext() ;
}
return wxInvalidObjectID ;
}
// ----------------------------------------------------------------------------
// depersisting to memory
@@ -756,7 +360,7 @@ wxRuntimeDepersister::~wxRuntimeDepersister()
}
void wxRuntimeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo ,
wxxVariantArray &metadata)
wxxVariantArray &WXUNUSED(metadata))
{
wxObject *O;
O = classInfo->CreateObject();
@@ -769,7 +373,7 @@ void wxRuntimeDepersister::CreateObject(int objectID,
wxxVariant *params,
int *objectIdValues,
const wxClassInfo **objectClassInfos ,
wxxVariantArray &metadata)
wxxVariantArray &WXUNUSED(metadata))
{
wxObject *o;
o = m_data->GetObject(objectID);
@@ -836,12 +440,12 @@ void wxRuntimeDepersister::SetConnect(int eventSourceObjectID,
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() ,
ehsource->Connect( -1 , delegateInfo->GetEventType() ,
handlerInfo->GetEventFunction() , NULL /*user data*/ ,
ehsink ) ;
}
@@ -920,7 +524,7 @@ wxCodeDepersister::~wxCodeDepersister()
}
void wxCodeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo ,
wxxVariantArray &metadata)
wxxVariantArray &WXUNUSED(metadata))
{
wxString objectName = wxString::Format( "LocalObject_%d" , objectID ) ;
m_fp->WriteString( wxString::Format( "\t%s *%s = new %s;\n",
@@ -963,7 +567,7 @@ void wxCodeDepersister::CreateObject(int objectID,
wxxVariant *params,
int *objectIDValues,
const wxClassInfo **WXUNUSED(objectClassInfos) ,
wxxVariantArray &metadata
wxxVariantArray &WXUNUSED(metadata)
)
{
int i;
@@ -1011,7 +615,7 @@ void wxCodeDepersister::SetPropertyAsObject(int objectID,
}
void wxCodeDepersister::AddToPropertyCollection( int objectID ,
const wxClassInfo *classInfo,
const wxClassInfo *WXUNUSED(classInfo),
const wxPropertyInfo* propertyInfo ,
const wxxVariant &value)
{
@@ -1022,10 +626,10 @@ void wxCodeDepersister::AddToPropertyCollection( int objectID ,
}
// sets the corresponding property (value is an object)
void wxCodeDepersister::AddToPropertyCollectionAsObject(int objectID,
const wxClassInfo *classInfo,
const wxPropertyInfo* propertyInfo ,
int valueObjectId)
void wxCodeDepersister::AddToPropertyCollectionAsObject(int WXUNUSED(objectID),
const wxClassInfo *WXUNUSED(classInfo),
const wxPropertyInfo* WXUNUSED(propertyInfo) ,
int WXUNUSED(valueObjectId))
{
// TODO
}