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@66587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-01-05 10:29:54 +00:00
parent 5e8b5272d8
commit 19d85aac23
1 changed files with 251 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

430
src/common/xtistrm.cpp
View File

@@ -29,51 +29,61 @@
#include "wx/tokenzr.h" #include "wx/tokenzr.h"
#include "wx/txtstrm.h" #include "wx/txtstrm.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;
struct wxWriter::wxWriterInternal
// ----------------------------------------------------------------------------
// wxObjectWriter
// ----------------------------------------------------------------------------
struct wxObjectWriter::wxObjectWriterInternal
{ {
map< const wxObject*, int > m_writtenObjects; map< const wxObject*, int > m_writtenObjects;
int m_nextId; int m_nextId;
}; };
wxWriter::wxWriter() wxObjectWriter::wxObjectWriter()
{ {
m_data = new wxWriterInternal ; m_data = new wxObjectWriterInternal;
m_data->m_nextId = 0; m_data->m_nextId = 0;
} }
wxWriter::~wxWriter() wxObjectWriter::~wxObjectWriter()
{ {
delete m_data; delete m_data;
} }
struct wxWriter::wxWriterInternalPropertiesData struct wxObjectWriter::wxObjectWriterInternalPropertiesData
{ {
char nothing; char nothing;
}; };
void wxWriter::ClearObjectContext() void wxObjectWriter::ClearObjectContext()
{ {
delete m_data; delete m_data;
m_data = new wxWriterInternal() ; m_data = new wxObjectWriterInternal();
m_data->m_nextId = 0; m_data->m_nextId = 0;
} }
void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , const wxString &name , wxxVariantArray &metadata ) void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo,
wxObjectReaderCallback *persister, const wxString &name,
wxVariantBaseArray &metadata )
{ {
DoBeginWriteTopLevelEntry( name ); DoBeginWriteTopLevelEntry( name );
WriteObject( object, classInfo, persister, false, metadata); WriteObject( object, classInfo, persister, false, metadata);
DoEndWriteTopLevelEntry( name ); DoEndWriteTopLevelEntry( name );
} }
void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , bool isEmbedded, wxxVariantArray &metadata ) void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo,
wxObjectReaderCallback *persister, bool isEmbedded,
wxVariantBaseArray &metadata )
{ {
if ( !classInfo->BeforeWriteObject( object, this, persister, metadata) ) if ( !classInfo->BeforeWriteObject( object, this, persister, metadata) )
return; return;
@@ -92,12 +102,12 @@ void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo
// in case this object is a wxDynamicObject we also have to insert is superclass // 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 // instance with the same id, so that object relations are streamed out correctly
const wxDynamicObject* dynobj = dynamic_cast<const wxDynamicObject *>( object ) ; const wxDynamicObject* dynobj = wx_dynamic_cast(const wxDynamicObject*, object);
if ( !isEmbedded && dynobj ) if ( !isEmbedded && dynobj )
m_data->m_writtenObjects[dynobj->GetSuperClassInstance()] = oid; m_data->m_writtenObjects[dynobj->GetSuperClassInstance()] = oid;
DoBeginWriteObject( object, classInfo, oid, metadata ); DoBeginWriteObject( object, classInfo, oid, metadata );
wxWriterInternalPropertiesData data ; wxObjectWriterInternalPropertiesData data;
WriteAllProperties( object, classInfo, persister, &data ); WriteAllProperties( object, classInfo, persister, &data );
DoEndWriteObject( object, classInfo, oid ); DoEndWriteObject( object, classInfo, oid );
} }
@@ -105,7 +115,10 @@ void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo
} }
} }
void wxWriter::FindConnectEntry(const wxEvtHandler * evSource,const wxDelegateTypeInfo* dti, const wxObject* &sink , const wxHandlerInfo *&handler) void wxObjectWriter::FindConnectEntry(const wxEvtHandler * evSource,
const wxEventSourceTypeInfo* dti,
const wxObject* &sink,
const wxHandlerInfo *&handler)
{ {
wxList *dynamicEvents = evSource->GetDynamicEventTable(); wxList *dynamicEvents = evSource->GetDynamicEventTable();
@@ -140,21 +153,24 @@ void wxWriter::FindConnectEntry(const wxEvtHandler * evSource,const wxDelegateTy
} }
} }
} }
void wxWriter::WriteAllProperties( const wxObject * obj , const wxClassInfo* ci , wxPersister *persister, wxWriterInternalPropertiesData * data ) void wxObjectWriter::WriteAllProperties( const wxObject * obj, const wxClassInfo* ci,
wxObjectReaderCallback *persister,
wxObjectWriterInternalPropertiesData * data )
{ {
wxPropertyInfoMap map; wxPropertyInfoMap map;
ci->GetProperties( map ); ci->GetProperties( map );
for ( int i = 0; i < ci->GetCreateParamCount(); ++i ) for ( int i = 0; i < ci->GetCreateParamCount(); ++i )
{ {
wxString name = ci->GetCreateParamName(i); wxString name = ci->GetCreateParamName(i);
const wxPropertyInfo* prop = map.find(name)->second ; wxPropertyInfoMap::const_iterator iter = map.find(name);
const wxPropertyInfo* prop = iter == map.end() ? NULL : iter->second;
if ( prop ) if ( prop )
{ {
WriteOneProperty( obj, prop->GetDeclaringClass(), prop, persister, data ); WriteOneProperty( obj, prop->GetDeclaringClass(), prop, persister, data );
} }
else else
{ {
wxLogError( _("Create Parameter not found in declared RTTI Parameters") ) ; wxLogError( _("Create Parameter %s not found in declared RTTI Parameters"), name.c_str() );
} }
map.erase( name ); map.erase( name );
} }
@@ -180,37 +196,42 @@ void wxWriter::WriteAllProperties( const wxObject * obj , const wxClassInfo* ci
} }
} }
void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , const wxPropertyInfo* pi , wxPersister *persister , wxWriterInternalPropertiesData *WXUNUSED(data) ) void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* ci,
const wxPropertyInfo* pi, wxObjectReaderCallback *persister,
wxObjectWriterInternalPropertiesData *WXUNUSED(data) )
{ {
if ( pi->GetFlags() & wxPROP_DONT_STREAM ) if ( pi->GetFlags() & wxPROP_DONT_STREAM )
return; return;
// make sure that we are picking the correct object for accessing the property // make sure that we are picking the correct object for accessing the property
const wxDynamicObject* dynobj = dynamic_cast< const wxDynamicObject* > (obj ) ; const wxDynamicObject* dynobj = wx_dynamic_cast(const wxDynamicObject*, obj );
if ( dynobj && (dynamic_cast<const wxDynamicClassInfo*>(ci) == NULL) ) if ( dynobj && (wx_dynamic_cast(const wxDynamicClassInfo*, ci) == NULL) )
obj = dynobj->GetSuperClassInstance(); obj = dynobj->GetSuperClassInstance();
if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION ) if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION )
{ {
wxxVariantArray data ; wxVariantBaseArray data;
pi->GetAccessor()->GetPropertyCollection(obj, data); pi->GetAccessor()->GetPropertyCollection(obj, data);
const wxTypeInfo * elementType = dynamic_cast< const wxCollectionTypeInfo* >( pi->GetTypeInfo() )->GetElementType() ; const wxTypeInfo * elementType =
wx_dynamic_cast( const wxCollectionTypeInfo*, pi->GetTypeInfo() )->GetElementType();
for ( size_t i = 0; i < data.GetCount(); ++i ) for ( size_t i = 0; i < data.GetCount(); ++i )
{ {
if ( i == 0 ) if ( i == 0 )
DoBeginWriteProperty( pi ); DoBeginWriteProperty( pi );
DoBeginWriteElement(); DoBeginWriteElement();
wxxVariant value = data[i] ; wxVariantBase value = data[i];
if ( persister->BeforeWriteProperty( this, obj, pi, value ) ) if ( persister->BeforeWriteProperty( this, obj, pi, value ) )
{ {
const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( elementType ) ; const wxClassTypeInfo* cti =
wx_dynamic_cast( const wxClassTypeInfo*, elementType );
if ( cti ) if ( cti )
{ {
const wxClassInfo* pci = cti->GetClassInfo(); const wxClassInfo* pci = cti->GetClassInfo();
wxObject *vobj = pci->VariantToInstance( value ); wxObject *vobj = pci->VariantToInstance( value );
wxxVariantArray md ; wxVariantBaseArray md;
WriteObject( vobj , (vobj ? vobj->GetClassInfo() : pci ) , persister , cti->GetKind()== wxT_OBJECT , md ) ; WriteObject( vobj, (vobj ? vobj->GetClassInfo() : pci ),
persister, cti->GetKind()== wxT_OBJECT, md );
} }
else else
{ {
@@ -224,13 +245,14 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c
} }
else else
{ {
const wxDelegateTypeInfo* dti = dynamic_cast< const wxDelegateTypeInfo* > ( pi->GetTypeInfo() ) ; const wxEventSourceTypeInfo* dti =
wx_dynamic_cast( const wxEventSourceTypeInfo* , pi->GetTypeInfo() );
if ( dti ) if ( dti )
{ {
const wxObject* sink = NULL; const wxObject* sink = NULL;
const wxHandlerInfo *handler = NULL; const wxHandlerInfo *handler = NULL;
const wxEvtHandler * evSource = dynamic_cast<const wxEvtHandler *>(obj) ; const wxEvtHandler * evSource = wx_dynamic_cast(const wxEvtHandler *, obj);
if ( evSource ) if ( evSource )
{ {
FindConnectEntry( evSource, dti, sink, handler ); FindConnectEntry( evSource, dti, sink, handler );
@@ -241,12 +263,14 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c
DoBeginWriteProperty( pi ); DoBeginWriteProperty( pi );
if ( IsObjectKnown( sink ) ) if ( IsObjectKnown( sink ) )
{ {
DoWriteDelegate( obj , ci , pi , sink , GetObjectID( sink ) , sink->GetClassInfo() , handler ) ; DoWriteDelegate( obj, ci, pi, sink, GetObjectID( sink ),
sink->GetClassInfo(), handler );
DoEndWriteProperty( pi ); DoEndWriteProperty( pi );
} }
else else
{ {
wxLogError( _("Streaming delegates for not already streamed objects not yet supported") ) ; wxLogError( _T("Streaming delegates for not already ")
_T("streamed objects not yet supported") );
} }
} }
} }
@@ -258,7 +282,7 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c
} }
else else
{ {
wxxVariant value ; wxVariantBase value;
pi->GetAccessor()->GetProperty(obj, value); pi->GetAccessor()->GetProperty(obj, value);
// avoid streaming out void objects // avoid streaming out void objects
@@ -267,7 +291,8 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c
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 )
{ {
eti->ConvertFromLong( value.wxTEMPLATED_MEMBER_CALL(Get, long), value ); eti->ConvertFromLong( value.wxTEMPLATED_MEMBER_CALL(Get, long), value );
@@ -279,14 +304,16 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c
} }
// avoid streaming out default values // avoid streaming out default values
if ( pi->GetTypeInfo()->HasStringConverters() && !pi->GetDefaultValue().IsEmpty() ) if ( pi->GetTypeInfo()->HasStringConverters() &&
!pi->GetDefaultValue().IsEmpty() )
{ {
if ( value.GetAsString() == pi->GetDefaultValue().GetAsString() ) if ( value.GetAsString() == pi->GetDefaultValue().GetAsString() )
return; return;
} }
// avoid streaming out null objects // avoid streaming out null objects
const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( pi->GetTypeInfo() ) ; const wxClassTypeInfo* cti =
wx_dynamic_cast( const wxClassTypeInfo* , pi->GetTypeInfo() );
if ( cti && value.GetAsObject() == NULL ) if ( cti && value.GetAsObject() == NULL )
return; return;
@@ -302,13 +329,14 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c
{ {
wxString stringValue; wxString stringValue;
cti->ConvertToString( value, stringValue ); cti->ConvertToString( value, stringValue );
wxxVariant convertedValue(stringValue) ; wxVariantBase convertedValue(stringValue);
DoWriteSimpleType( convertedValue ); DoWriteSimpleType( convertedValue );
} }
else else
{ {
wxxVariantArray md ; wxVariantBaseArray md;
WriteObject( vobj , (vobj ? vobj->GetClassInfo() : pci ) , persister , cti->GetKind()== wxT_OBJECT , md) ; WriteObject( vobj, (vobj ? vobj->GetClassInfo() : pci ),
persister, cti->GetKind()== wxT_OBJECT, md);
} }
} }
else else
@@ -321,7 +349,7 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c
} }
} }
int wxWriter::GetObjectID(const wxObject *obj) int wxObjectWriter::GetObjectID(const wxObject *obj)
{ {
if ( !IsObjectKnown( obj ) ) if ( !IsObjectKnown( obj ) )
return wxInvalidObjectID; return wxInvalidObjectID;
@@ -329,32 +357,32 @@ int wxWriter::GetObjectID(const wxObject *obj)
return m_data->m_writtenObjects[obj]; return m_data->m_writtenObjects[obj];
} }
bool wxWriter::IsObjectKnown( const wxObject *obj ) bool wxObjectWriter::IsObjectKnown( const wxObject *obj )
{ {
return m_data->m_writtenObjects.find( obj ) != m_data->m_writtenObjects.end(); return m_data->m_writtenObjects.find( obj ) != m_data->m_writtenObjects.end();
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// reading objects in // wxObjectReader
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
struct wxReader::wxReaderInternal struct wxObjectReader::wxObjectReaderInternal
{ {
map<int,wxClassInfo*> m_classInfos; map<int,wxClassInfo*> m_classInfos;
}; };
wxReader::wxReader() wxObjectReader::wxObjectReader()
{ {
m_data = new wxReaderInternal; m_data = new wxObjectReaderInternal;
} }
wxReader::~wxReader() wxObjectReader::~wxObjectReader()
{ {
delete m_data; delete m_data;
} }
wxClassInfo* wxReader::GetObjectClassInfo(int objectID) wxClassInfo* wxObjectReader::GetObjectClassInfo(int objectID)
{ {
if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID ) if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
{ {
@@ -369,7 +397,7 @@ wxClassInfo* wxReader::GetObjectClassInfo(int objectID)
return m_data->m_classInfos[objectID]; return m_data->m_classInfos[objectID];
} }
void wxReader::SetObjectClassInfo(int objectID, wxClassInfo *classInfo ) void wxObjectReader::SetObjectClassInfo(int objectID, wxClassInfo *classInfo )
{ {
if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID ) if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
{ {
@@ -384,7 +412,7 @@ void wxReader::SetObjectClassInfo(int objectID, wxClassInfo *classInfo )
m_data->m_classInfos[objectID] = classInfo; m_data->m_classInfos[objectID] = classInfo;
} }
bool wxReader::HasObjectClassInfo( int objectID ) bool wxObjectReader::HasObjectClassInfo( int objectID )
{ {
if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID ) if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
{ {
@@ -407,10 +435,10 @@ and create params are always toplevel class only
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// depersisting to memory // wxObjectRuntimeReaderCallback - depersisting to memory
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
struct wxRuntimeDepersister::wxRuntimeDepersisterInternal struct wxObjectRuntimeReaderCallback::wxObjectRuntimeReaderCallbackInternal
{ {
map<int,wxObject *> m_objects; map<int,wxObject *> m_objects;
@@ -429,7 +457,7 @@ struct wxRuntimeDepersister::wxRuntimeDepersisterInternal
return NULL; return NULL;
if ( m_objects.find(objectID) == m_objects.end() ) if ( m_objects.find(objectID) == m_objects.end() )
{ {
wxLogError( _("Passing an unknown object to GetObject") ) ; wxLogError( _("Passing an unkown object to GetObject") );
return NULL; return NULL;
} }
@@ -437,31 +465,31 @@ struct wxRuntimeDepersister::wxRuntimeDepersisterInternal
} }
}; };
wxRuntimeDepersister::wxRuntimeDepersister() wxObjectRuntimeReaderCallback::wxObjectRuntimeReaderCallback()
{ {
m_data = new wxRuntimeDepersisterInternal() ; m_data = new wxObjectRuntimeReaderCallbackInternal();
} }
wxRuntimeDepersister::~wxRuntimeDepersister() wxObjectRuntimeReaderCallback::~wxObjectRuntimeReaderCallback()
{ {
delete m_data; delete m_data;
} }
void wxRuntimeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo , void wxObjectRuntimeReaderCallback::AllocateObject(int objectID, wxClassInfo *classInfo,
wxxVariantArray &WXUNUSED(metadata)) wxVariantBaseArray &WXUNUSED(metadata))
{ {
wxObject *O; wxObject *O;
O = classInfo->CreateObject(); O = classInfo->CreateObject();
m_data->SetObject(objectID, O); m_data->SetObject(objectID, O);
} }
void wxRuntimeDepersister::CreateObject(int objectID, void wxObjectRuntimeReaderCallback::CreateObject(int objectID,
const wxClassInfo *classInfo, const wxClassInfo *classInfo,
int paramCount, int paramCount,
wxxVariant *params, wxVariantBase *params,
int *objectIdValues, int *objectIdValues,
const wxClassInfo **objectClassInfos, const wxClassInfo **objectClassInfos,
wxxVariantArray &WXUNUSED(metadata)) wxVariantBaseArray &WXUNUSED(metadata))
{ {
wxObject *o; wxObject *o;
o = m_data->GetObject(objectID); o = m_data->GetObject(objectID);
@@ -473,7 +501,7 @@ void wxRuntimeDepersister::CreateObject(int objectID,
o = m_data->GetObject(objectIdValues[i]); o = m_data->GetObject(objectIdValues[i]);
// if this is a dynamic object and we are asked for another class // if this is a dynamic object and we are asked for another class
// than wxDynamicObject we cast it down manually. // than wxDynamicObject we cast it down manually.
wxDynamicObject *dyno = dynamic_cast< wxDynamicObject * > (o) ; wxDynamicObject *dyno = wx_dynamic_cast( wxDynamicObject *, o);
if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) ) if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) )
{ {
o = dyno->GetSuperClassInstance(); o = dyno->GetSuperClassInstance();
@@ -484,13 +512,13 @@ void wxRuntimeDepersister::CreateObject(int objectID,
classInfo->Create(o, paramCount, params); classInfo->Create(o, paramCount, params);
} }
void wxRuntimeDepersister::ConstructObject(int objectID, void wxObjectRuntimeReaderCallback::ConstructObject(int objectID,
const wxClassInfo *classInfo, const wxClassInfo *classInfo,
int paramCount, int paramCount,
wxxVariant *params, wxVariantBase *params,
int *objectIdValues, int *objectIdValues,
const wxClassInfo **objectClassInfos, const wxClassInfo **objectClassInfos,
wxxVariantArray &WXUNUSED(metadata)) wxVariantBaseArray &WXUNUSED(metadata))
{ {
wxObject *o; wxObject *o;
for ( int i = 0; i < paramCount; ++i ) for ( int i = 0; i < paramCount; ++i )
@@ -501,7 +529,7 @@ void wxRuntimeDepersister::ConstructObject(int objectID,
o = m_data->GetObject(objectIdValues[i]); o = m_data->GetObject(objectIdValues[i]);
// if this is a dynamic object and we are asked for another class // if this is a dynamic object and we are asked for another class
// than wxDynamicObject we cast it down manually. // than wxDynamicObject we cast it down manually.
wxDynamicObject *dyno = dynamic_cast< wxDynamicObject * > (o) ; wxDynamicObject *dyno = wx_dynamic_cast( wxDynamicObject *, o);
if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) ) if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) )
{ {
o = dyno->GetSuperClassInstance(); o = dyno->GetSuperClassInstance();
@@ -514,24 +542,24 @@ void wxRuntimeDepersister::ConstructObject(int objectID,
} }
void wxRuntimeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo)) void wxObjectRuntimeReaderCallback::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo))
{ {
wxObject *o; wxObject *o;
o = m_data->GetObject(objectID); o = m_data->GetObject(objectID);
delete o; delete o;
} }
void wxRuntimeDepersister::SetProperty(int objectID, void wxObjectRuntimeReaderCallback::SetProperty(int objectID,
const wxClassInfo *classInfo, const wxClassInfo *classInfo,
const wxPropertyInfo* propertyInfo, const wxPropertyInfo* propertyInfo,
const wxxVariant &value) const wxVariantBase &value)
{ {
wxObject *o; wxObject *o;
o = m_data->GetObject(objectID); o = m_data->GetObject(objectID);
classInfo->SetProperty( o, propertyInfo->GetName(), value ); classInfo->SetProperty( o, propertyInfo->GetName(), value );
} }
void wxRuntimeDepersister::SetPropertyAsObject(int objectID, void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID,
const wxClassInfo *classInfo, const wxClassInfo *classInfo,
const wxPropertyInfo* propertyInfo, const wxPropertyInfo* propertyInfo,
int valueObjectId) int valueObjectId)
@@ -539,31 +567,37 @@ void wxRuntimeDepersister::SetPropertyAsObject(int objectID,
wxObject *o, *valo; wxObject *o, *valo;
o = m_data->GetObject(objectID); o = m_data->GetObject(objectID);
valo = m_data->GetObject(valueObjectId); valo = m_data->GetObject(valueObjectId);
const wxClassInfo* valClassInfo = (dynamic_cast<const wxClassTypeInfo*>(propertyInfo->GetTypeInfo()))->GetClassInfo() ; const wxClassInfo* valClassInfo =
(wx_dynamic_cast(const wxClassTypeInfo*,propertyInfo->GetTypeInfo()))->GetClassInfo();
// if this is a dynamic object and we are asked for another class // if this is a dynamic object and we are asked for another class
// than wxDynamicObject we cast it down manually. // than wxDynamicObject we cast it down manually.
wxDynamicObject *dynvalo = dynamic_cast< wxDynamicObject * > (valo) ; wxDynamicObject *dynvalo = wx_dynamic_cast( wxDynamicObject *, valo);
if ( dynvalo!=NULL && (valClassInfo != dynvalo->GetClassInfo()) ) if ( dynvalo!=NULL && (valClassInfo != dynvalo->GetClassInfo()) )
{ {
valo = dynvalo->GetSuperClassInstance(); valo = dynvalo->GetSuperClassInstance();
} }
classInfo->SetProperty( o , propertyInfo->GetName() , valClassInfo->InstanceToVariant(valo) ) ; classInfo->SetProperty( o, propertyInfo->GetName(),
valClassInfo->InstanceToVariant(valo) );
} }
void wxRuntimeDepersister::SetConnect(int eventSourceObjectID, void wxObjectRuntimeReaderCallback::SetConnect(int eventSourceObjectID,
const wxClassInfo *WXUNUSED(eventSourceClassInfo), const wxClassInfo *WXUNUSED(eventSourceClassInfo),
const wxPropertyInfo *delegateInfo, const wxPropertyInfo *delegateInfo,
const wxClassInfo *WXUNUSED(eventSinkClassInfo), const wxClassInfo *WXUNUSED(eventSinkClassInfo),
const wxHandlerInfo* handlerInfo, const wxHandlerInfo* handlerInfo,
int eventSinkObjectID ) int eventSinkObjectID )
{ {
wxEvtHandler *ehsource = dynamic_cast< wxEvtHandler* >( m_data->GetObject( eventSourceObjectID ) ) ; wxEvtHandler *ehsource =
wxEvtHandler *ehsink = dynamic_cast< wxEvtHandler *>(m_data->GetObject(eventSinkObjectID) ) ; wx_dynamic_cast( wxEvtHandler* , m_data->GetObject( eventSourceObjectID ) );
wxEvtHandler *ehsink =
wx_dynamic_cast( wxEvtHandler *,m_data->GetObject(eventSinkObjectID) );
if ( ehsource && ehsink ) if ( ehsource && ehsink )
{ {
const wxDelegateTypeInfo *delegateTypeInfo = dynamic_cast<const wxDelegateTypeInfo*>(delegateInfo->GetTypeInfo()); const wxEventSourceTypeInfo *delegateTypeInfo =
wx_dynamic_cast(const wxEventSourceTypeInfo*,delegateInfo->GetTypeInfo());
if( delegateTypeInfo && delegateTypeInfo->GetLastEventType() == -1 ) if( delegateTypeInfo && delegateTypeInfo->GetLastEventType() == -1 )
{ {
ehsource->Connect( -1, delegateTypeInfo->GetEventType(), ehsource->Connect( -1, delegateTypeInfo->GetEventType(),
@@ -572,7 +606,8 @@ void wxRuntimeDepersister::SetConnect(int eventSourceObjectID,
} }
else else
{ {
for ( wxEventType iter = delegateTypeInfo->GetEventType() ; iter <= delegateTypeInfo->GetLastEventType() ; ++iter ) for ( wxEventType iter = delegateTypeInfo->GetEventType();
iter <= delegateTypeInfo->GetLastEventType(); ++iter )
{ {
ehsource->Connect( -1, iter, ehsource->Connect( -1, iter,
handlerInfo->GetEventFunction(), NULL /*user data*/, handlerInfo->GetEventFunction(), NULL /*user data*/,
@@ -582,24 +617,22 @@ void wxRuntimeDepersister::SetConnect(int eventSourceObjectID,
} }
} }
wxObject *wxRuntimeDepersister::GetObject(int objectID) wxObject *wxObjectRuntimeReaderCallback::GetObject(int objectID)
{ {
return m_data->GetObject( objectID ); return m_data->GetObject( objectID );
} }
// adds an element to a property collection void wxObjectRuntimeReaderCallback::AddToPropertyCollection( int objectID,
void wxRuntimeDepersister::AddToPropertyCollection( int objectID ,
const wxClassInfo *classInfo, const wxClassInfo *classInfo,
const wxPropertyInfo* propertyInfo, const wxPropertyInfo* propertyInfo,
const wxxVariant &value) const wxVariantBase &value)
{ {
wxObject *o; wxObject *o;
o = m_data->GetObject(objectID); o = m_data->GetObject(objectID);
classInfo->AddToPropertyCollection( o, propertyInfo->GetName(), value ); classInfo->AddToPropertyCollection( o, propertyInfo->GetName(), value );
} }
// sets the corresponding property (value is an object) void wxObjectRuntimeReaderCallback::AddToPropertyCollectionAsObject(int objectID,
void wxRuntimeDepersister::AddToPropertyCollectionAsObject(int objectID,
const wxClassInfo *classInfo, const wxClassInfo *classInfo,
const wxPropertyInfo* propertyInfo, const wxPropertyInfo* propertyInfo,
int valueObjectId) int valueObjectId)
@@ -607,241 +640,26 @@ void wxRuntimeDepersister::AddToPropertyCollectionAsObject(int objectID,
wxObject *o, *valo; wxObject *o, *valo;
o = m_data->GetObject(objectID); o = m_data->GetObject(objectID);
valo = m_data->GetObject(valueObjectId); valo = m_data->GetObject(valueObjectId);
const wxCollectionTypeInfo * collectionTypeInfo = dynamic_cast< const wxCollectionTypeInfo * >(propertyInfo->GetTypeInfo() ) ; const wxCollectionTypeInfo * collectionTypeInfo =
const wxClassInfo* valClassInfo = (dynamic_cast<const wxClassTypeInfo*>(collectionTypeInfo->GetElementType()))->GetClassInfo() ; wx_dynamic_cast( const wxCollectionTypeInfo *, propertyInfo->GetTypeInfo() );
const wxClassInfo* valClassInfo =
(wx_dynamic_cast(const wxClassTypeInfo*,collectionTypeInfo->GetElementType()))->GetClassInfo();
// if this is a dynamic object and we are asked for another class // if this is a dynamic object and we are asked for another class
// than wxDynamicObject we cast it down manually. // than wxDynamicObject we cast it down manually.
wxDynamicObject *dynvalo = dynamic_cast< wxDynamicObject * > (valo) ; wxDynamicObject *dynvalo = wx_dynamic_cast( wxDynamicObject *, valo);
if ( dynvalo!=NULL && (valClassInfo != dynvalo->GetClassInfo()) ) if ( dynvalo!=NULL && (valClassInfo != dynvalo->GetClassInfo()) )
{ {
valo = dynvalo->GetSuperClassInstance(); valo = dynvalo->GetSuperClassInstance();
} }
classInfo->AddToPropertyCollection( o , propertyInfo->GetName() , valClassInfo->InstanceToVariant(valo) ) ; classInfo->AddToPropertyCollection( o, propertyInfo->GetName(),
valClassInfo->InstanceToVariant(valo) );
} }
// ---------------------------------------------------------------------------- #if TEST_XVARIANT
// depersisting to code #include "wx/arrimpl.cpp"
// ---------------------------------------------------------------------------- WX_DEFINE_OBJARRAY(wxVariantBaseArray);
struct wxCodeDepersister::wxCodeDepersisterInternal
{
#if wxUSE_UNICODE
map<int,wstring> m_objectNames ;
#else
map<int,string> m_objectNames ;
#endif #endif
void SetObjectName(int objectID, const wxString &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 wxT("NULL") ;
if ( m_objectNames.find(objectID) == m_objectNames.end() )
{
wxLogError( _("Passing an unknown object to GetObject") ) ;
return wxEmptyString ;
}
return wxString( m_objectNames[objectID].c_str() ) ;
}
} ;
wxCodeDepersister::wxCodeDepersister(wxTextOutputStream *out)
: m_fp(out)
{
m_data = new wxCodeDepersisterInternal ;
}
wxCodeDepersister::~wxCodeDepersister()
{
delete m_data ;
}
void wxCodeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo ,
wxxVariantArray &WXUNUSED(metadata))
{
wxString objectName = wxString::Format( wxT("LocalObject_%d") , objectID ) ;
m_fp->WriteString( wxString::Format( wxT("\t%s *%s = new %s;\n"),
classInfo->GetClassName(),
objectName.c_str(),
classInfo->GetClassName()) );
m_data->SetObjectName( objectID , objectName ) ;
}
void wxCodeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo))
{
m_fp->WriteString( wxString::Format( wxT("\tdelete %s;\n"),
m_data->GetObjectName( objectID).c_str() ) );
}
wxString wxCodeDepersister::ValueAsCode( const wxxVariant &param )
{
wxString value ;
const wxTypeInfo* type = param.GetTypeInfo() ;
if ( type->GetKind() == wxT_CUSTOM )
{
const wxCustomTypeInfo* cti = dynamic_cast<const wxCustomTypeInfo*>(type) ;
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( wxT("\"%s\""),param.GetAsString().c_str() );
}
else
{
value.Printf( wxT("%s"), param.GetAsString().c_str() );
}
return value ;
}
void wxCodeDepersister::CreateObject(int objectID,
const wxClassInfo *WXUNUSED(classInfo),
int paramCount,
wxxVariant *params,
int *objectIDValues,
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;
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::SetProperty(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()->GetSetterName().c_str(),
ValueAsCode(value).c_str()) );
}
void wxCodeDepersister::SetPropertyAsObject(int objectID,
const wxClassInfo *WXUNUSED(classInfo),
const wxPropertyInfo* propertyInfo,
int valueObjectId)
{
if ( propertyInfo->GetTypeInfo()->GetKind() == wxT_OBJECT )
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( 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 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() ;
const wxDelegateTypeInfo *delegateTypeInfo = dynamic_cast<const wxDelegateTypeInfo*>(delegateInfo->GetTypeInfo());
if ( delegateTypeInfo )
{
int eventType = delegateTypeInfo->GetEventType() ;
wxString handlerName = handlerInfo->GetName() ;
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 // wxUSE_EXTENDED_RTTI #endif // wxUSE_EXTENDED_RTTI