X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c8046dded47cbd3e9b9c83051ba0530ac3b9491..385facb748115a072d1361d8aec6b88273b1d7a1:/include/wx/xti.h?ds=sidebyside diff --git a/include/wx/xti.h b/include/wx/xti.h index 0477ea5f64..8692028a65 100644 --- a/include/wx/xti.h +++ b/include/wx/xti.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/xti.h +// Name: wx/xti.hG // Purpose: runtime metadata information (extended class info) // Author: Stefan Csomor // Modified by: @@ -43,8 +43,35 @@ #include "wx/arrstr.h" #include "wx/hashmap.h" +#include + +// we will move this later to defs.h + +#if !wxCHECK_GCC_VERSION( 3 , 4 ) +# define wxUSE_MEMBER_TEMPLATES 0 +#endif + +#ifdef _MSC_VER +# if _MSC_VER <= 1200 +# define wxUSE_MEMBER_TEMPLATES 0 +# endif +#endif + +#ifndef wxUSE_MEMBER_TEMPLATES +#define wxUSE_MEMBER_TEMPLATES 1 +#endif + +#if wxUSE_MEMBER_TEMPLATES +#define WX_TEMPLATED_MEMBER_CALL( method , type ) method() +#define WX_TEMPLATED_MEMBER_FIX( type ) +#else +#define WX_TEMPLATED_MEMBER_CALL( method , type ) method((type*)NULL) +#define WX_TEMPLATED_MEMBER_FIX( type ) type* =NULL +#endif + class WXDLLIMPEXP_BASE wxObject; class WXDLLIMPEXP_BASE wxClassInfo; +class WXDLLIMPEXP_BASE wxDynamicClassInfo; class WXDLLIMPEXP_BASE wxHashTable; class WXDLLIMPEXP_BASE wxObjectRefData; class WXDLLIMPEXP_BASE wxEvent; @@ -110,26 +137,17 @@ private : #define WX_END_ENUM( e ) { NULL , 0 } } ; \ wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \ wxEnumData *wxGetEnumData(e) { return &s_enumData##e ; } \ - template<> void wxStringReadValue(const wxString& s , e &data ) \ + template<> void wxStringReadValue(const wxString& s , e &data ) \ { \ data = (e) s_enumData##e.GetEnumMemberValue(s) ; \ } \ - template<> void wxStringWriteValue(wxString &s , const e &data ) \ + template<> void wxStringWriteValue(wxString &s , const e &data ) \ { \ s = s_enumData##e.GetEnumMemberName((int)data) ; \ } \ void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant((e)data) ;} \ void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.Get() ;} \ - template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxEnumTypeInfo s_typeInfo(wxT_ENUM , &s_enumData##e , &wxToStringConverter , &wxFromStringConverter , &ToLong##e , &FromLong##e , #e) ; return &s_typeInfo ; } \ - template<> const wxTypeInfo* wxGetTypeInfo( e ** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; assert(0) ; return &s_typeInfo ; } \ - template<> void wxStringReadValue(const wxString& , e* & ) \ -{ \ - assert(0) ; \ -} \ - template<> void wxStringWriteValue(wxString &s , e* const & ) \ -{ \ - assert(0) ; \ -} + wxEnumTypeInfo s_typeInfo##e(wxT_ENUM , &s_enumData##e , &wxToStringConverter , &wxFromStringConverter , &ToLong##e , &FromLong##e , typeid(e).name() ) ; // ---------------------------------------------------------------------------- // Set Support @@ -143,7 +161,7 @@ private : // Strawberry, // }; // -// typedef wxFlags wxCoupe ; +// typedef wxBitset wxCoupe ; // // in the implementation file : // @@ -164,7 +182,7 @@ private : void wxSetStringToArray( const wxString &s , wxArrayString &array ) ; template -void wxSetFromString(const wxString &s , wxFlags &data ) +void wxSetFromString(const wxString &s , wxBitset &data ) { wxEnumData* edata = wxGetEnumData((e) 0) ; data.reset() ; @@ -184,7 +202,7 @@ void wxSetFromString(const wxString &s , wxFlags &data ) } template -void wxSetToString( wxString &s , const wxFlags &data ) +void wxSetToString( wxString &s , const wxBitset &data ) { wxEnumData* edata = wxGetEnumData((e) 0) ; int count = edata->GetEnumCount() ; @@ -203,26 +221,83 @@ void wxSetToString( wxString &s , const wxFlags &data ) } } -// if the wxFlags 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 ; } - #define WX_IMPLEMENT_SET_STREAMING(SetName,e) \ - template<> void wxStringReadValue(const wxString &s , wxFlags &data ) \ + template<> void wxStringReadValue(const wxString &s , wxBitset &data ) \ { \ wxSetFromString( s , data ) ; \ } \ - template<> void wxStringWriteValue( wxString &s , const wxFlags &data ) \ + template<> void wxStringWriteValue( wxString &s , const wxBitset &data ) \ { \ wxSetToString( s , data ) ; \ } \ void FromLong##SetName( long data , wxxVariant& result ) { result = wxxVariant(SetName((unsigned long)data)) ;} \ void ToLong##SetName( const wxxVariant& data , long &result ) { result = (long) data.Get().to_ulong() ;} \ -template<> const wxTypeInfo* wxGetTypeInfo( SetName * ) \ -{ \ - static wxEnumTypeInfo s_typeInfo(wxT_SET , &s_enumData##e , &wxToStringConverter , &wxFromStringConverter , &ToLong##SetName , &FromLong##SetName, #SetName ) ; return &s_typeInfo ; \ -} + wxEnumTypeInfo s_typeInfo##SetName(wxT_SET , &s_enumData##e , &wxToStringConverter , &wxFromStringConverter , &ToLong##SetName , &FromLong##SetName, typeid(SetName).name() ) ; \ +} + +template +void wxFlagsFromString(const wxString &s , e &data ) +{ + wxEnumData* edata = wxGetEnumData((e*) 0) ; + data.m_data = 0 ; + + wxArrayString array ; + wxSetStringToArray( s , array ) ; + wxString flag; + for ( size_t i = 0 ; i < array.Count() ; ++i ) + { + flag = array[i] ; + int ivalue ; + if ( edata->HasEnumMemberValue( flag , &ivalue ) ) + { + data.m_data |= ivalue ; + } + } +} + +template +void wxFlagsToString( wxString &s , const e& data ) +{ + wxEnumData* edata = wxGetEnumData((e*) 0) ; + int count = edata->GetEnumCount() ; + int i ; + s.Clear() ; + long dataValue = data.m_data ; + for ( i = 0 ; i < count ; i++ ) + { + int value = edata->GetEnumMemberValueByIndex(i) ; + // make this to allow for multi-bit constants to work + if ( value && ( dataValue & value ) == value ) + { + // clear the flags we just set + dataValue &= ~value ; + // this could also be done by the templated calls + if ( !s.IsEmpty() ) + s +="|" ; + s += edata->GetEnumMemberNameByIndex(i) ; + } + } +} +#define WX_BEGIN_FLAGS( e ) \ + wxEnumMemberData s_enumDataMembers##e[] = { + +#define WX_FLAGS_MEMBER( v ) { #v, v } , +#define WX_END_FLAGS( e ) { NULL , 0 } } ; \ + wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \ + wxEnumData *wxGetEnumData(e*) { return &s_enumData##e ; } \ + template<> void wxStringReadValue(const wxString &s , e &data ) \ +{ \ + wxFlagsFromString( s , data ) ; \ +} \ + template<> void wxStringWriteValue( wxString &s , const e& data ) \ +{ \ + wxFlagsToString( s , data ) ; \ +} \ + void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant(e(data)) ;} \ + void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.Get().m_data ;} \ + wxEnumTypeInfo s_typeInfo##e(wxT_SET , &s_enumData##e , &wxToStringConverter , &wxFromStringConverter , &ToLong##e , &FromLong##e, typeid(e).name() ) ; // ---------------------------------------------------------------------------- // Type Information // ---------------------------------------------------------------------------- @@ -247,7 +322,7 @@ enum wxTypeKind wxT_FLOAT, wxT_DOUBLE, wxT_STRING, // must be wxString - wxT_SET, // must be wxFlags<> template + wxT_SET, // must be wxBitset<> template wxT_ENUM, wxT_CUSTOM, // user defined type (e.g. wxPoint) @@ -262,56 +337,58 @@ enum wxTypeKind wxT_LAST_TYPE_KIND = wxT_DELEGATE // sentinel for bad data, asserts, debugging }; -class wxxVariant ; -class wxTypeInfo ; +class WXDLLIMPEXP_BASE wxxVariant ; +class WXDLLIMPEXP_BASE wxTypeInfo ; -WX_DECLARE_EXPORTED_STRING_HASH_MAP( wxTypeInfo* , wxTypeInfoMap ) ; +WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxTypeInfo* , wxTypeInfoMap , class WXDLLIMPEXP_BASE ) ; class WXDLLIMPEXP_BASE wxTypeInfo { public : - typedef void (*converterToString_t)( const wxxVariant& data , wxString &result ) ; - typedef void (*converterFromString_t)( const wxString& data , wxxVariant &result ) ; + typedef void (*converterToString_t)( const wxxVariant& data , wxString &result ) ; + typedef void (*converterFromString_t)( const wxString& data , wxxVariant &result ) ; - wxTypeInfo(wxTypeKind kind , converterToString_t to = NULL , converterFromString_t from= NULL, const wxString &name = wxEmptyString ) : - m_kind( kind) , m_toString(to) , m_fromString(from) , m_name(name) - { - Register() ; - } + wxTypeInfo(wxTypeKind kind, + converterToString_t to = NULL, converterFromString_t from = NULL, + const wxString &name = wxEmptyString): + m_toString(to), m_fromString(from), m_kind(kind), m_name(name) + { + Register(); + } - virtual ~wxTypeInfo() - { - Unregister() ; - } + virtual ~wxTypeInfo() + { + Unregister() ; + } - // return the kind of this type (wxT_... constants) - wxTypeKind GetKind() const { return m_kind ; } + // return the kind of this type (wxT_... constants) + wxTypeKind GetKind() const { return m_kind ; } - // returns the unique name of this type - const wxString& GetTypeName() const { return m_name ; } + // returns the unique name of this type + const wxString& GetTypeName() const { return m_name ; } - // is this type a delegate type - bool IsDelegateType() const { return m_kind == wxT_DELEGATE ; } + // is this type a delegate type + bool IsDelegateType() const { return m_kind == wxT_DELEGATE ; } - // is this type a custom type - bool IsCustomType() const { return m_kind == wxT_CUSTOM ; } + // is this type a custom type + bool IsCustomType() const { return m_kind == wxT_CUSTOM ; } - // is this type an object type - bool IsObjectType() const { return m_kind == wxT_OBJECT || m_kind == wxT_OBJECT_PTR ; } + // is this type an object type + bool IsObjectType() const { return m_kind == wxT_OBJECT || m_kind == wxT_OBJECT_PTR ; } - // can the content of this type be converted to and from strings ? - bool HasStringConverters() const { return m_toString != NULL && m_fromString != NULL ; } + // can the content of this type be converted to and from strings ? + bool HasStringConverters() const { return m_toString != NULL && m_fromString != NULL ; } - // convert a wxxVariant holding data of this type into a string - void ConvertToString( const wxxVariant& data , wxString &result ) const + // convert a wxxVariant holding data of this type into a string + void ConvertToString( const wxxVariant& data , wxString &result ) const - { wxASSERT_MSG( m_toString , wxT("String conversions not supported") ) ; (*m_toString)( data , result ) ; } + { wxASSERT_MSG( m_toString , wxT("String conversions not supported") ) ; (*m_toString)( data , result ) ; } - // convert a string into a wxxVariant holding the corresponding data in this type - void ConvertFromString( const wxString& data , wxxVariant &result ) const - { wxASSERT_MSG( m_fromString , wxT("String conversions not supported") ) ; (*m_fromString)( data , result ) ; } + // convert a string into a wxxVariant holding the corresponding data in this type + void ConvertFromString( const wxString& data , wxxVariant &result ) const + { wxASSERT_MSG( m_fromString , wxT("String conversions not supported") ) ; (*m_fromString)( data , result ) ; } - static wxTypeInfo *FindType(const wxChar *typeName); + static wxTypeInfo *FindType(const wxChar *typeName); private : @@ -323,8 +400,8 @@ private : static wxTypeInfoMap* sm_typeTable ; - wxTypeKind m_kind ; - wxString m_name ; + wxTypeKind m_kind; + wxString m_name; }; class WXDLLIMPEXP_BASE wxBuiltInTypeInfo : public wxTypeInfo @@ -349,20 +426,20 @@ public : typedef void (*converterToLong_t)( const wxxVariant& data , long &result ) ; typedef void (*converterFromLong_t)( long data , wxxVariant &result ) ; - wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo , converterToString_t to , converterFromString_t from , + wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo , converterToString_t to , converterFromString_t from , converterToLong_t toLong , converterFromLong_t fromLong , const wxString &name ) : - wxTypeInfo( kind , to , from , name ) , m_toLong( toLong ) , m_fromLong( fromLong ) - { wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET , wxT("Illegal Kind for Enum Type")) ; m_enumInfo = enumInfo ;} - const wxEnumData* GetEnumData() const { return m_enumInfo ; } + wxTypeInfo( kind , to , from , name ) , m_toLong( toLong ) , m_fromLong( fromLong ) + { wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET , wxT("Illegal Kind for Enum Type")) ; m_enumInfo = enumInfo ;} + const wxEnumData* GetEnumData() const { return m_enumInfo ; } - // convert a wxxVariant holding data of this type into a long - void ConvertToLong( const wxxVariant& data , long &result ) const + // convert a wxxVariant holding data of this type into a long + void ConvertToLong( const wxxVariant& data , long &result ) const - { wxASSERT_MSG( m_toLong , wxT("Long conversions not supported") ) ; (*m_toLong)( data , result ) ; } + { wxASSERT_MSG( m_toLong , wxT("Long conversions not supported") ) ; (*m_toLong)( data , result ) ; } - // convert a long into a wxxVariant holding the corresponding data in this type - void ConvertFromLong( long data , wxxVariant &result ) const - { wxASSERT_MSG( m_fromLong , wxT("Long conversions not supported") ) ; (*m_fromLong)( data , result ) ; } + // convert a long into a wxxVariant holding the corresponding data in this type + void ConvertFromLong( long data , wxxVariant &result ) const + { wxASSERT_MSG( m_fromLong , wxT("Long conversions not supported") ) ; (*m_fromLong)( data , result ) ; } private : converterToLong_t m_toLong ; @@ -374,8 +451,8 @@ private : class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo { public : - wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to = NULL , converterFromString_t from = NULL ) ; - const wxClassInfo *GetClassInfo() const { return m_classInfo ; } + wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to = NULL , converterFromString_t from = NULL , const wxString &name = wxEmptyString) ; + const wxClassInfo *GetClassInfo() const { return m_classInfo ; } private : wxClassInfo *m_classInfo; // Kind == wxT_OBJECT - could be NULL } ; @@ -404,43 +481,25 @@ private : int m_eventType ; } ; -template const wxTypeInfo* wxGetTypeInfo( T * ) ; +template const wxTypeInfo* wxGetTypeInfo( T * ) { return wxTypeInfo::FindType(typeid(T).name()) ; } // 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 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 ; } +#define WX_CUSTOM_TYPE_INFO( e , toString , fromString ) \ + wxCustomTypeInfo s_typeInfo##e(typeid(e).name() , &toString , &fromString) ; #define WX_COLLECTION_TYPE_INFO( element , collection ) \ -template<> const wxTypeInfo* wxGetTypeInfo( collection * ) \ -{ \ - static wxCollectionTypeInfo s_typeInfo( (wxTypeInfo*) wxGetTypeInfo( (element *) NULL) , NULL , NULL , #collection ) ; \ - return &s_typeInfo ; \ -} \ - - -// templated streaming, every type must have their specialization for these methods - -template -void wxStringReadValue( const wxString &s , T &data ); - -template -void wxStringWriteValue( wxString &s , const T &data); - -template -void wxToStringConverter( const wxxVariant &v, wxString &s) { wxStringWriteValue( s , v.Get() ) ; } - -template -void wxFromStringConverter( const wxString &s, wxxVariant &v) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; } \ + wxCollectionTypeInfo s_typeInfo##collection( (wxTypeInfo*) wxGetTypeInfo( (element *) NULL) , NULL , NULL , typeid(collection).name() ) ; // 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) ; \ +#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) ; } + template<> void wxStringReadValue(const wxString & , a & ) { assert(0) ; }\ + template<> void wxStringWriteValue(wxString & , a const & ) { assert(0) ; } +*/ // ---------------------------------------------------------------------------- // wxxVariant as typesafe data holder @@ -458,7 +517,7 @@ public: virtual const wxTypeInfo* GetTypeInfo() const = 0 ; } ; -template class WXDLLIMPEXP_BASE wxxVariantDataT : public wxxVariantData +template class wxxVariantDataT : public wxxVariantData { public: wxxVariantDataT(const T& d) : m_data(d) {} @@ -495,18 +554,18 @@ public : ~wxxVariant() { delete m_data ; } // get a ref to the stored data - template T& Get() + template T& Get(WX_TEMPLATED_MEMBER_FIX(T)) { wxxVariantDataT *dataptr = dynamic_cast*> (m_data) ; - wxASSERT_MSG( dataptr , "Cast not possible" ) ; + wxASSERT_MSG( dataptr , wxT("Cast not possible") ) ; return dataptr->Get() ; } // get a ref to the stored data - template const T& Get() const + template const T& Get(WX_TEMPLATED_MEMBER_FIX(T)) const { const wxxVariantDataT *dataptr = dynamic_cast*> (m_data) ; - wxASSERT_MSG( dataptr , "Cast not possible" ) ; + wxASSERT_MSG( dataptr , wxT("Cast not possible") ) ; return dataptr->Get() ; } @@ -553,6 +612,20 @@ private : WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE); +// templated streaming, every type must have their specialization for these methods + +template +void wxStringReadValue( const wxString &s , T &data ); + +template +void wxStringWriteValue( wxString &s , const T &data); + +template +void wxToStringConverter( const wxxVariant &v, wxString &s) { wxStringWriteValue( s , v.WX_TEMPLATED_MEMBER_CALL(Get , T) ) ; } + +template +void wxFromStringConverter( const wxString &s, wxxVariant &v) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; } \ + // ---------------------------------------------------------------------------- // Property Support // @@ -561,30 +634,33 @@ WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BAS // want access, look at wxPropertyAccessor. // ---------------------------------------------------------------------------- -class wxSetter +class WXDLLIMPEXP_BASE wxSetter { -public : +public: wxSetter( const wxString name ) { m_name = name ; } + virtual ~wxSetter() {} virtual void Set( wxObject *object, const wxxVariant &variantValue ) const = 0; const wxString& GetName() const { return m_name ; } -private : - wxString m_name ; -} ; +private: + wxString m_name; +}; -class wxGetter +class WXDLLIMPEXP_BASE wxGetter { -public : +public: wxGetter( const wxString name ) { m_name = name ; } + virtual ~wxGetter() {} virtual void Get( const wxObject *object , wxxVariant& result) const = 0; const wxString& GetName() const { return m_name ; } -private : - wxString m_name ; -} ; +private: + wxString m_name; +}; -class wxCollectionGetter +class WXDLLIMPEXP_BASE wxCollectionGetter { public : wxCollectionGetter( const wxString name ) { m_name = name ; } + virtual ~wxCollectionGetter() {} virtual void Get( const wxObject *object , wxxVariantArray& result) const = 0; const wxString& GetName() const { return m_name ; } private : @@ -593,10 +669,11 @@ private : template void wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ; -class wxAdder +class WXDLLIMPEXP_BASE wxAdder { public : wxAdder( const wxString name ) { m_name = name ; } + virtual ~wxAdder() {} virtual void Add( wxObject *object, const wxxVariant &variantValue ) const= 0; const wxString& GetName() const { return m_name ; } private : @@ -610,6 +687,7 @@ class wxSetter##property : public wxSetter \ { \ public: \ wxSetter##property() : wxSetter( #setterMethod ) {} \ + ~wxSetter##property() {} \ void Set( wxObject *object, const wxxVariant &variantValue ) const \ { \ Klass *obj = dynamic_cast(object) ; \ @@ -625,6 +703,7 @@ class wxGetter##property : public wxGetter \ { \ public : \ wxGetter##property() : wxGetter( #gettermethod ) {} \ + ~wxGetter##property() {} \ void Get( const wxObject *object , wxxVariant &result) const \ { \ const Klass *obj = dynamic_cast(object) ; \ @@ -637,6 +716,7 @@ class wxAdder##property : public wxAdder \ { \ public: \ wxAdder##property() : wxAdder( #addermethod ) {} \ + ~wxAdder##property() {} \ void Add( wxObject *object, const wxxVariant &variantValue ) const \ { \ Klass *obj = dynamic_cast(object) ; \ @@ -652,6 +732,7 @@ class wxCollectionGetter##property : public wxCollectionGetter \ { \ public : \ wxCollectionGetter##property() : wxCollectionGetter( #gettermethod ) {} \ + ~wxCollectionGetter##property() {} \ void Get( const wxObject *object , wxxVariantArray &result) const \ { \ const Klass *obj = dynamic_cast(object) ; \ @@ -696,10 +777,7 @@ public : { 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 ; @@ -713,6 +791,10 @@ public : wxGenericPropertyAccessor( const wxString &propName ) ; ~wxGenericPropertyAccessor() ; + void RenameProperty( const wxString &oldName , const wxString &newName ) + { + wxASSERT( oldName == m_propertyName ) ; m_propertyName = newName ; + } virtual bool HasSetter() const { return true ; } virtual bool HasGetter() const { return true ; } virtual bool HasAdder() const { return false ; } @@ -755,19 +837,77 @@ enum { class WXDLLIMPEXP_BASE wxPropertyInfo { + friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ; public : - wxPropertyInfo( wxPropertyInfo* &iter , const wxClassInfo* itsClass , const wxString& name , const wxTypeInfo* typeInfo , wxPropertyAccessor *accessor , wxxVariant dv , wxPropertyInfoFlags flags = 0 , const wxString& helpString=wxEmptyString, const wxString& groupString=wxEmptyString ) : - m_name( name ) , m_itsClass( itsClass ) , m_typeInfo( typeInfo ) , m_accessor( accessor ) , m_defaultValue( dv ) , m_collectionElementTypeInfo(NULL) , m_helpString (helpString ) , m_groupString( groupString ) , m_flags(flags) + wxPropertyInfo(wxPropertyInfo* &iter, + wxClassInfo* itsClass, + const wxString& name, + const wxString& typeName, + wxPropertyAccessor *accessor, + wxxVariant dv, + wxPropertyInfoFlags flags = 0, + const wxString& helpString = wxEmptyString, + const wxString& groupString = wxEmptyString) : + m_name(name), + m_groupString(groupString), + m_helpString(helpString), + m_itsClass(itsClass), + m_flags(flags), + m_typeName(typeName) , + m_typeInfo(NULL), + m_collectionElementTypeInfo(NULL), + m_accessor(accessor), + m_defaultValue(dv) + { + Insert(iter); + } + + wxPropertyInfo(wxPropertyInfo* &iter, + wxClassInfo* itsClass, + const wxString& name, + wxDelegateTypeInfo* type, + wxPropertyAccessor *accessor, + wxxVariant dv, + wxPropertyInfoFlags flags = 0, + const wxString& helpString = wxEmptyString, + const wxString& groupString = wxEmptyString) : + m_name(name), + m_groupString(groupString), + m_helpString(helpString), + m_itsClass(itsClass), + m_flags(flags), + m_typeInfo(type), + m_collectionElementTypeInfo(NULL), + m_accessor(accessor), + m_defaultValue(dv) { - Insert(iter) ; + Insert(iter); } - wxPropertyInfo( wxPropertyInfo* &iter , const wxClassInfo* itsClass , const wxString& name , const wxTypeInfo* collTypeInfo , const wxTypeInfo* elemTypeInfo , wxPropertyAccessor *accessor , wxPropertyInfoFlags flags = 0 , const wxString& helpString=wxEmptyString, const wxString& groupString=wxEmptyString ) : - m_name( name ) , m_itsClass( itsClass ) , m_typeInfo( collTypeInfo ) , m_accessor( accessor ) , m_collectionElementTypeInfo(elemTypeInfo) , m_helpString (helpString ) , m_groupString( groupString ) , m_flags(flags) + wxPropertyInfo(wxPropertyInfo* &iter, + wxClassInfo* itsClass, const wxString& name, + const wxString& collectionTypeName, + const wxString& elementTypeName, + wxPropertyAccessor *accessor, + wxPropertyInfoFlags flags = 0, + const wxString& helpString = wxEmptyString, + const wxString& groupString = wxEmptyString) : + m_name(name), + m_groupString(groupString), + m_helpString(helpString), + m_itsClass(itsClass), + m_flags(flags), + m_typeInfo(NULL), + m_typeName(collectionTypeName) , + m_collectionElementTypeInfo(NULL), + m_collectionElementTypeName(elementTypeName), + m_accessor(accessor) { - Insert(iter) ; + Insert(iter); } + ~wxPropertyInfo() ; + // return the class this property is declared in const wxClassInfo* GetDeclaringClass() const { return m_itsClass ; } @@ -784,10 +924,20 @@ public : const wxString& GetGroupString() const { return m_groupString ; } // return the element type info of this property (for collections, otherwise NULL) - const wxTypeInfo * GetCollectionElementTypeInfo() const { return m_collectionElementTypeInfo ; } + const wxTypeInfo * GetCollectionElementTypeInfo() const + { + if ( m_collectionElementTypeInfo == NULL ) + m_collectionElementTypeInfo = wxTypeInfo::FindType(m_collectionElementTypeName) ; + return m_collectionElementTypeInfo ; + } // return the type info of this property - const wxTypeInfo * GetTypeInfo() const { return m_typeInfo ; } + const wxTypeInfo * GetTypeInfo() const + { + if ( m_typeInfo == NULL ) + m_typeInfo = wxTypeInfo::FindType(m_typeName) ; + return m_typeInfo ; + } // return the accessor for this property wxPropertyAccessor* GetAccessor() const { return m_accessor ; } @@ -812,15 +962,16 @@ private : i->m_next = this ; } } - - wxString m_name; + + wxString m_name ; wxString m_typeName ; + wxString m_collectionElementTypeName ; wxString m_groupString ; wxString m_helpString ; - const wxClassInfo* m_itsClass ; + wxClassInfo* m_itsClass ; wxPropertyInfoFlags m_flags ; - const wxTypeInfo* m_typeInfo ; - const wxTypeInfo* m_collectionElementTypeInfo ; + mutable wxTypeInfo* m_typeInfo ; + mutable wxTypeInfo* m_collectionElementTypeInfo ; wxPropertyAccessor* m_accessor ; wxxVariant m_defaultValue; // string representation of the default value @@ -829,7 +980,7 @@ private : wxPropertyInfo* m_next ; }; -WX_DECLARE_EXPORTED_STRING_HASH_MAP( wxPropertyInfo* , wxPropertyInfoMap ) ; +WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo* , wxPropertyInfoMap , class WXDLLIMPEXP_BASE ) ; #define WX_BEGIN_PROPERTIES_TABLE(theClass) \ wxPropertyInfo *theClass::GetPropertiesStatic() \ @@ -840,54 +991,44 @@ WX_DECLARE_EXPORTED_STRING_HASH_MAP( wxPropertyInfo* , wxPropertyInfoMap ) ; #define WX_END_PROPERTIES_TABLE() \ return first ; } -#define WX_HIDE_PROPERTY( name ) \ - static wxPropertyInfo _propertyInfo##name( first , class_t::GetClassInfoStatic() , #name , wxGetTypeInfo( (void*) NULL ) ,NULL , wxxVariant() , wxPROP_DONT_STREAM , wxEmptyString , wxEmptyString ) ; - -#define WX_PROPERTY( name , type , setter , getter ,defaultValue , flags , help , group) \ - 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 , class_t::GetClassInfoStatic() , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) , flags , group , help ) ; - -#define WX_PROPERTY_FLAGS( name , flags , type , setter , getter ,defaultValue , pflags , help , group) \ - 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 , class_t::GetClassInfoStatic() , #name , wxGetTypeInfo( (flags*) NULL ) ,&_accessor##name , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ; - -#define WX_READONLY_PROPERTY( name , type , getter ,defaultValue , flags , help , group) \ - 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 , class_t::GetClassInfoStatic() , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue), flags , help , group ) ; - -#define WX_PROPERTY_COLLECTION( name , colltype , addelemtype , adder , getter , flags , help , group ) \ - 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 , class_t::GetClassInfoStatic() , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name , flags , help , group ) ; - -#define WX_READONLY_PROPERTY_COLLECTION( name , colltype , addelemtype , getter , flags , help , group) \ - 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 ,class_t::GetClassInfoStatic() , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name , flags , help , group ) ; -/* -#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_HIDE_PROPERTY( pname ) \ + static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , #pname , typeid(void).name() ,NULL , wxxVariant() , wxPROP_DONT_STREAM , wxEmptyString , wxEmptyString ) ; + +#define WX_PROPERTY( pname , type , setter , getter ,defaultValue , flags , help , group) \ + WX_SETTER( pname , class_t , type , setter ) \ + static wxSetter##pname _setter##pname ; \ + WX_GETTER( pname , class_t , type , getter ) \ + static wxGetter##pname _getter##pname ; \ + static wxPropertyAccessor _accessor##pname( &_setter##pname , &_getter##pname , NULL , NULL ) ; \ + static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , #pname , typeid(type).name() ,&_accessor##pname , wxxVariant(defaultValue) , flags , group , help ) ; + +#define WX_PROPERTY_FLAGS( pname , flags , type , setter , getter ,defaultValue , pflags , help , group) \ + WX_SETTER( pname , class_t , type , setter ) \ + static wxSetter##pname _setter##pname ; \ + WX_GETTER( pname , class_t , type , getter ) \ + static wxGetter##pname _getter##pname ; \ + static wxPropertyAccessor _accessor##pname( &_setter##pname , &_getter##pname , NULL , NULL ) ; \ + static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , #pname , typeid(flags).name() ,&_accessor##pname , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ; + +#define WX_READONLY_PROPERTY( pname , type , getter ,defaultValue , flags , help , group) \ + WX_GETTER( pname , class_t , type , getter ) \ + static wxGetter##pname _getter##pname ; \ + static wxPropertyAccessor _accessor##pname( NULL , &_getter##pname , NULL , NULL ) ; \ + static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , #pname , typeid(type).name() ,&_accessor##pname , wxxVariant(defaultValue), flags , help , group ) ; + +#define WX_PROPERTY_COLLECTION( pname , colltype , addelemtype , adder , getter , flags , help , group ) \ + WX_ADDER( pname , class_t , addelemtype , adder ) \ + static wxAdder##pname _adder##pname ; \ + WX_COLLECTION_GETTER( pname , class_t , colltype , getter ) \ + static wxCollectionGetter##pname _collectionGetter##pname ; \ + static wxPropertyAccessor _accessor##pname( NULL , NULL ,&_adder##pname , &_collectionGetter##pname ) ; \ + static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , #pname , typeid(colltype).name() ,typeid(addelemtype).name() ,&_accessor##pname , flags , help , group ) ; + +#define WX_READONLY_PROPERTY_COLLECTION( pname , colltype , addelemtype , getter , flags , help , group) \ + WX_COLLECTION_GETTER( pname , class_t , colltype , getter ) \ + static wxCollectionGetter##pname _collectionGetter##pname ; \ + static wxPropertyAccessor _accessor##pname( NULL , NULL , NULL , &_collectionGetter##pname ) ; \ + static wxPropertyInfo _propertyInfo##pname( first ,class_t::GetClassInfoStatic() , #pname , typeid(colltype).name() ,typeid(addelemtype).name() ,&_accessor##pname , flags , help , group ) ; #define WX_DELEGATE( name , eventType , eventClass ) \ @@ -900,11 +1041,19 @@ static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (collt // this is describing an event sink // ---------------------------------------------------------------------------- -class wxHandlerInfo +class WXDLLIMPEXP_BASE wxHandlerInfo { + friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ; public : - wxHandlerInfo( wxHandlerInfo* &iter , const wxString& name , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) : - m_name( name ) , m_eventClassInfo( eventClassInfo ) , m_eventFunction( address ) + wxHandlerInfo(wxHandlerInfo* &iter, + wxClassInfo* itsClass, + const wxString& name, + wxObjectEventFunction address, + const wxClassInfo* eventClassInfo) : + m_eventFunction(address), + m_name(name), + m_eventClassInfo(eventClassInfo) , + m_itsClass(itsClass) { m_next = NULL ; if ( iter == NULL ) @@ -919,6 +1068,8 @@ public : } } + ~wxHandlerInfo() ; + // return the name of this handler const wxString& GetName() const { return m_name ; } @@ -930,15 +1081,20 @@ public : // returns NULL if this is the last handler of this class wxHandlerInfo* GetNext() const { return m_next ; } + + // return the class this property is declared in + const wxClassInfo* GetDeclaringClass() const { return m_itsClass ; } + private : wxObjectEventFunction m_eventFunction ; wxString m_name; const wxClassInfo* m_eventClassInfo ; wxHandlerInfo* m_next ; + wxClassInfo* m_itsClass ; }; #define WX_HANDLER(name,eventClassType) \ - static wxHandlerInfo _handlerInfo##name( first , #name , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ; + static wxHandlerInfo _handlerInfo##name( first , class_t::GetClassInfoStatic() , #name , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ; #define WX_BEGIN_HANDLERS_TABLE(theClass) \ wxHandlerInfo *theClass::GetHandlersStatic() \ @@ -1003,7 +1159,7 @@ struct wxConstructorBridge_1 : public wxConstructorBridge { Class *obj = dynamic_cast(o); obj->Create( - args[0].Get() + args[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) ); } }; @@ -1024,8 +1180,8 @@ struct wxConstructorBridge_2 : public wxConstructorBridge { Class *obj = dynamic_cast(o); obj->Create( - args[0].Get() , - args[1].Get() + args[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) , + args[1].WX_TEMPLATED_MEMBER_CALL(Get , T1) ); } }; @@ -1046,9 +1202,9 @@ struct wxConstructorBridge_3 : public wxConstructorBridge { Class *obj = dynamic_cast(o); obj->Create( - args[0].Get() , - args[1].Get() , - args[2].Get() + args[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) , + args[1].WX_TEMPLATED_MEMBER_CALL(Get , T1) , + args[2].WX_TEMPLATED_MEMBER_CALL(Get , T2) ); } }; @@ -1069,10 +1225,10 @@ struct wxConstructorBridge_4 : public wxConstructorBridge { Class *obj = dynamic_cast(o); obj->Create( - args[0].Get() , - args[1].Get() , - args[2].Get() , - args[3].Get() + args[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) , + args[1].WX_TEMPLATED_MEMBER_CALL(Get , T1) , + args[2].WX_TEMPLATED_MEMBER_CALL(Get , T2) , + args[3].WX_TEMPLATED_MEMBER_CALL(Get , T3) ); } }; @@ -1093,11 +1249,11 @@ struct wxConstructorBridge_5 : public wxConstructorBridge { Class *obj = dynamic_cast(o); obj->Create( - args[0].Get() , - args[1].Get() , - args[2].Get() , - args[3].Get() , - args[4].Get() + args[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) , + args[1].WX_TEMPLATED_MEMBER_CALL(Get , T1) , + args[2].WX_TEMPLATED_MEMBER_CALL(Get , T2) , + args[3].WX_TEMPLATED_MEMBER_CALL(Get , T3) , + args[4].WX_TEMPLATED_MEMBER_CALL(Get , T4) ); } }; @@ -1118,16 +1274,39 @@ struct wxConstructorBridge_6 : public wxConstructorBridge { 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[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) , + args[1].WX_TEMPLATED_MEMBER_CALL(Get , T1) , + args[2].WX_TEMPLATED_MEMBER_CALL(Get , T2) , + args[3].WX_TEMPLATED_MEMBER_CALL(Get , T3) , + args[4].WX_TEMPLATED_MEMBER_CALL(Get , T4) , + args[5].WX_TEMPLATED_MEMBER_CALL(Get , T5) + ); + } +}; + +template +struct wxDirectConstructorBridge_6 : public wxConstructorBridge +{ + void Create(wxObject *o, wxxVariant *args) + { + Class *obj = new Class( + args[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) , + args[1].WX_TEMPLATED_MEMBER_CALL(Get , T1) , + args[2].WX_TEMPLATED_MEMBER_CALL(Get , T2) , + args[3].WX_TEMPLATED_MEMBER_CALL(Get , T3) , + args[4].WX_TEMPLATED_MEMBER_CALL(Get , T4) , + args[5].WX_TEMPLATED_MEMBER_CALL(Get , T5) ); } }; +#define WX_DIRECT_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \ + wxDirectConstructorBridge_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; + #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 ; \ @@ -1144,13 +1323,13 @@ struct wxConstructorBridge_7 : public wxConstructorBridge { 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[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) , + args[1].WX_TEMPLATED_MEMBER_CALL(Get , T1) , + args[2].WX_TEMPLATED_MEMBER_CALL(Get , T2) , + args[3].WX_TEMPLATED_MEMBER_CALL(Get , T3) , + args[4].WX_TEMPLATED_MEMBER_CALL(Get , T4) , + args[5].WX_TEMPLATED_MEMBER_CALL(Get , T5) , + args[6].WX_TEMPLATED_MEMBER_CALL(Get , T6) ); } }; @@ -1171,14 +1350,14 @@ struct wxConstructorBridge_8 : public wxConstructorBridge { 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() + args[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) , + args[1].WX_TEMPLATED_MEMBER_CALL(Get , T1) , + args[2].WX_TEMPLATED_MEMBER_CALL(Get , T2) , + args[3].WX_TEMPLATED_MEMBER_CALL(Get , T3) , + args[4].WX_TEMPLATED_MEMBER_CALL(Get , T4) , + args[5].WX_TEMPLATED_MEMBER_CALL(Get , T5) , + args[6].WX_TEMPLATED_MEMBER_CALL(Get , T6) , + args[7].WX_TEMPLATED_MEMBER_CALL(Get , T7) ); } }; @@ -1195,12 +1374,16 @@ struct wxConstructorBridge_8 : public wxConstructorBridge typedef wxObject *(*wxObjectConstructorFn)(void); typedef wxObject* (*wxVariantToObjectConverter)( wxxVariant &data ) ; typedef wxxVariant (*wxObjectToVariantConverter)( wxObject* ) ; -class wxWriter ; -class wxPersister ; + +class WXDLLIMPEXP_BASE wxWriter; +class WXDLLIMPEXP_BASE wxPersister; + typedef bool (*wxObjectStreamingCallback) ( const wxObject *, wxWriter * , wxPersister * , wxxVariantArray & ) ; class WXDLLIMPEXP_BASE wxClassInfo { + friend class WXDLLIMPEXP_BASE wxPropertyInfo ; + friend class WXDLLIMPEXP_BASE wxHandlerInfo ; public: wxClassInfo(const wxClassInfo **_Parents, const wxChar *_UnitName, @@ -1216,21 +1399,45 @@ public: wxVariantToObjectConverter _Converter2 , wxObjectToVariantConverter _Converter3 , wxObjectStreamingCallback _streamingCallback = NULL - ) : 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_variantOfPtrToObjectConverter( _PtrConverter1 ) , m_variantToObjectConverter( _Converter2 ) , m_objectToVariantConverter( _Converter3 ) , - m_next(sm_first) , m_streamingCallback( _streamingCallback ) + ) : + + m_className(_ClassName), + m_objectSize(size), + m_objectConstructor(ctor), + m_next(sm_first), + m_firstProperty(_Props), + m_firstHandler(_Handlers), + m_parents(_Parents), + m_unitName(_UnitName), + m_constructor(_Constructor), + m_constructorProperties(_ConstructorProperties), + m_constructorPropertiesCount(_ConstructorPropertiesCount), + m_variantOfPtrToObjectConverter(_PtrConverter1), + m_variantToObjectConverter(_Converter2), + m_objectToVariantConverter(_Converter3), + m_streamingCallback(_streamingCallback) { sm_first = 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) , - m_streamingCallback( NULL ) + wxClassInfo(const wxChar *_UnitName, const wxChar *_ClassName, + const wxClassInfo **_Parents) : + m_className(_ClassName), + m_objectSize(0), + m_objectConstructor(NULL), + m_next(sm_first), + m_firstProperty(NULL), + m_firstHandler(NULL), + m_parents(_Parents), + m_unitName(_UnitName), + m_constructor(NULL), + m_constructorProperties(NULL), + m_constructorPropertiesCount(0), + m_variantOfPtrToObjectConverter(NULL), + m_variantToObjectConverter(NULL), + m_objectToVariantConverter(NULL), + m_streamingCallback(NULL) { sm_first = this; Register() ; @@ -1274,10 +1481,11 @@ public: return false ; } - // if there is a callback registered with that class it will be called before this - // object will be written to disk, it can veto streaming out this object by returning - // false, if this class has not registered a callback, the search will go up the inheritance tree - // if no callback has been registered true will be returned by default + // if there is a callback registered with that class it will be called + // before this object will be written to disk, it can veto streaming out + // this object by returning false, if this class has not registered a + // callback, the search will go up the inheritance tree if no callback has + // been registered true will be returned by default bool BeforeWriteObject( const wxObject *obj, wxWriter *streamer , wxPersister *persister , wxxVariantArray &metadata) const ; // gets the streaming callback from this class or any superclass @@ -1336,10 +1544,10 @@ public: virtual const wxHandlerInfo *FindHandlerInfo (const wxChar *PropertyName) const ; // find property by name - virtual const wxPropertyInfo *FindPropertyInfoInThisClass (const wxChar *PropertyName) const ; + virtual wxPropertyInfo *FindPropertyInfoInThisClass (const wxChar *PropertyName) const ; // find handler by name - virtual const wxHandlerInfo *FindHandlerInfoInThisClass (const wxChar *PropertyName) const ; + virtual wxHandlerInfo *FindHandlerInfoInThisClass (const wxChar *PropertyName) const ; // puts all the properties of this class and its superclasses in the map, as long as there is not yet // an entry with the same name (overriding mechanism) @@ -1396,7 +1604,7 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); // // this object leads to having a pure runtime-instantiation -class wxDynamicClassInfo : public wxClassInfo +class WXDLLIMPEXP_BASE wxDynamicClassInfo : public wxClassInfo { public : wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName , const wxClassInfo* superClass ) ; @@ -1418,8 +1626,23 @@ public : virtual void SetProperty (wxObject *object, const wxChar *PropertyName, const wxxVariant &Value) const ; virtual wxxVariant GetProperty (wxObject *object, const wxChar *PropertyName) const ; + // adds a property to this class at runtime void AddProperty( const wxChar *propertyName , const wxTypeInfo* typeInfo ) ; + + // removes an existing runtime-property + void RemoveProperty( const wxChar *propertyName ) ; + + // renames an existing runtime-property + void RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) ; + + // as a handler to this class at runtime void AddHandler( const wxChar *handlerName , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) ; + + // removes an existing runtime-handler + void RemoveHandler( const wxChar *handlerName ) ; + + // renames an existing runtime-handler + void RenameHandler( const wxChar *oldHandlerName , const wxChar *newHandlerName ) ; } ; // ---------------------------------------------------------------------------- @@ -1434,7 +1657,7 @@ public : static wxHandlerInfo* GetHandlersStatic() ; \ static wxClassInfo *GetClassInfoStatic() \ { return &name::sm_class##name; } \ - virtual wxClassInfo *GetClassInfo() const \ + virtual wxClassInfo *GetClassInfo() const \ { return &name::sm_class##name; } #define DECLARE_DYNAMIC_CLASS(name) \ @@ -1460,6 +1683,10 @@ public : // Single inheritance with one base class +#define _TYPEINFO_CLASSES(n) \ + wxClassTypeInfo s_typeInfo##n(wxT_OBJECT , &n::sm_class##n , NULL , NULL , typeid(n).name()) ; \ + wxClassTypeInfo s_typeInfoPtr##n(wxT_OBJECT_PTR , &n::sm_class##n , NULL , NULL , typeid(n*).name()) ; + #define _IMPLEMENT_DYNAMIC_CLASS(name, basename, unit , callback) \ wxObject* wxConstructorFor##name() \ { return new name; } \ @@ -1471,15 +1698,7 @@ public : (wxObjectConstructorFn) wxConstructorFor##name , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name , \ name::sm_constructorPropertiesCount##name , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name , callback); \ - 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 ; } + _TYPEINFO_CLASSES(name) #define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit, callback ) \ wxObject* wxConstructorFor##name() \ @@ -1493,15 +1712,7 @@ public : (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, callback); \ - 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 ; } + _TYPEINFO_CLASSES(name) #define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename ) \ _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , "" , NULL ) \ @@ -1533,13 +1744,7 @@ public : (wxObjectConstructorFn) 0 , \ 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 ; } + _TYPEINFO_CLASSES(name) // this is for subclasses that still do not derive from wxobject @@ -1550,13 +1755,7 @@ public : (wxObjectConstructorFn) 0 , \ 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 ; } + _TYPEINFO_CLASSES(name) // Multiple inheritance with two base classes @@ -1572,13 +1771,7 @@ public : (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 * & ){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 ; } + _TYPEINFO_CLASSES(name) #define IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2) \ _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "") \ @@ -1605,13 +1798,7 @@ public : (wxObjectConstructorFn) 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ 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 ; } + _TYPEINFO_CLASSES(name) #define IMPLEMENT_ABSTRACT_CLASS( name , basename ) \ _IMPLEMENT_ABSTRACT_CLASS( name , basename ) \ @@ -1632,9 +1819,9 @@ public : // Collection Support // -------------------------------------------------------------------------- -template void wxListCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value ) +template void wxListCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value ) { - collection_t::compatibility_iterator current = coll.GetFirst() ; + iter current = coll.GetFirst() ; while (current) { value.Add( new wxxVariant(current->GetData()) ) ;