X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4393b50ccd24114090d61665ba737e64b755cbde..a5b8e8bf1828cbf3f01800e33ab32699758468b6:/include/wx/xti.h diff --git a/include/wx/xti.h b/include/wx/xti.h index ee8f9fc2f0..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 @@ -40,6 +40,7 @@ #include "wx/memory.h" #include "wx/set.h" #include "wx/string.h" +#include "wx/arrstr.h" class WXDLLIMPEXP_BASE wxObject; class WXDLLIMPEXP_BASE wxClassInfo; @@ -65,58 +66,67 @@ typedef void (wxObject::*wxObjectEventFunction)(wxEvent&); struct WXDLLIMPEXP_BASE wxEnumMemberData { - const wxChar* m_name; - int m_value; + const wxChar* m_name; + int m_value; }; class WXDLLIMPEXP_BASE wxEnumData { public : - wxEnumData( wxEnumMemberData* data ) ; + wxEnumData( wxEnumMemberData* data ) ; - // returns true if the member has been found and sets the int value - // pointed to accordingly (if ptr != null ) - // if not found returns false, value left unchanged - bool HasEnumMemberValue( const wxChar *name , int *value = NULL ) ; + // returns true if the member has been found and sets the int value + // pointed to accordingly (if ptr != null ) + // if not found returns false, value left unchanged + bool HasEnumMemberValue( const wxChar *name , int *value = NULL ) ; - // returns the value of the member, if not found in debug mode an - // assert is issued, in release 0 is returned - int GetEnumMemberValue(const wxChar *name ); + // returns the value of the member, if not found in debug mode an + // assert is issued, in release 0 is returned + int GetEnumMemberValue(const wxChar *name ); - // returns the name of the enum member having the passed in value - // returns an emtpy string if not found + // returns the name of the enum member having the passed in value + // returns an emtpy string if not found const wxChar *GetEnumMemberName(int value); - // returns the number of members in this enum - int GetEnumCount() { return m_count ; } + // returns the number of members in this enum + int GetEnumCount() { return m_count ; } - // returns the value of the nth member - int GetEnumMemberValueByIndex( int n ) ; + // returns the value of the nth member + int GetEnumMemberValueByIndex( int n ) ; - // returns the value of the nth member - const wxChar *GetEnumMemberNameByIndex( int n ) ; + // returns the value of the nth member + const wxChar *GetEnumMemberNameByIndex( int n ) ; private : wxEnumMemberData *m_members; - int m_count ; + int m_count ; }; #define WX_BEGIN_ENUM( e ) \ - wxEnumMemberData s_enumDataMembers##e[] = { + wxEnumMemberData s_enumDataMembers##e[] = { #define WX_ENUM_MEMBER( v ) { #v, v } , #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) ; \ - } \ - template<> void wxStringWriteValue(wxString &s , const e &data ) \ - { \ - s = s_enumData##e.GetEnumMemberName((int)data) ; \ - } + wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \ + wxEnumData *wxGetEnumData(e) { return &s_enumData##e ; } \ + template<> void wxStringReadValue(const wxString& s , e &data ) \ + { \ + data = (e) s_enumData##e.GetEnumMemberValue(s) ; \ + } \ + template<> void wxStringWriteValue(wxString &s , const e &data ) \ + { \ + s = s_enumData##e.GetEnumMemberName((int)data) ; \ + } \ + template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxEnumTypeInfo s_typeInfo(wxT_ENUM , &s_enumData##e , &wxToStringConverter , &wxFromStringConverter) ; 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* & ) \ + { \ + assert(0) ; \ + } \ + template<> void wxStringWriteValue(wxString &s , e* const & ) \ + { \ + assert(0) ; \ + } // ---------------------------------------------------------------------------- // Set Support @@ -125,9 +135,9 @@ private : // // enum wxFlavor // { -// Vanilla, -// Chocolate, -// Strawberry, +// Vanilla, +// Chocolate, +// Strawberry, // }; // // typedef wxSet wxCoupe ; @@ -135,9 +145,9 @@ private : // in the implementation file : // // WX_BEGIN_ENUM( wxFlavor ) -// WX_ENUM_MEMBER( Vanilla ) -// WX_ENUM_MEMBER( Chocolate ) -// WX_ENUM_MEMBER( Strawberry ) +// WX_ENUM_MEMBER( Vanilla ) +// WX_ENUM_MEMBER( Chocolate ) +// WX_ENUM_MEMBER( Strawberry ) // WX_END_ENUM( wxFlavor ) // // WX_IMPLEMENT_SET_STREAMING( wxCoupe , wxFlavor ) @@ -153,60 +163,67 @@ void wxSetStringToArray( const wxString &s , wxArrayString &array ) ; template void wxSetFromString(const wxString &s , wxSet &data ) { - wxEnumData* edata = wxGetEnumData((e) 0) ; - data.Clear() ; + wxEnumData* edata = wxGetEnumData((e) 0) ; + data.Clear() ; - wxArrayString array ; - wxSetStringToArray( s , array ) ; + wxArrayString array ; + wxSetStringToArray( s , array ) ; wxString flag; for ( int i = 0 ; i < array.Count() ; ++i ) { flag = array[i] ; - int ivalue ; - if ( edata->HasEnumMemberValue( flag , &ivalue ) ) - { - data.Set( (e) ivalue ) ; - } + int ivalue ; + if ( edata->HasEnumMemberValue( flag , &ivalue ) ) + { + data.Set( (e) ivalue ) ; + } } } template void wxSetToString( wxString &s , const wxSet &data ) { - wxEnumData* edata = wxGetEnumData((e) 0) ; - int count = edata->GetEnumCount() ; - int i ; - s.Clear() ; - for ( i = 0 ; i < count ; i++ ) - { - e value = (e) edata->GetEnumMemberValueByIndex(i) ; - if ( data.Contains( value ) ) - { - // this could also be done by the templated calls - if ( !s.IsEmpty() ) - s +="|" ; - s += edata->GetEnumMemberNameByIndex(i) ; - } - } + wxEnumData* edata = wxGetEnumData((e) 0) ; + int count = edata->GetEnumCount() ; + int i ; + s.Clear() ; + for ( i = 0 ; i < count ; i++ ) + { + e value = (e) edata->GetEnumMemberValueByIndex(i) ; + if ( data.Contains( value ) ) + { + // this could also be done by the templated calls + if ( !s.IsEmpty() ) + s +="|" ; + s += edata->GetEnumMemberNameByIndex(i) ; + } + } } // if the wxSet specialization above does not work for all compilers, add this to the WX_IMPLEMENT_SET_STREAMING macro -// template<> const wxTypeInfo* wxGetTypeInfo( SetName * ){ static wxEnumTypeInfo s_typeInfo(wxT_SET , &s_enumData##e) ; return &s_typeInfo ; } +// template<> const wxTypeInfo* wxGetTypeInfo( SetName * ){ static wxEnumTypeInfo s_typeInfo(wxT_SET , &s_enumData##e) ; return &s_typeInfo ; } #define WX_IMPLEMENT_SET_STREAMING(SetName,e) \ - template<> void wxStringReadValue(const wxString &s , wxSet &data ) \ - { \ - wxSetFromString( s , data ) ; \ - } \ - template<> void wxStringWriteValue( wxString &s , const wxSet &data ) \ - { \ - wxSetToString( s , data ) ; \ - } \ + template<> void wxStringReadValue(const wxString &s , wxSet &data ) \ + { \ + wxSetFromString( s , data ) ; \ + } \ + template<> void wxStringWriteValue( wxString &s , const wxSet &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 { @@ -223,56 +240,92 @@ enum wxTypeKind wxT_STRING, // must be wxString wxT_SET, // must be wxSet<> template wxT_ENUM, - wxT_OBJECT, // must be a component (pointer !!!) wxT_CUSTOM, // user defined type (e.g. wxPoint) - wxT_DELEGATE , // for connecting against an event source - wxT_LAST_TYPE_KIND // sentinel for bad data, asserts, debugging + + 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 = 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 ) { assert( kind < wxT_SET ) ; 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 ;} - const wxChar *GetTypeName() const { assert( m_kind == wxT_CUSTOM ) ; return m_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 + const wxChar *m_typeName; // Kind == wxT_CUSTOM } ; class WXDLLIMPEXP_BASE wxEnumTypeInfo : public wxTypeInfo { public : - wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo ) - { assert( kind == wxT_ENUM || kind == wxT_SET ) ; m_kind = kind ; m_enumInfo = enumInfo ;} - const wxEnumData* GetEnumData() const { assert( m_kind == wxT_ENUM || m_kind == wxT_SET ) ; return m_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 + wxEnumData *m_enumInfo; // Kind == wxT_ENUM or Kind == wxT_SET } ; class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo { public : - wxClassTypeInfo( wxClassInfo* classInfo ) - { m_kind = wxT_OBJECT ; m_classInfo = classInfo ;} - const wxClassInfo *GetClassInfo() const { assert( m_kind == wxT_OBJECT ) ; return m_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 + 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 @@ -280,64 +333,49 @@ private : class WXDLLIMPEXP_BASE wxDelegateTypeInfo : public wxTypeInfo { public : - wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass ) - { m_kind = wxT_DELEGATE ; m_eventClass = eventClass ; m_eventType = eventType ;} - const wxClassInfo *GetEventClass() const { assert( m_kind == wxT_DELEGATE ) ; return m_eventClass ; } - int GetEventType() const { assert( m_kind == wxT_DELEGATE ) ; return m_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 : - const wxClassInfo *m_eventClass; // (extended will merge into classinfo) - int m_eventType ; + const wxClassInfo *m_eventClass; // (extended will merge into classinfo) + int m_eventType ; } ; template const wxTypeInfo* wxGetTypeInfo( T * ) ; template const wxTypeInfo* wxGetTypeInfo( wxSet * ) { - static wxEnumTypeInfo s_typeInfo(wxT_SET , wxGetEnumData((T) 0) ) ; return &s_typeInfo ; + static wxEnumTypeInfo s_typeInfo(wxT_SET , wxGetEnumData((T) 0) ) ; return &s_typeInfo ; } // this macro is for usage with custom, non-object derived classes and structs, wxPoint is such a custom type #define WX_CUSTOM_TYPE_INFO( e ) \ - 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 ) ; + 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, &wxToStringConverter , &wxFromStringConverter) ; return &s_typeInfo ; } // templated streaming, every type must have their specialization for these methods template -void wxStringReadValue( const wxString &s , T &data ) ; +void wxStringReadValue( const wxString &s , T &data ); template -void wxStringWriteValue( wxString &s , const T &data) ; - -// for simple types this default implementation is ok, composited structures will have to -// loop through their properties +void wxStringWriteValue( wxString &s , const T &data); template -void wxXmlReadValue( wxXmlNode *node , T &data ) -{ - wxStringReadValue( wxXmlGetContentFromNode( node ) , data ) ; -} +void wxToStringConverter( const wxxVariant &v, wxString &s) { wxStringWriteValue( s , v.Get() ) ; } template -void wxXmlWriteValue( wxXmlNode *node , const T &data) -{ - wxString s ; - wxStringWriteValue( s, data ) ; - wxXmlAddContentToNode( node ,s ) ; -} +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 ) \ +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 @@ -346,57 +384,35 @@ void wxXmlWriteValue( wxXmlNode *node , const T &data) class WXDLLIMPEXP_BASE wxxVariantData { public: - virtual ~wxxVariantData() {} - - // return a heap allocated duplicate - virtual wxxVariantData* Clone() const = 0 ; - - // 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 ; + virtual ~wxxVariantData() {} - // read the value from the xml node - virtual void Read( wxXmlNode* node ) = 0 ; + // return a heap allocated duplicate + virtual wxxVariantData* Clone() 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 ; + // returns the type info of the contentc + virtual const wxTypeInfo* GetTypeInfo() const = 0 ; } ; template class WXDLLIMPEXP_BASE wxxVariantDataT : public wxxVariantData { public: - wxxVariantDataT(T d) : m_data(d) {} + wxxVariantDataT(const T& d) : m_data(d) {} virtual ~wxxVariantDataT() {} - // get a copy of the stored data - T Get() const { return m_data; } - - // set the data - void Set(T d) { m_data = d; } - - // return a heap allocated duplicate - virtual wxxVariantData* Clone() const { return new wxxVariantDataT( Get() ) ; } + // get a ref to the stored data + T & Get() { return m_data; } - // returns the type info of the contentc - virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( (T*) NULL ) ; } + // get a const ref to the stored data + const T & Get() const { return m_data; } - // 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 ) ; } + // set the data + void Set(const T& d) { m_data = d; } - // read the value from a string - virtual void Read( const wxString &s) { wxStringReadValue( s , m_data ) ; } + // return a heap allocated duplicate + virtual wxxVariantData* Clone() const { return new wxxVariantDataT( Get() ) ; } + // returns the type info of the contentc + virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( (T*) NULL ) ; } private: T m_data; }; @@ -410,18 +426,33 @@ public : template wxxVariant( T data , const wxString& name = wxT("") ) : m_data(new wxxVariantDataT(data) ), m_name(name) {} + ~wxxVariant() { delete m_data ; } - // get a copy of the stored data - template T Get() const + // get a ref to the stored data + template T& Get() { wxxVariantDataT *dataptr = dynamic_cast*> (m_data) ; - assert( dataptr ) ; + wxASSERT_MSG( dataptr , "Cast not possible" ) ; return dataptr->Get() ; } + // get a ref to the stored data + template const T& Get() const + { + const wxxVariantDataT *dataptr = dynamic_cast*> (m_data) ; + wxASSERT_MSG( dataptr , "Cast not possible" ) ; + return dataptr->Get() ; + } + + template bool HasData() const + { + const wxxVariantDataT *dataptr = dynamic_cast*> (m_data) ; + return dataptr != NULL ; + } + // stores the data - template void Set(T data) const + template void Set(const T& data) const { delete m_data ; m_data = new wxxVariantDataT(data) ; @@ -435,37 +466,27 @@ public : } // gets the stored data casted to a wxObject* , returning NULL if cast is not possible - wxObject* GetAsObject() const ; - - // 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 ) ; } + wxObject* GetAsObject() ; - // 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 ) ; } + // get the typeinfo of the stored object + const wxTypeInfo* GetTypeInfo() const { return m_data->GetTypeInfo() ; } // 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 ; + wxxVariantData* m_data ; + wxString m_name ; } ; +#include + +WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE); + // ---------------------------------------------------------------------------- // Property Support // @@ -474,147 +495,221 @@ private : // want access, look at wxPropertyAccessor. // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_BASE wxPropertyAccessor +class wxSetter { public : - class SetByRef ; - class SetAndGetByRef ; - class GetByRef ; - virtual void SetProperty(wxObject *object, const wxxVariant &value) const = 0 ; - virtual wxxVariant GetProperty(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( wxXmlNode* node ) const = 0 ; - virtual void WriteValue( wxXmlNode* node , wxObject *o ) const = 0 ; - virtual wxxVariant ReadValue( const wxString &value ) const = 0 ; - virtual void WriteValue( wxString& value , wxObject *o ) const = 0 ; -protected : - const wxChar *m_setterName ; - const wxChar *m_getterName ; -}; - -template -void wxXmlReadValue( wxXmlNode *node , T &data ) ; - -template -void wxXmlWriteValue( wxXmlNode *node , const T &data) ; + 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 WXDLLIMPEXP_BASE wxPropertyAccessorT : public wxPropertyAccessor +class wxGetter { -public: - - typedef void (Klass::*setter_t)(T value); - typedef void (Klass::*setter_ref_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(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(NULL), m_setter_ref(NULL), m_getter(getter) ,m_getter_ref(NULL) {m_setterName = "";m_getterName=g ;} - - wxPropertyAccessorT(SetByRef*, 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(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) - : m_setter(NULL), m_setter_ref(setter), m_getter(NULL) , m_getter_ref(getter){m_setterName = s;m_getterName=g ;} +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 ; +} ; - // 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 ;} +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 ; +} ; - // 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 ;} +template void wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ; - wxPropertyAccessorT(GetByRef*, 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 ;} +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 ; +} ; - // 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 ; } - // return true if this accessor has a getter - bool HasGetter() const { return m_getter != NULL || m_getter_ref != NULL ; } +#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(object) ; \ + if ( variantValue.HasData() ) \ + obj->setterMethod(variantValue.Get()) ; \ + else \ + obj->setterMethod(*variantValue.Get()) ; \ + } \ + } ; + +#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(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(object) ; \ + if ( variantValue.HasData() ) \ + obj->addermethod(variantValue.Get()) ; \ + else \ + obj->addermethod(*variantValue.Get()) ; \ + } \ + } ; + +#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(object) ; \ + wxCollectionToVariantArray( obj->gettermethod() , result ) ; \ + } \ + } ; - // set the property this accessor is responsible for in an object - void SetProperty(wxObject *o, const wxxVariant &v) const - { - Klass *obj = dynamic_cast(o); - T value = v.Get(); - if (m_setter) - (obj->*(m_setter))(value); - else - (obj->*(m_setter_ref))(value); - } +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 ; +}; - // gets the property this accessor is responsible for from an object - wxxVariant GetProperty(wxObject *o) const - { - return wxxVariant( (wxxVariantData* ) DoGetProperty( o ) ) ; - } + 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 ; +} ; - // write the property this accessor is responsible for from an object into - // a xml node - void WriteValue( wxXmlNode* node , wxObject *o ) const +class WXDLLIMPEXP_BASE wxPropertyInfo +{ +public : + 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) { - DoGetProperty( o )->Write( node ) ; + Insert(iter) ; } - // write the property this accessor is responsible for from an object into - // a string - void WriteValue( wxString& s , wxObject *o ) const + 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) { - DoGetProperty( o )->Write( s ) ; + Insert(iter) ; } - // 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 ) ; - } + // return the name of this property + const wxChar * GetName() const { return m_name ; } - // 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 ) ; - } + // return the element type info of this property (for collections, otherwise NULL) + const wxTypeInfo * GetCollectionElementTypeInfo() const { return m_collectionElementTypeInfo ; } -private : - wxxVariantDataT* DoGetProperty(wxObject *o) const - { - Klass *obj = dynamic_cast(o); - if ( m_getter ) - return new wxxVariantDataT( (obj->*(m_getter))() ) ; - else - return new wxxVariantDataT( (obj->*(m_getter_ref))() ) ; - } + // return the type info of this property + const wxTypeInfo * GetTypeInfo() const { return m_typeInfo ; } - setter_t m_setter; - setter_ref_t m_setter_ref; - getter_t m_getter; - getter_ref_t m_getter_ref ; -}; + // return the accessor for this property + wxPropertyAccessor* GetAccessor() const { return m_accessor ; } -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 ) - { + // returns NULL if this is the last property of this class + wxPropertyInfo* GetNext() const { return m_next ; } + + // 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 ; @@ -626,60 +721,73 @@ public : i->m_next = this ; } - } - // 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 type info of this property - const wxTypeInfo * GetTypeInfo() const { return m_typeInfo ; } - - // return the accessor for this property - wxPropertyAccessor* GetAccessor() const { return m_accessor ; } - - // returns NULL if this is the last property of this class - wxPropertyInfo* GetNext() const { return m_next ; } + } - // 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 : - const wxChar * m_name; - const wxChar * m_typeName ; - const wxTypeInfo* m_typeInfo ; - wxPropertyAccessor* m_accessor ; + 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 - // to be assigned by the designer to the property - // when the component is dropped on the container. - wxPropertyInfo* m_next ; + // string representation of the default value + // to be assigned by the designer to the property + // when the component is dropped on the container. + wxPropertyInfo* m_next ; }; #define WX_BEGIN_PROPERTIES_TABLE(theClass) \ - const wxPropertyInfo *theClass::GetPropertiesStatic() \ + wxPropertyInfo *theClass::GetPropertiesStatic() \ { \ typedef theClass class_t; \ - static wxPropertyInfo* first = NULL ; + static wxPropertyInfo* first = NULL ; #define WX_END_PROPERTIES_TABLE() \ - return first ; } + return first ; } -#define WX_PROPERTY( name , type , setter , getter ,defaultValue ) \ - static wxPropertyAccessorT _accessor##name( &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 _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( 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_READONLY_PROPERTY( name , type , getter ,defaultValue ) \ - static wxPropertyAccessorT _accessor##name( &getter , #getter ) ; \ - static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(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 _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 _accessor##name( &getter , #getter ) ; \ + static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ; +*/ + + #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 wxDelegateTypeInfo _typeInfo##name( eventType , CLASSINFO( eventClass ) ) ; \ + static wxPropertyInfo _propertyInfo##name( first , #name , &_typeInfo##name , NULL , wxxVariant() ) ; \ // ---------------------------------------------------------------------------- // Handler Info @@ -718,23 +826,23 @@ public : // returns NULL if this is the last handler of this class wxHandlerInfo* GetNext() const { return m_next ; } private : - wxObjectEventFunction m_eventFunction ; - const wxChar * m_name; - const wxClassInfo* m_eventClassInfo ; - wxHandlerInfo* m_next ; + wxObjectEventFunction m_eventFunction ; + const wxChar * m_name; + const wxClassInfo* m_eventClassInfo ; + wxHandlerInfo* m_next ; }; #define WX_HANDLER(name,eventClassType) \ - static wxHandlerInfo _handlerInfo##name( first , #name , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ; + 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 ; + static wxHandlerInfo* first = NULL ; #define WX_END_HANDLERS_TABLE() \ - return first ; } + return first ; } // ---------------------------------------------------------------------------- // Constructor Bridges @@ -770,16 +878,16 @@ struct wxConstructorBridge_Dummy : public wxConstructorBridge } ; #define WX_CONSTRUCTOR_0(klass) \ - wxConstructorBridge_0 constructor##klass ; \ - wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ - const wxChar *klass::sm_constructorProperties##klass[] = { NULL } ; \ - const int klass::sm_constructorPropertiesCount##klass = 0 ; + wxConstructorBridge_0 constructor##klass ; \ + wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ + const wxChar *klass::sm_constructorProperties##klass[] = { NULL } ; \ + const int klass::sm_constructorPropertiesCount##klass = 0 ; #define WX_CONSTRUCTOR_DUMMY(klass) \ - wxConstructorBridge_Dummy constructor##klass ; \ - wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ - const wxChar *klass::sm_constructorProperties##klass[] = { NULL } ; \ - const int klass::sm_constructorPropertiesCount##klass = 0 ; + wxConstructorBridge_Dummy constructor##klass ; \ + wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ + const wxChar *klass::sm_constructorProperties##klass[] = { NULL } ; \ + const int klass::sm_constructorPropertiesCount##klass = 0 ; // 1 param @@ -796,10 +904,10 @@ struct wxConstructorBridge_1 : public wxConstructorBridge }; #define WX_CONSTRUCTOR_1(klass,t0,v0) \ - wxConstructorBridge_1 constructor##klass ; \ - wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ - const wxChar *klass::sm_constructorProperties##klass[] = { #v0 } ; \ - const int klass::sm_constructorPropertiesCount##klass = 1 ; + wxConstructorBridge_1 constructor##klass ; \ + wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ + const wxChar *klass::sm_constructorProperties##klass[] = { #v0 } ; \ + const int klass::sm_constructorPropertiesCount##klass = 1 ; // 2 params @@ -818,10 +926,10 @@ struct wxConstructorBridge_2 : public wxConstructorBridge }; #define WX_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \ - wxConstructorBridge_2 constructor##klass ; \ - wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ - const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 } ; \ - const int klass::sm_constructorPropertiesCount##klass = 2; + wxConstructorBridge_2 constructor##klass ; \ + wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ + const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 } ; \ + const int klass::sm_constructorPropertiesCount##klass = 2; // 3 params @@ -841,10 +949,10 @@ struct wxConstructorBridge_3 : public wxConstructorBridge }; #define WX_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \ - wxConstructorBridge_3 constructor##klass ; \ - wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ - const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 } ; \ - const int klass::sm_constructorPropertiesCount##klass = 3 ; + wxConstructorBridge_3 constructor##klass ; \ + wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ + const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 } ; \ + const int klass::sm_constructorPropertiesCount##klass = 3 ; // 4 params @@ -865,10 +973,10 @@ struct wxConstructorBridge_4 : public wxConstructorBridge }; #define WX_CONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \ - wxConstructorBridge_4 constructor##klass ; \ - wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ - const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 } ; \ - const int klass::sm_constructorPropertiesCount##klass = 4 ; + wxConstructorBridge_4 constructor##klass ; \ + wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ + const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 } ; \ + const int klass::sm_constructorPropertiesCount##klass = 4 ; // 5 params @@ -895,41 +1003,136 @@ struct wxConstructorBridge_5 : public wxConstructorBridge const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 } ; \ const int klass::sm_constructorPropertiesCount##klass = 5; +// 6 params + +template +struct wxConstructorBridge_6 : public wxConstructorBridge +{ + void Create(wxObject *o, wxxVariant *args) + { + Class *obj = dynamic_cast(o); + obj->Create( + args[0].Get() , + args[1].Get() , + args[2].Get() , + args[3].Get() , + args[4].Get() , + args[5].Get() + ); + } +}; + +#define WX_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \ + wxConstructorBridge_6 constructor##klass ; \ + wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ + const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 , #v5 } ; \ + const int klass::sm_constructorPropertiesCount##klass = 6; + +// 7 params + +template +struct wxConstructorBridge_7 : public wxConstructorBridge +{ + void Create(wxObject *o, wxxVariant *args) + { + Class *obj = dynamic_cast(o); + obj->Create( + args[0].Get() , + args[1].Get() , + args[2].Get() , + args[3].Get() , + args[4].Get() , + args[5].Get() , + args[6].Get() + ); + } +}; + +#define WX_CONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \ + wxConstructorBridge_7 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 +struct wxConstructorBridge_8 : public wxConstructorBridge +{ + void Create(wxObject *o, wxxVariant *args) + { + Class *obj = dynamic_cast(o); + obj->Create( + args[0].Get() , + args[1].Get() , + args[2].Get() , + args[3].Get() , + args[4].Get() , + args[5].Get() , + args[6].Get() , + args[7].Get() + ); + } +}; + +#define WX_CONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \ + wxConstructorBridge_8 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 // ---------------------------------------------------------------------------- typedef wxObject *(*wxObjectConstructorFn)(void); -typedef wxObject* (*wxVariantToObjectConverter)( const wxxVariant &data ) ; +typedef wxObject* (*wxVariantToObjectConverter)( wxxVariant &data ) ; typedef wxxVariant (*wxObjectToVariantConverter)( wxObject* ) ; class WXDLLIMPEXP_BASE wxClassInfo { public: wxClassInfo(const wxClassInfo **_Parents, - const wxChar *_UnitName, - const wxChar *_ClassName, + const wxChar *_UnitName, + 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 , - wxVariantToObjectConverter _Converter1 , - wxObjectToVariantConverter _Converter2 + wxVariantToObjectConverter _PtrConverter1 , + wxVariantToObjectConverter _Converter2 , + wxObjectToVariantConverter _Converter3 ) : m_parents(_Parents) , m_unitName(_UnitName) ,m_className(_ClassName), m_objectSize(size), m_objectConstructor(ctor) , m_firstProperty(_Props ) , m_firstHandler(_Handlers ) , m_constructor( _Constructor ) , m_constructorProperties(_ConstructorProperties) , m_constructorPropertiesCount(_ConstructorPropertiesCount), - m_variantToObjectConverter( _Converter1 ) , m_objectToVariantConverter( _Converter2 ) , m_next(sm_first) + m_variantOfPtrToObjectConverter( _PtrConverter1 ) , m_variantToObjectConverter( _Converter2 ) , m_objectToVariantConverter( _Converter3 ) , m_next(sm_first) { sm_first = this; - Register( m_className , this ) ; + Register() ; } - ~wxClassInfo() ; + 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() { 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; } @@ -945,63 +1148,77 @@ public: bool IsKindOf(const wxClassInfo *info) const { - if ( info != 0 ) - { - if ( info == this ) - return true ; - - for ( int i = 0 ; m_parents[i] ; ++ i ) - { - if ( m_parents[i]->IsKindOf( info ) ) - return true ; - } - } - return false ; + if ( info != 0 ) + { + if ( info == this ) + return true ; + + for ( int i = 0 ; m_parents[i] ; ++ i ) + { + if ( m_parents[i]->IsKindOf( info ) ) + return true ; + } + } + 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. + wxDEPRECATED( static void CleanUpClasses() ); +#endif + static void CleanUp(); - static void CleanUpClasses(); - - // returns the first property - const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; } + // returns the first property + const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; } - // returns the first handler - const wxHandlerInfo* GetFirstHandler() const { return m_firstHandler ; } + // returns the first handler + const wxHandlerInfo* GetFirstHandler() const { return m_firstHandler ; } - // Call the Create method for a class - virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params) + // 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( ParamCount == m_constructorPropertiesCount ) ; + wxASSERT_MSG( ParamCount == m_constructorPropertiesCount , wxT("Illegal Parameter Count for Create Method")) ; m_constructor->Create( object , Params ) ; } - // get number of parameters for constructor - virtual int GetCreateParamCount() const { return m_constructorPropertiesCount; } + // 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 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 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 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( const wxxVariant &data ) const { return m_variantToObjectConverter( data ) ; } + wxObject* VariantToInstance( wxxVariant &data ) const + { if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT ) + return m_variantToObjectConverter( data ) ; + else + return m_variantOfPtrToObjectConverter( data ) ; + } + wxxVariant InstanceToVariant( wxObject *object ) const { return m_objectToVariantConverter( object ) ; } - // find property by name + // find property by name virtual const wxPropertyInfo *FindPropertyInfo (const wxChar *PropertyName) const ; - // find handler by name + // 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; @@ -1013,37 +1230,73 @@ public: static wxClassInfo *sm_first; wxClassInfo *m_next; - // FIXME: this should be private (currently used directly by way too + // FIXME: this should be private (currently used directly by way too // 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 ; const wxChar ** m_constructorProperties ; const int m_constructorPropertiesCount ; + wxVariantToObjectConverter m_variantOfPtrToObjectConverter ; wxVariantToObjectConverter m_variantToObjectConverter ; wxObjectToVariantConverter m_objectToVariantConverter ; - const wxPropertyAccessor *FindAccessor (const wxChar *propertyName); + const wxPropertyAccessor *FindAccessor (const wxChar *propertyName) const ; - // registers the class - static void Register(const wxChar *name, wxClassInfo *info); - static void Unregister(const wxChar *name); + // InitializeClasses() helper + static wxClassInfo *GetBaseByName(const wxChar *name) ; - // InitializeClasses() helper - static wxClassInfo *GetBaseByName(const wxChar *name); +protected: + // registers the class + void Register(); + void Unregister(); 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 // ---------------------------------------------------------------------------- @@ -1052,16 +1305,16 @@ 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; } #define DECLARE_DYNAMIC_CLASS(name) \ - _DECLARE_DYNAMIC_CLASS(name) \ - static wxConstructorBridge* sm_constructor##name ; \ - static const wxChar * sm_constructorProperties##name[] ; \ - static const int sm_constructorPropertiesCount##name ; +static wxConstructorBridge* sm_constructor##name ; \ +static const wxChar * sm_constructorProperties##name[] ; \ +static const int sm_constructorPropertiesCount##name ; \ + _DECLARE_DYNAMIC_CLASS(name) #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name) \ DECLARE_NO_ASSIGN_CLASS(name) \ @@ -1084,26 +1337,63 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); wxObject* wxConstructorFor##name() \ { return new name; } \ const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,NULL } ; \ - wxObject* wxVariantToObjectConverter##name ( const wxxVariant &data ) { return data.Get() ; } \ - wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ + wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get() ; } \ +wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ wxClassInfo name::sm_class##name(sm_classParents##name , wxT(unit) , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) wxConstructorFor##name , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name , \ - name::sm_constructorPropertiesCount##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name); \ - template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\ - template<> void wxStringWriteValue(wxString & , name* const & ){assert(0) ;}\ - template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; } + name::sm_constructorPropertiesCount##name , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name); \ + template<> void wxStringReadValue(const wxString & , name & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") ) ;}\ + template<> void wxStringWriteValue(wxString & , name const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringReadValue(const wxString & , name * & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") ) ;}\ + template<> void wxStringWriteValue(wxString & , name* const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringReadValue(const wxString & , name ** & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringWriteValue(wxString & , name** const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> const wxTypeInfo* wxGetTypeInfo( name *** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; wxASSERT_MSG(0 , wxT("illegal specialization called") ) ; return &s_typeInfo ; } \ + template<> const wxTypeInfo* wxGetTypeInfo( name * ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &name::sm_class##name) ; return &s_typeInfo ; } \ + template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &name::sm_class##name) ; return &s_typeInfo ; } + +#define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit) \ + wxObject* wxConstructorFor##name() \ + { return new name; } \ + const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,NULL } ; \ + wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return &data.Get() ; } \ + wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get() ; } \ +wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ + wxClassInfo name::sm_class##name(sm_classParents##name , wxT(unit) , wxT(#name), \ + (int) sizeof(name), \ + (wxObjectConstructorFn) wxConstructorFor##name , \ + name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name , \ + name::sm_constructorPropertiesCount##name , wxVariantOfPtrToObjectConverter##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name); \ + template<> void wxStringReadValue(const wxString & , name & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") ) ;}\ + template<> void wxStringWriteValue(wxString & , name const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringReadValue(const wxString & , name * & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") ) ;}\ + template<> void wxStringWriteValue(wxString & , name* const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringReadValue(const wxString & , name ** & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringWriteValue(wxString & , name** const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> const wxTypeInfo* wxGetTypeInfo( name *** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; wxASSERT_MSG(0 , wxT("illegal specialization called") ) ; return &s_typeInfo ; } \ + template<> const wxTypeInfo* wxGetTypeInfo( name * ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &name::sm_class##name) ; return &s_typeInfo ; } \ + template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &name::sm_class##name) ; return &s_typeInfo ; } + +#define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename ) \ +_IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , "" ) \ +const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \ +const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ +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 ) \ _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit ) +#define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name , basename , unit ) \ +_IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit ) + // this is for classes that do not derive from wxobject, there are no creators for these #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name , unit ) \ @@ -1111,11 +1401,15 @@ _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit ) wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) 0 , \ - name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ - 0 , 0 , 0 ); \ - template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\ - template<> void wxStringWriteValue(wxString & , name* const & ){assert(0) ;}\ - template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; } + name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ + 0 , 0 , 0 ); \ + template<> void wxStringReadValue(const wxString & , name * & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringWriteValue(wxString & , name* const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringReadValue(const wxString & , name ** & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringWriteValue(wxString & , name** const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> const wxTypeInfo* wxGetTypeInfo( name *** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; wxASSERT_MSG(0 , wxT("illegal specialization called") ) ; return &s_typeInfo ; } \ + template<> const wxTypeInfo* wxGetTypeInfo( name * ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &name::sm_class##name) ; return &s_typeInfo ; } \ + template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &name::sm_class##name) ; return &s_typeInfo ; } // this is for subclasses that still do not derive from wxobject @@ -1124,11 +1418,16 @@ _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit ) wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) 0 , \ - name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ - 0 , 0 , 0 ); \ - template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\ - template<> void wxStringWriteValue(wxString & , name* const & ){assert(0) ;}\ - template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; } + name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ + 0 , 0 , 0 ); \ + template<> void wxStringReadValue(const wxString & , name * & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringWriteValue(wxString & , name* const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringReadValue(const wxString & , name ** & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringWriteValue(wxString & , name** const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> const wxTypeInfo* wxGetTypeInfo( name *** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; wxASSERT_MSG(0 , wxT("illegal specialization called") ) ; return &s_typeInfo ; } \ + template<> const wxTypeInfo* wxGetTypeInfo( name * ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &name::sm_class##name) ; return &s_typeInfo ; } \ + template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &name::sm_class##name) ; return &s_typeInfo ; } + // Multiple inheritance with two base classes @@ -1136,25 +1435,29 @@ _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit ) wxObject* wxConstructorFor##name() \ { return new name; } \ const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,&basename2::sm_class##basename2 , NULL } ; \ - wxObject* wxVariantToObjectConverter##name ( const wxxVariant &data ) { return data.Get() ; } \ + wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.Get() ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ wxClassInfo name::sm_class##name(sm_classParents##name , wxT(unit) , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) wxConstructorFor##name , \ - name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name , \ - name::sm_constructorPropertiesCount##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name); \ - template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\ - template<> void wxStringWriteValue(wxString & , name* const & ){assert(0) ;}\ - template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; } + name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name , \ + name::sm_constructorPropertiesCount##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name); \ + template<> void wxStringReadValue(const wxString & , name * & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringWriteValue(wxString & , name* const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringReadValue(const wxString & , name ** & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringWriteValue(wxString & , name** const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> const wxTypeInfo* wxGetTypeInfo( name *** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; wxASSERT_MSG(0 , wxT("illegal specialization called") ) ; return &s_typeInfo ; } \ + template<> const wxTypeInfo* wxGetTypeInfo( name * ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &name::sm_class##name) ; return &s_typeInfo ; } \ + template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &name::sm_class##name) ; return &s_typeInfo ; } #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) \ - _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , unit) + _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , unit) // ----------------------------------- // for abstract classes @@ -1164,21 +1467,26 @@ WX_CONSTRUCTOR_DUMMY( name ) #define _IMPLEMENT_ABSTRACT_CLASS(name, basename) \ const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,NULL } ; \ - wxObject* wxVariantToObjectConverter##name ( const wxxVariant &data ) { return data.Get() ; } \ - wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ + wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.Get() ; } \ + wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get() ; } \ +wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ - 0 , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name); \ - template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\ - template<> void wxStringWriteValue(wxString & , name* const & ){assert(0) ;}\ - template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; } + 0 , wxVariantOfPtrToObjectConverter##name ,wxVariantToObjectConverter##name , wxObjectToVariantConverter##name); \ + template<> void wxStringReadValue(const wxString & , name * & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringWriteValue(wxString & , name* const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringReadValue(const wxString & , name ** & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> void wxStringWriteValue(wxString & , name** const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\ + template<> const wxTypeInfo* wxGetTypeInfo( name * ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &name::sm_class##name) ; return &s_typeInfo ; } \ + template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &name::sm_class##name) ; return &s_typeInfo ; } \ + template<> const wxTypeInfo* wxGetTypeInfo( name *** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID) ; assert(0) ; return &s_typeInfo ; } #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 @@ -1190,4 +1498,27 @@ const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NUL #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2 -#endif \ No newline at end of file +// -------------------------------------------------------------------------- +// Collection Support +// -------------------------------------------------------------------------- + +template 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 void wxArrayCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value ) +{ + for( int i = 0 ; i < coll.GetCount() ; i++ ) + { + value.Add( new wxxVariant(coll[i]) ) ; + } +} + + +#endif