#ifndef _WX_XTIH__
#define _WX_XTIH__
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "xti.h"
#endif
#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;
// ----------------------------------------------------------------------------
// 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
{
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 WXDLLIMPEXP_BASE wxTypeInfo
wxClassInfo *m_classInfo; // Kind == wxT_OBJECT - could be NULL
} ;
+class WXDLLIMPEXP_BASE wxCollectionTypeInfo : public wxTypeInfo
+{
+public :
+ wxCollectionTypeInfo( wxTypeInfo *elementType )
+ { m_kind = wxT_COLLECTION , m_elementType = elementType ; }
+
+ const wxTypeInfo* GetElementType() const { return m_elementType ; }
+private :
+ wxTypeInfo * m_elementType ;
+} ;
+
// a delegate is an exposed event source
class WXDLLIMPEXP_BASE wxDelegateTypeInfo : public wxTypeInfo
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 ; }
-// ----------------------------------------------------------------------------
-// value streaming
-//
-// streaming is defined for xml constructs right now, the aim is to make this
-// pluggable in the future
-// ----------------------------------------------------------------------------
-
-// convenience function (avoids including xml headers in users code)
-
-class wxXmlNode ;
-void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data ) ;
-wxString wxXmlGetContentFromNode( wxXmlNode *node ) ;
-
// templated streaming, every type must have their specialization for these methods
template<typename T>
template<typename T>
void wxStringWriteValue( wxString &s , const T &data);
-// for simple types this default implementation is ok, composited structures will have to
-// loop through their properties
+// sometimes a compiler invents specializations that are nowhere called, use this macro to satisfy the refs
-template<typename T>
-void wxXmlReadValue( wxXmlNode *node , T &data )
-{
- wxStringReadValue<T>( wxXmlGetContentFromNode( node ) , data ) ;
-}
-
-template<typename T>
-void wxXmlWriteValue( wxXmlNode *node , const T &data)
-{
- wxString s ;
- wxStringWriteValue<T>( s, data ) ;
- wxXmlAddContentToNode( node ,s ) ;
-}
+#define WX_ILLEGAL_TYPE_SPECIALIZATION( a ) \
+template<> const wxTypeInfo* wxGetTypeInfo( a * ) { assert(0) ; \
+ static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ; return &s_typeInfo ; } \
+template<> void wxStringReadValue(const wxString & , a & ) { assert(0) ; }\
+template<> void wxStringWriteValue(wxString & , a const & ) { assert(0) ; }
// ----------------------------------------------------------------------------
// wxxVariant as typesafe data holder
// returns the type info of the contentc
virtual const wxTypeInfo* GetTypeInfo() const = 0 ;
- // write the value into an xml node
- virtual void Write( wxXmlNode* node ) const = 0 ;
-
- // read the value from the xml node
- virtual void Read( wxXmlNode* node ) = 0 ;
-
// write the value into a string
virtual void Write( wxString &s ) const = 0 ;
// returns the type info of the contentc
virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( (T*) NULL ) ; }
- // write the value into an xml node
- virtual void Write( wxXmlNode* node ) const { wxXmlWriteValue( node , m_data ) ; }
-
- // read the value from the xml node
- virtual void Read( wxXmlNode* node ) { wxXmlReadValue( node , m_data ) ; }
-
// write the value into a string
virtual void Write( wxString &s ) const { wxStringWriteValue( s , m_data ) ; }
// get the typeinfo of the stored object
const wxTypeInfo* GetTypeInfo() const { return m_data->GetTypeInfo() ; }
- // write the value into an xml node
- void Write( wxXmlNode* node ) const { m_data->Write( node ) ; }
-
- // read the value from the xml node
- void Read( wxXmlNode* node ) { m_data->Read( node ) ; }
-
- // write the value into a string
+ // write the value into a string
void Write( wxString &s ) const { m_data->Write( s ) ; }
// read the value from a string
wxString m_name ;
} ;
+#include <wx/dynarray.h>
+
+WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE);
+
// ----------------------------------------------------------------------------
// Property Support
//
class WXDLLIMPEXP_BASE wxPropertyAccessor
{
public :
+#if WX_XTI_TEMPLATE_FIX
class SetByRef ;
class SetByRefRetBool ;
class SetRetBool ;
class SetAndGetByRef ;
class SetAndGetByRefRetBool ;
class GetByRef ;
+#endif
+ wxPropertyAccessor() { m_setterName = NULL ; m_getterName = NULL ; m_adderName = NULL ;}
+ virtual ~wxPropertyAccessor() {}
+
+ // Setting a simple property (non-collection)
virtual void SetProperty(wxObject *object, const wxxVariant &value) const = 0 ;
- virtual wxxVariant GetProperty(wxObject *object) const = 0 ;
+
+ // Getting a simple property (non-collection)
+ virtual wxxVariant GetProperty(const wxObject *object) const = 0 ;
+
+ // Adding an element to a collection property
+ virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const
+ { wxASSERT_MSG(0,wxT("Collection Operation called on non Collection Property")) ; }
+
+ // Getting a collection property
+ virtual wxxVariantArray GetPropertyCollection( const wxObject *obj) const
+ { wxASSERT_MSG(0,wxT("Collection Operation called on non Collection Property")) ; return wxxVariantArray() ; }
+
virtual bool HasSetter() const = 0 ;
virtual bool HasGetter() const = 0 ;
+ virtual bool HasAdder() const = 0 ;
+
const wxChar * GetGetterName() const { return m_setterName ; }
const wxChar * GetSetterName() const { return m_getterName ; }
- virtual wxxVariant ReadValue( wxXmlNode* node ) const = 0 ;
- virtual void WriteValue( wxXmlNode* node , wxObject *o ) const = 0 ;
+ const wxChar * GetAdderName() const { return m_adderName ; }
+
virtual wxxVariant ReadValue( const wxString &value ) const = 0 ;
- virtual void WriteValue( wxString& value , wxObject *o ) const = 0 ;
+ virtual void WriteValue( wxString& value , const wxObject *o ) const = 0 ;
protected :
const wxChar *m_setterName ;
const wxChar *m_getterName ;
+ const wxChar *m_adderName ;
};
-template<typename T>
-void wxXmlReadValue( wxXmlNode *node , T &data ) ;
+class WXDLLIMPEXP_BASE wxGenericPropertyAccessor : public wxPropertyAccessor
+{
+public :
+ wxGenericPropertyAccessor( const wxChar* propertyName ) ;
+ ~wxGenericPropertyAccessor() ;
+ virtual void SetProperty(wxObject *object, const wxxVariant &value) const ;
+ virtual wxxVariant GetProperty(const wxObject *object) const ;
-template<typename T>
-void wxXmlWriteValue( wxXmlNode *node , const T &data) ;
+ virtual bool HasSetter() const { return true ; }
+ virtual bool HasGetter() const { return true ; }
+ virtual bool HasAdder() const { return false ; }
+
+ virtual wxxVariant ReadValue( const wxString &value ) const ;
+ virtual void WriteValue( wxString& value , const wxObject *o ) const ;
+private :
+ struct wxGenericPropertyAccessorInternal ;
+ wxGenericPropertyAccessorInternal* m_data ;
+} ;
template<class Klass, typename T>
class WXDLLIMPEXP_BASE wxPropertyAccessorT : public wxPropertyAccessor
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)
+ wxPropertyAccessorT(setter_t setter, getter_t getter, const wxChar *s, const wxChar *g)
: 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(SetRetBool*, setter_bool_t setter, getter_t getter, const wxChar *g, const wxChar *s)
+ wxPropertyAccessorT(WX_XTI_PARAM_FIX(GetByRef*,) getter_ref_t getter, const wxChar *g)
+ : m_setter_bool( NULL ) , m_setter_ref_bool( NULL ) , m_setter(NULL), m_setter_ref(NULL), m_getter(NULL) ,m_getter_ref(getter) {m_setterName = "";m_getterName=g ;}
+
+ wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetRetBool*,) setter_bool_t setter, getter_t getter, const wxChar *s, const wxChar *g)
: 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(SetByRef*, setter_ref_t setter, getter_t getter, const wxChar *g, const wxChar *s)
+ wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetByRef*,) setter_ref_t setter, getter_t getter, const wxChar *s, const wxChar *g)
: 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(SetByRefRetBool*, setter_ref_bool_t setter, getter_t getter, const wxChar *g, const wxChar *s)
+ wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetByRefRetBool*,) setter_ref_bool_t setter, getter_t getter, const wxChar *s, const wxChar *g)
: 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(setter_ref_t setter, getter_t getter, const wxChar *g, const wxChar *s)
- // : m_setter(NULL), m_setter_ref(setter), m_getter(getter) , m_getter_ref(NULL){m_setterName = s;m_getterName=g ;}
- wxPropertyAccessorT(SetAndGetByRef*, setter_ref_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s)
+ wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetAndGetByRef*,) setter_ref_t setter, getter_ref_t getter, const wxChar *s, const wxChar *g)
: 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(SetAndGetByRefRetBool*, setter_ref_bool_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s)
+ wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetAndGetByRefRetBool*,) setter_ref_bool_t setter, getter_ref_t getter, const wxChar *s, const wxChar *g)
: 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(setter_ref_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s)
- // : m_setter(NULL), m_setter_ref(setter), m_getter(NULL) , m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
-
- // wxPropertyAccessorT(setter_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s)
- // : m_setter(NULL), m_setter(setter), m_getter(NULL) , m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
-
- wxPropertyAccessorT(GetByRef*, setter_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s)
+ wxPropertyAccessorT(WX_XTI_PARAM_FIX(GetByRef*,) setter_t setter, getter_ref_t getter, const wxChar *s, const wxChar *g)
: 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 ;}
- // wxPropertyAccessorT( getter_ref_t getter, const wxChar *g)
- // : m_setter(NULL), m_setter(NULL), m_getter(NULL) , m_getter_ref(getter){m_setterName = "";m_getterName=g ;}
-
// returns true if this accessor has a setter
- bool HasSetter() const { return m_setter != NULL || m_setter_ref != NULL ; }
+ bool HasSetter() const { return m_setter != NULL || m_setter_ref != NULL || m_setter_ref_bool != NULL || m_setter_bool ; }
// return true if this accessor has a getter
bool HasGetter() const { return m_getter != NULL || m_getter_ref != NULL ; }
+ bool HasAdder() const { return true ; }
// set the property this accessor is responsible for in an object
void SetProperty(wxObject *o, const wxxVariant &v) const
{
}
// gets the property this accessor is responsible for from an object
- wxxVariant GetProperty(wxObject *o) const
+ wxxVariant GetProperty(const wxObject *o) const
{
return wxxVariant( (wxxVariantData* ) DoGetProperty( o ) ) ;
}
- // write the property this accessor is responsible for from an object into
- // a xml node
- void WriteValue( wxXmlNode* node , wxObject *o ) const
- {
- DoGetProperty( o )->Write( node ) ;
- }
-
// write the property this accessor is responsible for from an object into
// a string
- void WriteValue( wxString& s , wxObject *o ) const
+ 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 an xml node
- wxxVariant ReadValue( wxXmlNode* node ) const
- {
- T data ;
- wxXmlReadValue( node , data ) ;
- return wxxVariant( data ) ;
- }
-
// read a wxxVariant having the correct type for the property this accessor
// is responsible for from a string
wxxVariant ReadValue( const wxString &value ) const
}
private :
- wxxVariantDataT<T>* DoGetProperty(wxObject *o) const
+ wxxVariantDataT<T>* DoGetProperty(const wxObject *o) const
{
- Klass *obj = dynamic_cast<Klass*>(o);
+ const Klass *obj = dynamic_cast<const Klass*>(o);
if ( m_getter )
return new wxxVariantDataT<T>( (obj->*(m_getter))() ) ;
else
getter_ref_t m_getter_ref ;
};
+template<class Klass, typename CollectionType , typename AddedElementType>
+class WXDLLIMPEXP_BASE wxPropertyCollectionAccessorT : public wxPropertyAccessor
+{
+public:
+
+ typedef void (Klass::*adder_t)(AddedElementType value);
+ typedef CollectionType (Klass::*getter_t)() const;
+ typedef const CollectionType& (Klass::*getter_ref_t)() const;
+
+ wxPropertyCollectionAccessorT(adder_t adder, getter_t getter, const wxChar *a, const wxChar *g)
+ : m_getter(getter), m_adder(adder) , m_getter_ref( NULL ) { m_adderName = a;m_getterName=g ;}
+
+ wxPropertyCollectionAccessorT(adder_t adder, getter_ref_t getter, const wxChar *a, const wxChar *g)
+ : m_getter(NULL), m_adder(adder) , m_getter_ref( getter ) { m_adderName = a;m_getterName=g ;}
+
+ ~wxPropertyCollectionAccessorT() {}
+
+ // returns true if this accessor has a setter
+ bool HasSetter() const { return false ;}
+
+ // return true if this accessor has a getter
+ bool HasGetter() const { return m_getter != NULL ;}
+
+ // return true if this accessor has a getter
+ bool HasAdder() const { return m_adder != NULL ;}
+
+ // set the property this accessor is responsible for in an object
+ void AddToPropertyCollection(wxObject *o, const wxxVariant &v) const
+ {
+ Klass *obj = dynamic_cast<Klass*>(o);
+ AddedElementType value ;
+
+ if ( wxGetTypeInfo((AddedElementType*)NULL)->GetKind() == wxT_OBJECT && v.GetTypeInfo()->GetKind() == wxT_OBJECT_PTR )
+ value = *v.Get<AddedElementType*>();
+ else
+ value = v.Get<AddedElementType>();
+
+ if (m_adder)
+ (obj->*(m_adder))(value);
+ else
+ {
+ wxASSERT_MSG(0 , wxT("SetPropertyCalled without a valid Setter") ) ;
+ }
+ }
+
+ // gets the property this accessor is responsible for from an object
+ wxxVariantArray GetPropertyCollection(const wxObject *o) const
+ {
+ const Klass *obj = dynamic_cast<const Klass*>(o);
+
+ wxxVariantArray result ;
+ CollectionType::compatibility_iterator current = (obj->*(m_getter_ref))().GetFirst() ;
+
+ while (current)
+ {
+ result.Add( new wxxVariant(current->GetData()) ) ;
+ current = current->GetNext();
+ }
+ return result ;
+ }
+
+
+ // set the property this accessor is responsible for in an object
+ void SetProperty(wxObject *WXUNUSED(o), const wxxVariant &WXUNUSED(v)) const
+ {
+ wxASSERT_MSG(0,wxT("SetProperty called on Collection Property")) ;
+ }
+
+ // gets the property this accessor is responsible for from an object
+ wxxVariant GetProperty(const wxObject *WXUNUSED(o)) const
+ {
+ wxASSERT_MSG(0,wxT("GetProperty called on Collection Property")) ;
+ return wxxVariant() ;
+ }
+
+ // write the property this accessor is responsible for from an object into
+ // a string
+ void WriteValue( wxString& s , const wxObject *o ) const
+ {
+ wxASSERT_MSG(0,wxT("WriteValue called on Collection Property")) ;
+ }
+
+ // read a wxxVariant having the correct type for the property this accessor
+ // is responsible for from a string
+ wxxVariant ReadValue( const wxString &value ) const
+ {
+ wxASSERT_MSG(0,wxT("ReadValue called on Collection Property")) ;
+ return wxxVariant() ;
+ }
+
+private :
+ getter_t m_getter;
+ getter_ref_t m_getter_ref ;
+ adder_t m_adder;
+};
+
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
// 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
};
#define WX_BEGIN_PROPERTIES_TABLE(theClass) \
- const wxPropertyInfo *theClass::GetPropertiesStatic() \
+ wxPropertyInfo *theClass::GetPropertiesStatic() \
{ \
typedef theClass class_t; \
static wxPropertyInfo* first = NULL ;
#define WX_END_PROPERTIES_TABLE() \
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) ) ;
+ static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#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( NULL , &getter , "" , #getter ) ; \
+ static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ;
#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) ) ;
+ static wxPropertyInfo _propertyInfo##name( first , #name , 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) ) ;
+ static wxPropertyInfo _propertyInfo##name( first , #name , 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) ) ;
+ 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 ) \
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) ) ;
+ static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#define WX_READONLY_PROPERTY( name , type , getter ,defaultValue ) \
+ static wxPropertyAccessorT<class_t , type> _accessor##name( &getter , #getter ) ; \
+ static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#define WX_READONLY_PROPERTY_GET_BY_REF( name , type , getter ,defaultValue ) \
+ static wxPropertyAccessorT<class_t , type> _accessor##name( (wxPropertyAccessor::GetByRef*)NULL , &getter , #getter ) ; \
+ static wxPropertyInfo _propertyInfo##name( first , #name , 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 , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#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( NULL , &getter , "" , #getter ) ; \
+ static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ;
+
+#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 )
+
+#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 ) \
static wxPropertyAccessorT<class_t , type> _accessor##name( &getter , #getter ) ; \
- static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+ static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#define WX_READONLY_PROPERTY_GET_BY_REF( name , type , getter ,defaultValue ) \
+ WX_READONLY_PROPERTY( name , type , getter , defaultValue )
+
+#endif
+
#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
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 ;
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 ,
m_variantOfPtrToObjectConverter( _PtrConverter1 ) , m_variantToObjectConverter( _Converter2 ) , m_objectToVariantConverter( _Converter3 ) , m_next(sm_first)
{
sm_first = this;
- Register( m_className , this ) ;
+ 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; }
return false ;
}
+#ifdef WXWIN_COMPATIBILITY_2_4
// Initializes parent pointers and hash table for fast searching.
- // this is going to be removed by Register/Unregister calls
- // in Constructor / Destructor together with making the hash map private
-
- static void InitializeClasses();
-
+ wxDEPRECATED( static void InitializeClasses() );
// Cleans up hash table used for fast searching.
-
- static void CleanUpClasses();
+ 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")) ;
// 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
// 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;
// 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 ;
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();
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
// ----------------------------------------------------------------------------
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; }
#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 ) \
#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) \
#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
projects / wxWidgets.git / blobdiff