X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31478355f8348d7dfb1c647919b62b224acfa8a0..a5b8e8bf1828cbf3f01800e33ab32699758468b6:/include/wx/xti.h diff --git a/include/wx/xti.h b/include/wx/xti.h index e8ff0102b2..4a82a413be 100644 --- a/include/wx/xti.h +++ b/include/wx/xti.h @@ -13,7 +13,7 @@ #ifndef _WX_XTIH__ #define _WX_XTIH__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "xti.h" #endif @@ -42,19 +42,6 @@ #include "wx/string.h" #include "wx/arrstr.h" -// some compilers have troubles getting the correct wxPropertyAccessorT constructor -// set this to 1 to make things work for these, too - -#ifndef WX_XTI_TEMPLATE_FIX -#define WX_XTI_TEMPLATE_FIX 0 -#endif - -#if WX_XTI_TEMPLATE_FIX -#define WX_XTI_PARAM_FIX(a,b) a,b -#else -#define WX_XTI_PARAM_FIX(a,b) -#endif - class WXDLLIMPEXP_BASE wxObject; class WXDLLIMPEXP_BASE wxClassInfo; class WXDLLIMPEXP_BASE wxHashTable; @@ -122,7 +109,6 @@ private : #define WX_END_ENUM( e ) { NULL , 0 } } ; \ wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \ wxEnumData *wxGetEnumData(e) { return &s_enumData##e ; } \ - template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxEnumTypeInfo s_typeInfo(wxT_ENUM , &s_enumData##e) ; return &s_typeInfo ; } \ template<> void wxStringReadValue(const wxString& s , e &data ) \ { \ data = (e) s_enumData##e.GetEnumMemberValue(s) ; \ @@ -131,6 +117,7 @@ private : { \ s = s_enumData##e.GetEnumMemberName((int)data) ; \ } \ + template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxEnumTypeInfo s_typeInfo(wxT_ENUM , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e>) ; return &s_typeInfo ; } \ template<> const wxTypeInfo* wxGetTypeInfo( e ** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; assert(0) ; return &s_typeInfo ; } \ template<> void wxStringReadValue(const wxString& , e* & ) \ { \ @@ -224,12 +211,19 @@ void wxSetToString( wxString &s , const wxSet<e> &data ) template<> void wxStringWriteValue( wxString &s , const wxSet<e> &data ) \ { \ wxSetToString( s , data ) ; \ - } \ + } // ---------------------------------------------------------------------------- // Type Information // ---------------------------------------------------------------------------- +// +// +// All data exposed by the RTTI is characterized using the following classes. +// The first characterization is done by wxTypeKind. All enums up to and including +// wxT_CUSTOM represent so called simple types. These cannot be divided any further. +// They can be converted to and from wxStrings, that's all. + enum wxTypeKind { @@ -246,37 +240,58 @@ enum wxTypeKind wxT_STRING, // must be wxString wxT_SET, // must be wxSet<> template wxT_ENUM, - wxT_OBJECT_PTR, // pointer to wxObject - wxT_OBJECT , // wxObject wxT_CUSTOM, // user defined type (e.g. wxPoint) + + wxT_LAST_SIMPLE_TYPE_KIND = wxT_CUSTOM , + + wxT_OBJECT_PTR, // object reference + wxT_OBJECT , // embedded object + wxT_COLLECTION , // collection + wxT_DELEGATE , // for connecting against an event source - wxT_LAST_TYPE_KIND // sentinel for bad data, asserts, debugging + + wxT_LAST_TYPE_KIND = wxT_DELEGATE // sentinel for bad data, asserts, debugging }; +class wxxVariant ; + class WXDLLIMPEXP_BASE wxTypeInfo { public : - wxTypeInfo() : m_kind( wxT_VOID) {} + wxTypeInfo() : m_kind( wxT_VOID) , m_toString(NULL) , m_fromString(NULL) {} virtual ~wxTypeInfo() {} wxTypeKind GetKind() const { return m_kind ; } bool IsDelegateType() const { return m_kind == wxT_DELEGATE ; } bool IsCustomType() const { return m_kind == wxT_CUSTOM ; } bool IsObjectType() const { return m_kind == wxT_OBJECT || m_kind == wxT_OBJECT_PTR ; } + bool HasStringConverters() const { return m_toString != NULL && m_fromString != NULL ; } + void ConvertToString( const wxxVariant& data , wxString &result ) const + { wxASSERT_MSG( m_toString , wxT("String conversions not supported") ) ; (*m_toString)( data , result ) ; } + void ConvertFromString( const wxString& data , wxxVariant &result ) const + { wxASSERT_MSG( m_fromString , wxT("String conversions not supported") ) ; (*m_fromString)( data , result ) ; } + protected : - wxTypeKind m_kind ; + typedef void (*converterToString_t)( const wxxVariant& data , wxString &result ) ; + typedef void (*converterFromString_t)( const wxString& data , wxxVariant &result ) ; + + converterToString_t m_toString ; + converterFromString_t m_fromString ; + + wxTypeKind m_kind ; }; class WXDLLIMPEXP_BASE wxBuiltInTypeInfo : public wxTypeInfo { public : - wxBuiltInTypeInfo( wxTypeKind kind ) { wxASSERT_MSG( kind < wxT_SET , wxT("Illegal Kind for Base Type") ) ; m_kind = kind ;} + wxBuiltInTypeInfo( wxTypeKind kind , converterToString_t to = NULL , converterFromString_t from= NULL ) + { wxASSERT_MSG( kind < wxT_SET , wxT("Illegal Kind for Base Type") ) ; m_kind = kind ; m_toString = to ; m_fromString = from ;} } ; class WXDLLIMPEXP_BASE wxCustomTypeInfo : public wxTypeInfo { public : - wxCustomTypeInfo( const wxChar *typeName ) - { m_kind = wxT_CUSTOM ; m_typeName = typeName ;} + wxCustomTypeInfo( const wxChar *typeName , converterToString_t to= NULL , converterFromString_t from= NULL ) + { m_kind = wxT_CUSTOM ; m_typeName = typeName ;m_toString = to ; m_fromString = from ;} const wxChar *GetTypeName() const { return m_typeName ; } private : const wxChar *m_typeName; // Kind == wxT_CUSTOM @@ -285,8 +300,8 @@ private : class WXDLLIMPEXP_BASE wxEnumTypeInfo : public wxTypeInfo { public : - wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo ) - { wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET , wxT("Illegal Kind for Enum Type")) ; m_kind = kind ; m_enumInfo = enumInfo ;} + wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo , converterToString_t to = NULL , converterFromString_t from= NULL ) + { wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET , wxT("Illegal Kind for Enum Type")) ; m_kind = kind ; m_enumInfo = enumInfo ;m_toString = to ; m_fromString = from ;} const wxEnumData* GetEnumData() const { return m_enumInfo ; } private : wxEnumData *m_enumInfo; // Kind == wxT_ENUM or Kind == wxT_SET @@ -295,20 +310,31 @@ private : class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo { public : - wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo ) + wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to = NULL , converterFromString_t from = NULL ) { wxASSERT_MSG( kind == wxT_OBJECT_PTR || kind == wxT_OBJECT , wxT("Illegal Kind for Enum Type")) ; m_kind = kind ; m_classInfo = classInfo ;} const wxClassInfo *GetClassInfo() const { return m_classInfo ; } private : wxClassInfo *m_classInfo; // Kind == wxT_OBJECT - could be NULL } ; +class WXDLLIMPEXP_BASE wxCollectionTypeInfo : public wxTypeInfo +{ +public : + wxCollectionTypeInfo( wxTypeInfo *elementType , converterToString_t to = NULL , converterFromString_t from = NULL ) + { m_kind = wxT_COLLECTION , m_elementType = elementType ; m_toString = to ; m_fromString = from ;} + + const wxTypeInfo* GetElementType() const { return m_elementType ; } +private : + wxTypeInfo * m_elementType ; +} ; + // a delegate is an exposed event source class WXDLLIMPEXP_BASE wxDelegateTypeInfo : public wxTypeInfo { public : - wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass ) - { m_kind = wxT_DELEGATE ; m_eventClass = eventClass ; m_eventType = eventType ;} + wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass , converterToString_t to = NULL , converterFromString_t from = NULL ) + { m_kind = wxT_DELEGATE ; m_eventClass = eventClass ; m_eventType = eventType ;m_toString = to ; m_fromString = from ;} const wxClassInfo *GetEventClass() const { assert( m_kind == wxT_DELEGATE ) ; return m_eventClass ; } int GetEventType() const { return m_eventType ; } private : @@ -327,7 +353,7 @@ template<typename T> const wxTypeInfo* wxGetTypeInfo( wxSet<T> * ) #define WX_CUSTOM_TYPE_INFO( e ) \ template<> const wxTypeInfo* wxGetTypeInfo( e ** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID) ; assert(0) ; return &s_typeInfo ; } \ - template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxCustomTypeInfo s_typeInfo(#e) ; return &s_typeInfo ; } + template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxCustomTypeInfo s_typeInfo(#e, &wxToStringConverter<e> , &wxFromStringConverter<e>) ; return &s_typeInfo ; } // templated streaming, every type must have their specialization for these methods @@ -337,6 +363,12 @@ void wxStringReadValue( const wxString &s , T &data ); template<typename T> void wxStringWriteValue( wxString &s , const T &data); +template<typename T> +void wxToStringConverter( const wxxVariant &v, wxString &s) { wxStringWriteValue( s , v.Get<T>() ) ; } + +template<typename T> +void wxFromStringConverter( const wxString &s, wxxVariant &v) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; } \ + // sometimes a compiler invents specializations that are nowhere called, use this macro to satisfy the refs #define WX_ILLEGAL_TYPE_SPECIALIZATION( a ) \ @@ -359,12 +391,6 @@ public: // returns the type info of the contentc virtual const wxTypeInfo* GetTypeInfo() const = 0 ; - - // write the value into a string - virtual void Write( wxString &s ) const = 0 ; - - // read the value from a string - virtual void Read( const wxString &s) = 0 ; } ; template<typename T> class WXDLLIMPEXP_BASE wxxVariantDataT : public wxxVariantData @@ -387,13 +413,6 @@ public: // returns the type info of the contentc virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( (T*) NULL ) ; } - - // write the value into a string - virtual void Write( wxString &s ) const { wxStringWriteValue( s , m_data ) ; } - - // read the value from a string - virtual void Read( const wxString &s) { wxStringReadValue( s , m_data ) ; } - private: T m_data; }; @@ -407,6 +426,7 @@ public : template<typename T> wxxVariant( T data , const wxString& name = wxT("") ) : m_data(new wxxVariantDataT<T>(data) ), m_name(name) {} + ~wxxVariant() { delete m_data ; } // get a ref to the stored data @@ -425,6 +445,12 @@ public : return dataptr->Get() ; } + template<typename T> bool HasData() const + { + const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ; + return dataptr != NULL ; + } + // stores the data template<typename T> void Set(const T& data) const { @@ -445,29 +471,22 @@ public : // get the typeinfo of the stored object const wxTypeInfo* GetTypeInfo() const { return m_data->GetTypeInfo() ; } - // write the value into a string - void Write( wxString &s ) const { m_data->Write( s ) ; } - - // read the value from a string - void Read( const wxString &s) { m_data->Read( s ) ; } - // returns this value as string wxString GetAsString() const { wxString s ; - Write( s ) ; + GetTypeInfo()->ConvertToString( *this , s ) ; return s ; } - - void SetFromString( const wxString &s) - { - Read( s ) ; - } private : wxxVariantData* m_data ; wxString m_name ; } ; +#include <wx/dynarray.h> + +WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE); + // ---------------------------------------------------------------------------- // Property Support // @@ -476,161 +495,208 @@ private : // want access, look at wxPropertyAccessor. // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_BASE wxPropertyAccessor +class wxSetter { public : -#if WX_XTI_TEMPLATE_FIX - class SetByRef ; - class SetByRefRetBool ; - class SetRetBool ; - class SetAndGetByRef ; - class SetAndGetByRefRetBool ; - class GetByRef ; -#endif - virtual void SetProperty(wxObject *object, const wxxVariant &value) const = 0 ; - virtual wxxVariant GetProperty(const wxObject *object) const = 0 ; - virtual bool HasSetter() const = 0 ; - virtual bool HasGetter() const = 0 ; - const wxChar * GetGetterName() const { return m_setterName ; } - const wxChar * GetSetterName() const { return m_getterName ; } - virtual wxxVariant ReadValue( const wxString &value ) const = 0 ; - virtual void WriteValue( wxString& value , const wxObject *o ) const = 0 ; -protected : - const wxChar *m_setterName ; - const wxChar *m_getterName ; -}; + wxSetter( const wxString name ) { m_name = name ; } + virtual void Set( wxObject *object, const wxxVariant &variantValue ) const = 0; + const wxString& GetName() const { return m_name ; } +private : + wxString m_name ; +} ; -template<class Klass, typename T> -class WXDLLIMPEXP_BASE wxPropertyAccessorT : public wxPropertyAccessor +class wxGetter { -public: - - typedef void (Klass::*setter_t)(T value); - typedef bool (Klass::*setter_bool_t)(T value); - typedef void (Klass::*setter_ref_t)(const T& value); - typedef bool (Klass::*setter_ref_bool_t)(const T& value); - typedef T (Klass::*getter_t)() const; - typedef const T& (Klass::*getter_ref_t)() const; - - wxPropertyAccessorT(setter_t setter, getter_t getter, const wxChar *g, const wxChar *s) - : m_setter_bool( NULL ) , m_setter_ref_bool( NULL ) , m_setter(setter), m_setter_ref(NULL), m_getter(getter) ,m_getter_ref(NULL) {m_setterName = s;m_getterName=g ;} - - wxPropertyAccessorT( getter_t getter, const wxChar *g) - : m_setter_bool( NULL ) , m_setter_ref_bool( NULL ) , m_setter(NULL), m_setter_ref(NULL), m_getter(getter) ,m_getter_ref(NULL) {m_setterName = "";m_getterName=g ;} - - wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetRetBool*,) setter_bool_t setter, getter_t getter, const wxChar *g, const wxChar *s) - : m_setter_bool( setter ) , m_setter_ref_bool( NULL ) , m_setter(NULL), m_setter_ref(NULL), m_getter(getter) , m_getter_ref(NULL){m_setterName = s;m_getterName=g ;} - - wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetByRef*,) setter_ref_t setter, getter_t getter, const wxChar *g, const wxChar *s) - : m_setter_bool( NULL ) , m_setter_ref_bool( NULL ) , m_setter(NULL), m_setter_ref(setter), m_getter(getter) , m_getter_ref(NULL){m_setterName = s;m_getterName=g ;} - - wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetByRefRetBool*,) setter_ref_bool_t setter, getter_t getter, const wxChar *g, const wxChar *s) - : m_setter_bool( NULL ) , m_setter_ref_bool( setter ) , m_setter(NULL), m_setter_ref(NULL), m_getter(getter) , m_getter_ref(NULL){m_setterName = s;m_getterName=g ;} - - wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetAndGetByRef*,) setter_ref_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s) - : m_setter_bool( NULL ) , m_setter_ref_bool( NULL ) , m_setter(NULL), m_setter_ref(setter), m_getter(NULL) , m_getter_ref(getter){m_setterName = s;m_getterName=g ;} - - wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetAndGetByRefRetBool*,) setter_ref_bool_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s) - : m_setter_bool( NULL ) , m_setter_ref_bool( setter ) , m_setter(NULL), m_setter_ref(NULL), m_getter(NULL) , m_getter_ref(getter){m_setterName = s;m_getterName=g ;} - - wxPropertyAccessorT(WX_XTI_PARAM_FIX(GetByRef*,) setter_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s) - : m_setter_bool( NULL ) , m_setter_ref_bool( NULL ) , m_setter(NULL), m_setter(setter), m_getter(NULL) , m_getter_ref(getter){m_setterName = s;m_getterName=g ;} - - // returns true if this accessor has a setter - bool HasSetter() const { return m_setter != NULL || m_setter_ref != NULL ; } - - // return true if this accessor has a getter - bool HasGetter() const { return m_getter != NULL || m_getter_ref != NULL ; } +public : + wxGetter( const wxString name ) { m_name = name ; } + virtual void Get( const wxObject *object , wxxVariant& result) const = 0; + const wxString& GetName() const { return m_name ; } +private : + wxString m_name ; +} ; - // set the property this accessor is responsible for in an object - void SetProperty(wxObject *o, const wxxVariant &v) const - { - Klass *obj = dynamic_cast<Klass*>(o); - T value ; +class wxCollectionGetter +{ +public : + wxCollectionGetter( const wxString name ) { m_name = name ; } + virtual void Get( const wxObject *object , wxxVariantArray& result) const = 0; + const wxString& GetName() const { return m_name ; } +private : + wxString m_name ; +} ; - if ( wxGetTypeInfo((T*)NULL)->GetKind() == wxT_OBJECT && v.GetTypeInfo()->GetKind() == wxT_OBJECT_PTR ) - value = *v.Get<T*>(); - else - value = v.Get<T>(); - if (m_setter) - (obj->*(m_setter))(value); - else if ( m_setter_ref ) - (obj->*(m_setter_ref))(value); - else if ( m_setter_ref_bool ) - (obj->*(m_setter_ref_bool))(value); - else if ( m_setter_bool ) - (obj->*(m_setter_bool))(value); - else - { - wxASSERT_MSG(0 , wxT("SetPropertyCalled without a valid Setter") ) ; - } - } +template<typename coll_t> void wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ; - // gets the property this accessor is responsible for from an object - wxxVariant GetProperty(const wxObject *o) const - { - return wxxVariant( (wxxVariantData* ) DoGetProperty( o ) ) ; - } +class wxAdder +{ +public : + wxAdder( const wxString name ) { m_name = name ; } + virtual void Add( wxObject *object, const wxxVariant &variantValue ) const= 0; + const wxString& GetName() const { return m_name ; } +private : + wxString m_name ; +} ; - // write the property this accessor is responsible for from an object into - // a string - void WriteValue( wxString& s , const wxObject *o ) const - { - DoGetProperty( o )->Write( s ) ; - } - // read a wxxVariant having the correct type for the property this accessor - // is responsible for from a string - wxxVariant ReadValue( const wxString &value ) const - { - T data ; - wxStringReadValue( value , data ) ; - return wxxVariant( data ) ; - } -private : - wxxVariantDataT<T>* DoGetProperty(const wxObject *o) const - { - const Klass *obj = dynamic_cast<const Klass*>(o); - if ( m_getter ) - return new wxxVariantDataT<T>( (obj->*(m_getter))() ) ; - else - return new wxxVariantDataT<T>( (obj->*(m_getter_ref))() ) ; - } +#define WX_SETTER( property, Klass, valueType, setterMethod ) \ + class wxSetter##property : public wxSetter \ + { \ + public: \ + wxSetter##property() : wxSetter( #setterMethod ) {} \ + void Set( wxObject *object, const wxxVariant &variantValue ) const \ + { \ + Klass *obj = dynamic_cast<Klass*>(object) ; \ + if ( variantValue.HasData<valueType>() ) \ + obj->setterMethod(variantValue.Get<valueType>()) ; \ + else \ + obj->setterMethod(*variantValue.Get<valueType*>()) ; \ + } \ + } ; + +#define WX_GETTER( property, Klass, valueType , gettermethod ) \ + class wxGetter##property : public wxGetter \ + { \ + public : \ + wxGetter##property() : wxGetter( #gettermethod ) {} \ + void Get( const wxObject *object , wxxVariant &result) const \ + { \ + const Klass *obj = dynamic_cast<const Klass*>(object) ; \ + result = wxxVariant( obj->gettermethod() ) ; \ + } \ + } ; + +#define WX_ADDER( property, Klass, valueType , addermethod ) \ + class wxAdder##property : public wxAdder \ + { \ + public: \ + wxAdder##property() : wxAdder( #addermethod ) {} \ + void Add( wxObject *object, const wxxVariant &variantValue ) const \ + { \ + Klass *obj = dynamic_cast<Klass*>(object) ; \ + if ( variantValue.HasData<valueType>() ) \ + obj->addermethod(variantValue.Get<valueType>()) ; \ + else \ + obj->addermethod(*variantValue.Get<valueType*>()) ; \ + } \ + } ; + +#define WX_COLLECTION_GETTER( property, Klass, valueType , gettermethod ) \ + class wxCollectionGetter##property : public wxCollectionGetter \ + { \ + public : \ + wxCollectionGetter##property() : wxCollectionGetter( #gettermethod ) {} \ + void Get( const wxObject *object , wxxVariantArray &result) const \ + { \ + const Klass *obj = dynamic_cast<const Klass*>(object) ; \ + wxCollectionToVariantArray( obj->gettermethod() , result ) ; \ + } \ + } ; - setter_t m_setter; - setter_ref_t m_setter_ref; - setter_ref_bool_t m_setter_ref_bool ; - setter_bool_t m_setter_bool ; - getter_t m_getter; - getter_ref_t m_getter_ref ; +class WXDLLIMPEXP_BASE wxPropertyAccessor +{ +public : + wxPropertyAccessor( wxSetter *setter , wxGetter *getter , wxAdder *adder , wxCollectionGetter *collectionGetter ) + { m_setter = setter ; m_getter = getter ; m_adder = adder ; m_collectionGetter = collectionGetter ;} + + virtual ~wxPropertyAccessor() {} + + // Setting a simple property (non-collection) + virtual void SetProperty(wxObject *object, const wxxVariant &value) const + { wxASSERT_MSG(m_setter,wxT("SetProperty called w/o valid setter") ) ; m_setter->Set( object , value ) ;} + + // Getting a simple property (non-collection) + virtual void GetProperty(const wxObject *object, wxxVariant &result) const + { wxASSERT_MSG(m_getter,wxT("GetProperty called w/o valid getter") ) ; return m_getter->Get( object , result ) ;} + + // Adding an element to a collection property + virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const + { wxASSERT_MSG(m_adder,wxT("AddToPropertyCollection called w/o valid adder") ) ; m_adder->Add( object , value ) ;} + + // Getting a collection property + virtual void GetPropertyCollection( const wxObject *obj, wxxVariantArray &result) const + { wxASSERT_MSG(m_collectionGetter,wxT("GetPropertyCollection called w/o valid collection getter") ) ; return m_collectionGetter->Get( obj , result) ;} + + virtual bool HasSetter() const { return m_setter != NULL ; } + virtual bool HasCollectionGetter() const { return m_collectionGetter != NULL ; } + virtual bool HasGetter() const { return m_getter != NULL ; } + virtual bool HasAdder() const { return m_adder != NULL ; } + + virtual const wxString& GetCollectionGetterName() const + { return m_collectionGetter->GetName() ; } + virtual const wxString& GetGetterName() const + { return m_getter->GetName() ; } + virtual const wxString& GetSetterName() const + { return m_setter->GetName() ; } + virtual const wxString& GetAdderName() const + { return m_adder->GetName() ; } + /* + virtual wxxVariant ReadValue( const wxString &value ) const ; + virtual void WriteValue( wxString& value , const wxObject *o ) const ; + */ +protected : + wxSetter *m_setter ; + wxAdder *m_adder ; + wxGetter *m_getter ; + wxCollectionGetter* m_collectionGetter ; }; + class WXDLLIMPEXP_BASE wxGenericPropertyAccessor : public wxPropertyAccessor + { + public : + wxGenericPropertyAccessor( const wxString &propName ) ; + ~wxGenericPropertyAccessor() ; + + virtual bool HasSetter() const { return true ; } + virtual bool HasGetter() const { return true ; } + virtual bool HasAdder() const { return false ; } + virtual bool HasCollectionGetter() const { return false ; } + + virtual const wxString& GetGetterName() const + { return m_getterName ; } + virtual const wxString& GetSetterName() const + { return m_setterName ; } + + virtual void SetProperty(wxObject *object, const wxxVariant &value) const ; + virtual void GetProperty(const wxObject *object, wxxVariant &value) const ; + + // Adding an element to a collection property + virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const + { wxASSERT_MSG(0,wxT("AddToPropertyCollection called on a generic accessor") ) ;} + + // Getting a collection property + virtual void GetPropertyCollection( const wxObject *obj, wxxVariantArray &result) const + { wxASSERT_MSG(0,wxT("GetPropertyCollection called on a generic accessor") ) ;} + private : + struct wxGenericPropertyAccessorInternal ; + wxGenericPropertyAccessorInternal* m_data ; + wxString m_propertyName ; + wxString m_setterName ; + wxString m_getterName ; +} ; + class WXDLLIMPEXP_BASE wxPropertyInfo { public : - wxPropertyInfo( wxPropertyInfo* &iter , const wxChar *name , const wxChar *typeName , const wxTypeInfo* typeInfo , wxPropertyAccessor *accessor , wxxVariant dv ) : - m_name( name ) , m_typeName(typeName) , m_typeInfo( typeInfo ) , m_accessor( accessor ) , m_defaultValue( dv ) + wxPropertyInfo( wxPropertyInfo* &iter , const wxChar *name , const wxTypeInfo* typeInfo , wxPropertyAccessor *accessor , wxxVariant dv ) : + m_name( name ) , m_typeInfo( typeInfo ) , m_accessor( accessor ) , m_defaultValue( dv ) , m_collectionElementTypeInfo(NULL) { - m_next = NULL ; - if ( iter == NULL ) - iter = this ; - else - { - wxPropertyInfo* i = iter ; - while( i->m_next ) - i = i->m_next ; + Insert(iter) ; + } - i->m_next = this ; - } + wxPropertyInfo( wxPropertyInfo* &iter , const wxChar *name , const wxTypeInfo* collTypeInfo , const wxTypeInfo* elemTypeInfo , wxPropertyAccessor *accessor ) : + m_name( name ) , m_typeInfo( collTypeInfo ) , m_accessor( accessor ) , m_collectionElementTypeInfo(elemTypeInfo) + { + Insert(iter) ; } + // return the name of this property const wxChar * GetName() const { return m_name ; } - // return the typename of this property - const wxChar * GetTypeName() const { return m_typeName ; } + // return the element type info of this property (for collections, otherwise NULL) + const wxTypeInfo * GetCollectionElementTypeInfo() const { return m_collectionElementTypeInfo ; } - // return the type info of this property + // return the type info of this property const wxTypeInfo * GetTypeInfo() const { return m_typeInfo ; } // return the accessor for this property @@ -642,9 +708,25 @@ public : // returns the default value of this property, its kind may be wxT_VOID if it is not valid wxxVariant GetDefaultValue() const { return m_defaultValue ; } private : + void Insert(wxPropertyInfo* &iter) + { + m_next = NULL ; + if ( iter == NULL ) + iter = this ; + else + { + wxPropertyInfo* i = iter ; + while( i->m_next ) + i = i->m_next ; + + i->m_next = this ; + } + } + const wxChar * m_name; const wxChar * m_typeName ; const wxTypeInfo* m_typeInfo ; + const wxTypeInfo* m_collectionElementTypeInfo ; wxPropertyAccessor* m_accessor ; wxxVariant m_defaultValue; // string representation of the default value @@ -654,7 +736,7 @@ private : }; #define WX_BEGIN_PROPERTIES_TABLE(theClass) \ - const wxPropertyInfo *theClass::GetPropertiesStatic() \ + wxPropertyInfo *theClass::GetPropertiesStatic() \ { \ typedef theClass class_t; \ static wxPropertyInfo* first = NULL ; @@ -663,55 +745,49 @@ private : return first ; } -#if WX_XTI_TEMPLATE_FIX - -#define WX_PROPERTY( name , type , setter , getter ,defaultValue ) \ - static wxPropertyAccessorT<class_t , type> _accessor##name( &setter , &getter , #setter , #getter ) ; \ - static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ; - -#define WX_PROPERTY_SET_RET_BOOL( name , type , setter , getter ,defaultValue ) \ - static wxPropertyAccessorT<class_t , type> _accessor##name( (wxPropertyAccessor::SetRetBool*)NULL , &setter , &getter , #setter , #getter ) ; \ - static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ; - -#define WX_PROPERTY_SET_BY_REF( name , type , setter , getter ,defaultValue ) \ - static wxPropertyAccessorT<class_t , type> _accessor##name( (wxPropertyAccessor::SetByRef*)NULL, &setter , &getter , #setter , #getter ) ; \ - static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ; - -#define WX_PROPERTY_SET_BY_REF_RET_BOOL( name , type , setter , getter ,defaultValue ) \ - static wxPropertyAccessorT<class_t , type> _accessor##name( (wxPropertyAccessor::SetByRefRetBool*)NULL, &setter , &getter , #setter , #getter ) ; \ - static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ; - -#define WX_PROPERTY_SET_AND_GET_BY_REF_RET_BOOL( name , type , setter , getter ,defaultValue ) \ - static wxPropertyAccessorT<class_t , type> _accessor##name( (wxPropertyAccessor::SetAndGetByRefRetBool*)NULL, &setter , &getter , #setter , #getter ) ; \ - static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ; - -#else #define WX_PROPERTY( name , type , setter , getter ,defaultValue ) \ - static wxPropertyAccessorT<class_t , type> _accessor##name( &setter , &getter , #setter , #getter ) ; \ - static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ; - -#define WX_PROPERTY_SET_RET_BOOL( name , type , setter , getter ,defaultValue ) \ - WX_PROPERTY( name , type , setter , getter , defaultValue ) - -#define WX_PROPERTY_SET_BY_REF( name , type , setter , getter ,defaultValue ) \ - WX_PROPERTY( name , type , setter , getter , defaultValue ) - -#define WX_PROPERTY_SET_BY_REF_RET_BOOL( name , type , setter , getter ,defaultValue ) \ - WX_PROPERTY( name , type , setter , getter , defaultValue ) + WX_SETTER( name , class_t , type , setter ) \ + static wxSetter##name _setter##name ; \ + WX_GETTER( name , class_t , type , getter ) \ + static wxGetter##name _getter##name ; \ + static wxPropertyAccessor _accessor##name( &_setter##name , &_getter##name , NULL , NULL ) ; \ + static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ; -#define WX_PROPERTY_SET_AND_GET_BY_REF_RET_BOOL( name , type , setter , getter ,defaultValue ) \ - WX_PROPERTY( name , type , setter , getter , defaultValue ) +#define WX_READONLY_PROPERTY( name , type , getter ,defaultValue ) \ + WX_GETTER( name , class_t , type , getter ) \ + static wxGetter##name _getter##name ; \ + static wxPropertyAccessor _accessor##name( NULL , &_getter##name , NULL , NULL ) ; \ + static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ; + +#define WX_PROPERTY_COLLECTION( name , colltype , addelemtype , adder , getter ) \ + WX_ADDER( name , class_t , addelemtype , adder ) \ + static wxAdder##name _adder##name ; \ + WX_COLLECTION_GETTER( name , class_t , colltype , getter ) \ + static wxCollectionGetter##name _collectionGetter##name ; \ + static wxPropertyAccessor _accessor##name( NULL , NULL ,&_adder##name , &_collectionGetter##name ) ; \ + static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ; + +#define WX_READONLY_PROPERTY_COLLECTION( name , colltype , addelemtype , getter ) \ + WX_COLLECTION_GETTER( name , class_t , colltype , getter ) \ + static wxCollectionGetter##name _collectionGetter##name ; \ + static wxPropertyAccessor _accessor##name( NULL , NULL , NULL , &_collectionGetter##name ) ; \ + static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ; +/* +#define WX_PROPERTY_COLLECTION( name , colltype , addelemtype , adder , getter ) \ + static wxPropertyCollectionAccessorT<class_t , colltype , addelemtype > _accessor##name( &adder , &getter , #adder , #getter ) ; \ + static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ; + +#define WX_READONLY_PROPERTY_COLLECTION( name , colltype , addelemtype , getter ) \ + static wxPropertyCollectionAccessorT<class_t , colltype , addelemtype > _accessor##name( &getter , #getter ) ; \ + static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ; +*/ -#endif -#define WX_READONLY_PROPERTY( name , type , getter ,defaultValue ) \ - static wxPropertyAccessorT<class_t , type> _accessor##name( &getter , #getter ) ; \ - static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ; #define WX_DELEGATE( name , eventType , eventClass ) \ static wxDelegateTypeInfo _typeInfo##name( eventType , CLASSINFO( eventClass ) ) ; \ - static wxPropertyInfo _propertyInfo##name( first , #name , NULL , &_typeInfo##name , NULL , wxxVariant() ) ; \ + static wxPropertyInfo _propertyInfo##name( first , #name , &_typeInfo##name , NULL , wxxVariant() ) ; \ // ---------------------------------------------------------------------------- // Handler Info @@ -760,7 +836,7 @@ private : static wxHandlerInfo _handlerInfo##name( first , #name , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ; #define WX_BEGIN_HANDLERS_TABLE(theClass) \ - const wxHandlerInfo *theClass::GetHandlersStatic() \ + wxHandlerInfo *theClass::GetHandlersStatic() \ { \ typedef theClass class_t; \ static wxHandlerInfo* first = NULL ; @@ -953,7 +1029,60 @@ struct wxConstructorBridge_6 : public wxConstructorBridge const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 , #v5 } ; \ const int klass::sm_constructorPropertiesCount##klass = 6; +// 7 params + +template<typename Class, + typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6> +struct wxConstructorBridge_7 : public wxConstructorBridge +{ + void Create(wxObject *o, wxxVariant *args) + { + Class *obj = dynamic_cast<Class*>(o); + obj->Create( + args[0].Get<T0>() , + args[1].Get<T1>() , + args[2].Get<T2>() , + args[3].Get<T3>() , + args[4].Get<T4>() , + args[5].Get<T5>() , + args[6].Get<T6>() + ); + } +}; + +#define WX_CONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \ + wxConstructorBridge_7<klass,t0,t1,t2,t3,t4,t5,t6> constructor##klass ; \ + wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ + const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 , #v5 , #v6} ; \ + const int klass::sm_constructorPropertiesCount##klass = 7; + +// 8 params + +template<typename Class, + typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7> +struct wxConstructorBridge_8 : public wxConstructorBridge +{ + void Create(wxObject *o, wxxVariant *args) + { + Class *obj = dynamic_cast<Class*>(o); + obj->Create( + args[0].Get<T0>() , + args[1].Get<T1>() , + args[2].Get<T2>() , + args[3].Get<T3>() , + args[4].Get<T4>() , + args[5].Get<T5>() , + args[6].Get<T6>() , + args[7].Get<T7>() + ); + } +}; +#define WX_CONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \ + wxConstructorBridge_8<klass,t0,t1,t2,t3,t4,t5,t6,t7> constructor##klass ; \ + wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ + const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 , #v5 , #v6 , #v7} ; \ + const int klass::sm_constructorPropertiesCount##klass = 8; // ---------------------------------------------------------------------------- // wxClassInfo // ---------------------------------------------------------------------------- @@ -970,8 +1099,8 @@ public: const wxChar *_ClassName, int size, wxObjectConstructorFn ctor , - const wxPropertyInfo *_Props , - const wxHandlerInfo *_Handlers , + wxPropertyInfo *_Props , + wxHandlerInfo *_Handlers , wxConstructorBridge* _Constructor , const wxChar ** _ConstructorProperties , const int _ConstructorPropertiesCount , @@ -987,9 +1116,23 @@ public: Register() ; } + wxClassInfo(const wxChar *_UnitName, const wxChar *_ClassName, const wxClassInfo **_Parents) : m_parents(_Parents) , m_unitName(_UnitName) ,m_className(_ClassName), + m_objectSize(0), m_objectConstructor(NULL) , m_firstProperty(NULL ) , m_firstHandler(NULL ) , m_constructor( NULL ) , + m_constructorProperties(NULL) , m_constructorPropertiesCount(NULL), + m_variantOfPtrToObjectConverter( NULL ) , m_variantToObjectConverter( NULL ) , m_objectToVariantConverter( NULL ) , m_next(sm_first) + { + sm_first = this; + Register() ; + } + virtual ~wxClassInfo() ; - wxObject *CreateObject() const { return m_objectConstructor ? (*m_objectConstructor)() : 0; } + // allocates an instance of this class, this object does not have to be initialized or fully constructed + // as this call will be followed by a call to Create + virtual wxObject *AllocateObject() const { return m_objectConstructor ? (*m_objectConstructor)() : 0; } + + // 'old naming' for AllocateObject staying here for backward compatibility + wxObject *CreateObject() const { return AllocateObject() ; } const wxChar *GetClassName() const { return m_className; } const wxClassInfo **GetParents() const { return m_parents; } @@ -1026,14 +1169,15 @@ public: wxDEPRECATED( static void CleanUpClasses() ); #endif static void CleanUp(); - + // returns the first property const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; } // returns the first handler const wxHandlerInfo* GetFirstHandler() const { return m_firstHandler ; } - // Call the Create method for a class + // Call the Create upon an instance of the class, in the end the object is fully + // initialized virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params) const { wxASSERT_MSG( ParamCount == m_constructorPropertiesCount , wxT("Illegal Parameter Count for Create Method")) ; @@ -1043,12 +1187,16 @@ public: // get number of parameters for constructor virtual int GetCreateParamCount() const { return m_constructorPropertiesCount; } - // get i-th constructor parameter - virtual const wxChar* GetCreateParamName(int i) const { return m_constructorProperties[i] ; } + // get n-th constructor parameter + virtual const wxChar* GetCreateParamName(int n) const { return m_constructorProperties[n] ; } + + // Runtime access to objects for simple properties (get/set) by property name, and variant data + virtual void SetProperty (wxObject *object, const wxChar *propertyName, const wxxVariant &value) const ; + virtual wxxVariant GetProperty (wxObject *object, const wxChar *propertyName) const; - // Runtime access to objects by property name, and variant data - virtual void SetProperty (wxObject *object, const wxChar *PropertyName, const wxxVariant &Value); - virtual wxxVariant GetProperty (wxObject *object, const wxChar *PropertyName); + // Runtime access to objects for collection properties by property name + virtual wxxVariantArray GetPropertyCollection(wxObject *object, const wxChar *propertyName) const ; + virtual void AddToPropertyCollection(wxObject *object, const wxChar *propertyName , const wxxVariant& value) const ; // we must be able to cast variants to wxObject pointers, templates seem not to be suitable wxObject* VariantToInstance( wxxVariant &data ) const @@ -1066,6 +1214,11 @@ public: // find handler by name virtual const wxHandlerInfo *FindHandlerInfo (const wxChar *PropertyName) const ; + // find property by name + virtual const wxPropertyInfo *FindPropertyInfoInThisClass (const wxChar *PropertyName) const ; + + // find handler by name + virtual const wxHandlerInfo *FindHandlerInfoInThisClass (const wxChar *PropertyName) const ; public: const wxChar *m_className; int m_objectSize; @@ -1081,10 +1234,11 @@ public: // many clients) static wxHashTable *sm_classTable; +protected : + wxPropertyInfo * m_firstProperty ; + wxHandlerInfo * m_firstHandler ; private: const wxClassInfo** m_parents ; - const wxPropertyInfo * m_firstProperty ; - const wxHandlerInfo * m_firstHandler ; const wxChar* m_unitName; wxConstructorBridge* m_constructor ; @@ -1094,12 +1248,12 @@ private: wxVariantToObjectConverter m_variantToObjectConverter ; wxObjectToVariantConverter m_objectToVariantConverter ; - const wxPropertyAccessor *FindAccessor (const wxChar *propertyName); + const wxPropertyAccessor *FindAccessor (const wxChar *propertyName) const ; // InitializeClasses() helper - static wxClassInfo *GetBaseByName(const wxChar *name); - + static wxClassInfo *GetBaseByName(const wxChar *name) ; + protected: // registers the class void Register(); @@ -1108,8 +1262,41 @@ protected: DECLARE_NO_COPY_CLASS(wxClassInfo) }; + WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); +// ---------------------------------------------------------------------------- +// wxDynamicObject +// ---------------------------------------------------------------------------- +// +// this object leads to having a pure runtime-instantiation + +class wxDynamicClassInfo : public wxClassInfo +{ +public : + wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName , const wxClassInfo* superClass ) ; + virtual ~wxDynamicClassInfo() ; + + // constructs a wxDynamicObject with an instance + virtual wxObject *AllocateObject() const ; + + // Call the Create method for a class + virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params) const ; + + // get number of parameters for constructor + virtual int GetCreateParamCount() const ; + + // get i-th constructor parameter + virtual const wxChar* GetCreateParamName(int i) const ; + + // Runtime access to objects by property name, and variant data + virtual void SetProperty (wxObject *object, const wxChar *PropertyName, const wxxVariant &Value) const ; + virtual wxxVariant GetProperty (wxObject *object, const wxChar *PropertyName) const ; + + void AddProperty( const wxChar *propertyName , const wxTypeInfo* typeInfo ) ; + void AddHandler( const wxChar *handlerName , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) ; +} ; + // ---------------------------------------------------------------------------- // Dynamic class macros // ---------------------------------------------------------------------------- @@ -1118,8 +1305,8 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); public: \ static wxClassInfo sm_class##name; \ static const wxClassInfo* sm_classParents##name[] ; \ - static const wxPropertyInfo* GetPropertiesStatic() ; \ - static const wxHandlerInfo* GetHandlersStatic() ; \ + static wxPropertyInfo* GetPropertiesStatic() ; \ + static wxHandlerInfo* GetHandlersStatic() ; \ virtual wxClassInfo *GetClassInfo() const \ { return &name::sm_class##name; } @@ -1197,8 +1384,8 @@ WX_CONSTRUCTOR_DUMMY( name ) #define IMPLEMENT_DYNAMIC_CLASS( name , basename ) \ _IMPLEMENT_DYNAMIC_CLASS( name , basename , "" ) \ -const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \ -const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ +wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \ +wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ WX_CONSTRUCTOR_DUMMY( name ) #define IMPLEMENT_DYNAMIC_CLASS_XTI( name , basename , unit ) \ @@ -1265,8 +1452,8 @@ _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit ) #define IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2) \ _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "") \ -const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \ -const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ +wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \ +wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ WX_CONSTRUCTOR_DUMMY( name ) #define IMPLEMENT_DYNAMIC_CLASS2_XTI( name , basename , basename2, unit) \ @@ -1298,8 +1485,8 @@ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVaria #define IMPLEMENT_ABSTRACT_CLASS( name , basename ) \ _IMPLEMENT_ABSTRACT_CLASS( name , basename ) \ -const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ -const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } +wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ +wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } // Multiple inheritance with two base classes @@ -1311,4 +1498,27 @@ const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NUL #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2 +// -------------------------------------------------------------------------- +// Collection Support +// -------------------------------------------------------------------------- + +template<typename collection_t> void wxListCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value ) +{ + collection_t::compatibility_iterator current = coll.GetFirst() ; + while (current) + { + value.Add( new wxxVariant(current->GetData()) ) ; + current = current->GetNext(); + } +} + +template<typename collection_t> void wxArrayCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value ) +{ + for( int i = 0 ; i < coll.GetCount() ; i++ ) + { + value.Add( new wxxVariant(coll[i]) ) ; + } +} + + #endif