X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df3a88afd76a054546c3639b2f3aacd9e0696b23..b67e8d38b6dd7652ba4c73c7df7571d5148c087a:/include/wx/xti.h diff --git a/include/wx/xti.h b/include/wx/xti.h index 8692028a65..7c3cf5552e 100644 --- a/include/wx/xti.h +++ b/include/wx/xti.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/xti.hG +// Name: wx/xti.h // Purpose: runtime metadata information (extended class info) // Author: Stefan Csomor // Modified by: @@ -42,33 +42,48 @@ #include "wx/string.h" #include "wx/arrstr.h" #include "wx/hashmap.h" +#include "wx/log.h" +#include "wx/intl.h" -#include +#include // we will move this later to defs.h -#if !wxCHECK_GCC_VERSION( 3 , 4 ) +#if defined(__GNUC__) && !wxCHECK_GCC_VERSION( 3 , 4 ) # define wxUSE_MEMBER_TEMPLATES 0 #endif -#ifdef _MSC_VER -# if _MSC_VER <= 1200 -# define wxUSE_MEMBER_TEMPLATES 0 -# endif +#if defined(_MSC_VER) && _MSC_VER <= 1200 +# define wxUSE_MEMBER_TEMPLATES 0 +# define wxUSE_FUNC_TEMPLATE_POINTER 0 #endif #ifndef wxUSE_MEMBER_TEMPLATES -#define wxUSE_MEMBER_TEMPLATES 1 +# define wxUSE_MEMBER_TEMPLATES 1 +#endif + +#ifndef wxUSE_FUNC_TEMPLATE_POINTER +# define wxUSE_FUNC_TEMPLATE_POINTER 1 #endif #if wxUSE_MEMBER_TEMPLATES -#define WX_TEMPLATED_MEMBER_CALL( method , type ) method() -#define WX_TEMPLATED_MEMBER_FIX( type ) +# define wxTEMPLATED_MEMBER_CALL( method , type ) method() +# define wxTEMPLATED_MEMBER_FIX( type ) +#else +# define wxTEMPLATED_MEMBER_CALL( method , type ) method((type*)NULL) +# define wxTEMPLATED_MEMBER_FIX( type ) type* =NULL +#endif + +#if defined(_MSC_VER) && _MSC_VER <= 1200 +# define wxTEMPLATED_FUNCTION_FIX( type ) , wxTEMPLATED_MEMBER_FIX(type) +# define wxINFUNC_CLASS_TYPE_FIX( type ) typedef type type; #else -#define WX_TEMPLATED_MEMBER_CALL( method , type ) method((type*)NULL) -#define WX_TEMPLATED_MEMBER_FIX( type ) type* =NULL +# define wxTEMPLATED_FUNCTION_FIX( type ) +# define wxINFUNC_CLASS_TYPE_FIX( type ) #endif +#define EMPTY_MACROVALUE /**/ + class WXDLLIMPEXP_BASE wxObject; class WXDLLIMPEXP_BASE wxClassInfo; class WXDLLIMPEXP_BASE wxDynamicClassInfo; @@ -78,6 +93,18 @@ class WXDLLIMPEXP_BASE wxEvent; typedef void (wxObject::*wxObjectEventFunction)(wxEvent&); +#if wxUSE_FUNC_TEMPLATE_POINTER +# define wxTO_STRING(type) wxToStringConverter +# define wxTO_STRING_IMP(type) +# define wxFROM_STRING(type) wxFromStringConverter +# define wxFROM_STRING_IMP(type) +#else +# define wxTO_STRING(type) ToString##type +# define wxTO_STRING_IMP(type) inline void ToString##type( const wxxVariant& data , wxString &result ) { wxToStringConverter(data, result); } +# define wxFROM_STRING(type) FromString##type +# define wxFROM_STRING_IMP(type) inline void FromString##type( const wxString& data , wxxVariant &result ) { wxFromStringConverter(data, result); } +#endif + // ---------------------------------------------------------------------------- // Enum Support // @@ -85,11 +112,11 @@ typedef void (wxObject::*wxObjectEventFunction)(wxEvent&); // implementation, an enum would have // to be enumerated eg : // -// WX_BEGIN_ENUM( wxFlavor ) -// WX_ENUM_MEMBER( Vanilla ) -// WX_ENUM_MEMBER( Chocolate ) -// WX_ENUM_MEMBER( Strawberry ) -// WX_END_ENUM( wxFlavor ) +// wxBEGIN_ENUM( wxFlavor ) +// wxENUM_MEMBER( Vanilla ) +// wxENUM_MEMBER( Chocolate ) +// wxENUM_MEMBER( Strawberry ) +// wxEND_ENUM( wxFlavor ) // ---------------------------------------------------------------------------- struct WXDLLIMPEXP_BASE wxEnumMemberData @@ -106,35 +133,35 @@ public : // 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 ) ; + bool HasEnumMemberValue( const wxChar *name , int *value = NULL ) const ; // 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 ); + int GetEnumMemberValue(const wxChar *name ) const ; // returns the name of the enum member having the passed in value // returns an emtpy string if not found - const wxChar *GetEnumMemberName(int value); + const wxChar *GetEnumMemberName(int value) const ; // returns the number of members in this enum - int GetEnumCount() { return m_count ; } + int GetEnumCount() const { return m_count ; } // returns the value of the nth member - int GetEnumMemberValueByIndex( int n ) ; + int GetEnumMemberValueByIndex( int n ) const ; // returns the value of the nth member - const wxChar *GetEnumMemberNameByIndex( int n ) ; + const wxChar *GetEnumMemberNameByIndex( int n ) const ; private : wxEnumMemberData *m_members; int m_count ; }; -#define WX_BEGIN_ENUM( e ) \ +#define wxBEGIN_ENUM( e ) \ wxEnumMemberData s_enumDataMembers##e[] = { -#define WX_ENUM_MEMBER( v ) { #v, v } , +#define wxENUM_MEMBER( v ) { wxT(#v), v } , -#define WX_END_ENUM( e ) { NULL , 0 } } ; \ +#define wxEND_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 ) \ @@ -146,8 +173,10 @@ private : 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() ;} \ - wxEnumTypeInfo s_typeInfo##e(wxT_ENUM , &s_enumData##e , &wxToStringConverter , &wxFromStringConverter , &ToLong##e , &FromLong##e , typeid(e).name() ) ; + void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , e) ;} \ + wxTO_STRING_IMP( e ) \ + wxFROM_STRING_IMP( e ) \ + wxEnumTypeInfo s_typeInfo##e(wxT_ENUM , &s_enumData##e , &wxTO_STRING( e ) , &wxFROM_STRING( e ) , &ToLong##e , &FromLong##e , typeid(e).name() ) ; // ---------------------------------------------------------------------------- // Set Support @@ -165,13 +194,13 @@ private : // // in the implementation file : // -// WX_BEGIN_ENUM( wxFlavor ) -// WX_ENUM_MEMBER( Vanilla ) -// WX_ENUM_MEMBER( Chocolate ) -// WX_ENUM_MEMBER( Strawberry ) -// WX_END_ENUM( wxFlavor ) +// wxBEGIN_ENUM( wxFlavor ) +// wxENUM_MEMBER( Vanilla ) +// wxENUM_MEMBER( Chocolate ) +// wxENUM_MEMBER( Strawberry ) +// wxEND_ENUM( wxFlavor ) // -// WX_IMPLEMENT_SET_STREAMING( wxCoupe , wxFlavor ) +// wxIMPLEMENT_SET_STREAMING( wxCoupe , wxFlavor ) // // implementation note : no partial specialization for streaming, but a delegation to a // different class @@ -215,13 +244,13 @@ void wxSetToString( wxString &s , const wxBitset &data ) { // this could also be done by the templated calls if ( !s.IsEmpty() ) - s +="|" ; + s +=wxT("|") ; s += edata->GetEnumMemberNameByIndex(i) ; } } } -#define WX_IMPLEMENT_SET_STREAMING(SetName,e) \ +#define wxIMPLEMENT_SET_STREAMING(SetName,e) \ template<> void wxStringReadValue(const wxString &s , wxBitset &data ) \ { \ wxSetFromString( s , data ) ; \ @@ -231,8 +260,10 @@ void wxSetToString( 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() ;} \ - wxEnumTypeInfo s_typeInfo##SetName(wxT_SET , &s_enumData##e , &wxToStringConverter , &wxFromStringConverter , &ToLong##SetName , &FromLong##SetName, typeid(SetName).name() ) ; \ + void ToLong##SetName( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , SetName).to_ulong() ;} \ + wxTO_STRING_IMP( SetName ) \ + wxFROM_STRING_IMP( SetName ) \ + wxEnumTypeInfo s_typeInfo##SetName(wxT_SET , &s_enumData##e , &wxTO_STRING( SetName ) , &wxFROM_STRING( SetName ) , &ToLong##SetName , &FromLong##SetName, typeid(SetName).name() ) ; \ } template @@ -273,18 +304,18 @@ void wxFlagsToString( wxString &s , const e& data ) dataValue &= ~value ; // this could also be done by the templated calls if ( !s.IsEmpty() ) - s +="|" ; + s +=wxT("|") ; s += edata->GetEnumMemberNameByIndex(i) ; } } } -#define WX_BEGIN_FLAGS( e ) \ +#define wxBEGIN_FLAGS( e ) \ wxEnumMemberData s_enumDataMembers##e[] = { -#define WX_FLAGS_MEMBER( v ) { #v, v } , +#define wxFLAGS_MEMBER( v ) { wxT(#v), v } , -#define WX_END_FLAGS( e ) { NULL , 0 } } ; \ +#define wxEND_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 ) \ @@ -296,8 +327,10 @@ void wxFlagsToString( 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() ) ; + void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , e).m_data ;} \ + wxTO_STRING_IMP( e ) \ + wxFROM_STRING_IMP( e ) \ + wxEnumTypeInfo s_typeInfo##e(wxT_SET , &s_enumData##e , &wxTO_STRING( e ) , &wxFROM_STRING( e ) , &ToLong##e , &FromLong##e, typeid(e).name() ) ; // ---------------------------------------------------------------------------- // Type Information // ---------------------------------------------------------------------------- @@ -351,10 +384,19 @@ public : 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) + m_toString(to), m_fromString(from), m_kind(kind), m_name(name) { Register(); } +#if wxUSE_UNICODE + wxTypeInfo(wxTypeKind kind, + converterToString_t to = NULL, converterFromString_t from = NULL, + const char *name = ""): + m_toString(to), m_fromString(from), m_kind(kind), m_name(wxString::FromAscii(name)) + { + Register(); + } +#endif virtual ~wxTypeInfo() { @@ -382,12 +424,15 @@ public : // 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 ) ; } + { if ( m_toString ) (*m_toString)( data , result ) ; else wxLogError( _("String conversions not supported") ) ; } // 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 ) ; } + { if( m_fromString ) (*m_fromString)( data , result ) ; else wxLogError( _("String conversions not supported") ) ; } +#if wxUSE_UNICODE + static wxTypeInfo *FindType(const char *typeName) { return FindType( wxString::FromAscii(typeName) ) ; } +#endif static wxTypeInfo *FindType(const wxChar *typeName); private : @@ -398,7 +443,7 @@ private : converterToString_t m_toString ; converterFromString_t m_fromString ; - static wxTypeInfoMap* sm_typeTable ; + static wxTypeInfoMap* ms_typeTable ; wxTypeKind m_kind; wxString m_name; @@ -410,6 +455,11 @@ public : wxBuiltInTypeInfo( wxTypeKind kind , converterToString_t to = NULL , converterFromString_t from = NULL , const wxString &name = wxEmptyString ) : wxTypeInfo( kind , to , from , name ) { wxASSERT_MSG( GetKind() < wxT_SET , wxT("Illegal Kind for Base Type") ) ; } +#if wxUSE_UNICODE + wxBuiltInTypeInfo( wxTypeKind kind , converterToString_t to , converterFromString_t from , const char *name ) : + wxTypeInfo( kind , to , from , name ) + { wxASSERT_MSG( GetKind() < wxT_SET , wxT("Illegal Kind for Base Type") ) ; } +#endif } ; class WXDLLIMPEXP_BASE wxCustomTypeInfo : public wxTypeInfo @@ -418,6 +468,11 @@ public : wxCustomTypeInfo( const wxString &name , converterToString_t to , converterFromString_t from ) : wxTypeInfo( wxT_CUSTOM , to , from , name ) {} +#if wxUSE_UNICODE + wxCustomTypeInfo( const char *name , converterToString_t to , converterFromString_t from ) : + wxTypeInfo( wxT_CUSTOM , to , from , name ) + {} +#endif } ; class WXDLLIMPEXP_BASE wxEnumTypeInfo : public wxTypeInfo @@ -430,16 +485,23 @@ public : 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 ;} + +#if wxUSE_UNICODE + wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo , converterToString_t to , converterFromString_t from , + converterToLong_t toLong , converterFromLong_t fromLong , const char * 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 ;} +#endif 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 - { wxASSERT_MSG( m_toLong , wxT("Long conversions not supported") ) ; (*m_toLong)( data , result ) ; } + { if( m_toLong ) (*m_toLong)( data , result ) ; else wxLogError( _("Long Conversions not supported") ) ; } // 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 ) ; } + { if( m_fromLong ) (*m_fromLong)( data , result ) ; else wxLogError( _("Long Conversions not supported") ) ;} private : converterToLong_t m_toLong ; @@ -452,6 +514,9 @@ class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo { public : wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to = NULL , converterFromString_t from = NULL , const wxString &name = wxEmptyString) ; +#if wxUSE_UNICODE + wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to , converterFromString_t from , const char *name ) ; +#endif const wxClassInfo *GetClassInfo() const { return m_classInfo ; } private : wxClassInfo *m_classInfo; // Kind == wxT_OBJECT - could be NULL @@ -460,13 +525,22 @@ private : class WXDLLIMPEXP_BASE wxCollectionTypeInfo : public wxTypeInfo { public : - wxCollectionTypeInfo( wxTypeInfo *elementType , converterToString_t to , converterFromString_t from , const wxString &name) : + wxCollectionTypeInfo( const wxString &elementName , converterToString_t to , converterFromString_t from , const wxString &name) : wxTypeInfo( wxT_COLLECTION , to , from , name ) - { m_elementType = elementType ;} - - const wxTypeInfo* GetElementType() const { return m_elementType ; } + { m_elementTypeName = elementName ; m_elementType = NULL ;} +#if wxUSE_UNICODE + wxCollectionTypeInfo( const char *elementName , converterToString_t to , converterFromString_t from , const char *name ) : + wxTypeInfo( wxT_COLLECTION , to , from , name ) + { m_elementTypeName = wxString::FromAscii( elementName ) ; m_elementType = NULL ;} +#endif + const wxTypeInfo* GetElementType() const + { + if ( m_elementType == NULL ) + m_elementType = wxTypeInfo::FindType( m_elementTypeName ) ; + return m_elementType ; } private : - wxTypeInfo * m_elementType ; + mutable wxTypeInfo * m_elementType ; + wxString m_elementTypeName ; } ; // a delegate is an exposed event source @@ -475,31 +549,37 @@ class WXDLLIMPEXP_BASE wxDelegateTypeInfo : public wxTypeInfo { public : wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass , converterToString_t to = NULL , converterFromString_t from = NULL ) ; + wxDelegateTypeInfo( int eventType , int lastEventType, wxClassInfo* eventClass , converterToString_t to = NULL , converterFromString_t from = NULL ) ; int GetEventType() const { return m_eventType ; } + int GetLastEventType() const { return m_lastEventType ; } + const wxClassInfo* GetEventClass() const { return m_eventClass ; } private : const wxClassInfo *m_eventClass; // (extended will merge into classinfo) int m_eventType ; + int m_lastEventType ; } ; 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 , toString , fromString ) \ +#if wxUSE_FUNC_TEMPLATE_POINTER +#define wxCUSTOM_TYPE_INFO( e , toString , fromString ) \ wxCustomTypeInfo s_typeInfo##e(typeid(e).name() , &toString , &fromString) ; +#else +#define wxCUSTOM_TYPE_INFO( e , toString , fromString ) \ + void ToString##e( const wxxVariant& data , wxString &result ) { toString(data, result); } \ + void FromString##e( const wxString& data , wxxVariant &result ) { fromString(data, result); } \ + wxCustomTypeInfo s_typeInfo##e(typeid(e).name() , &ToString##e , &FromString##e) ; +#endif -#define WX_COLLECTION_TYPE_INFO( element , collection ) \ - wxCollectionTypeInfo s_typeInfo##collection( (wxTypeInfo*) wxGetTypeInfo( (element *) NULL) , NULL , NULL , typeid(collection).name() ) ; +#define wxCOLLECTION_TYPE_INFO( element , collection ) \ + wxCollectionTypeInfo s_typeInfo##collection( typeid(element).name() , NULL , NULL , typeid(collection).name() ) ; -// sometimes a compiler invents specializations that are nowhere called, use this macro to satisfy the refs +// sometimes a compiler invents specializations that are nowhere called, use this macro to satisfy the refs, currently +// we don't have to play tricks, but if we will have to according to the compiler, we will use that macro for that -#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) ; } -*/ +#define wxILLEGAL_TYPE_SPECIALIZATION( a ) // ---------------------------------------------------------------------------- // wxxVariant as typesafe data holder @@ -537,6 +617,7 @@ public: // returns the type info of the contentc virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( (T*) NULL ) ; } + private: T m_data; }; @@ -554,22 +635,24 @@ public : ~wxxVariant() { delete m_data ; } // get a ref to the stored data - template T& Get(WX_TEMPLATED_MEMBER_FIX(T)) + template T& Get(wxTEMPLATED_MEMBER_FIX(T)) { wxxVariantDataT *dataptr = dynamic_cast*> (m_data) ; - wxASSERT_MSG( dataptr , wxT("Cast not possible") ) ; + wxASSERT_MSG( dataptr , wxString::Format(wxT("Cast to %s not possible"), typeid(T).name()) ) ; return dataptr->Get() ; } // get a ref to the stored data - template const T& Get(WX_TEMPLATED_MEMBER_FIX(T)) const + template const T& Get(wxTEMPLATED_MEMBER_FIX(T)) const { const wxxVariantDataT *dataptr = dynamic_cast*> (m_data) ; - wxASSERT_MSG( dataptr , wxT("Cast not possible") ) ; + wxASSERT_MSG( dataptr , wxString::Format(wxT("Cast to %s not possible"), typeid(T).name()) ) ; return dataptr->Get() ; } - template bool HasData() const + bool IsEmpty() const { return m_data == NULL ; } + + template bool HasData(wxTEMPLATED_MEMBER_FIX(T)) const { const wxxVariantDataT *dataptr = dynamic_cast*> (m_data) ; return dataptr != NULL ; @@ -621,10 +704,10 @@ 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) ) ; } +void wxToStringConverter( const wxxVariant &v, wxString &s wxTEMPLATED_FUNCTION_FIX(T)) { wxStringWriteValue( s , v.wxTEMPLATED_MEMBER_CALL(Get , T) ) ; } template -void wxFromStringConverter( const wxString &s, wxxVariant &v) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; } \ +void wxFromStringConverter( const wxString &s, wxxVariant &v wxTEMPLATED_FUNCTION_FIX(T)) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; } // ---------------------------------------------------------------------------- // Property Support @@ -681,28 +764,29 @@ private : } ; - -#define WX_SETTER( property, Klass, valueType, setterMethod ) \ +#define wxSETTER( property, Klass, valueType, setterMethod ) \ class wxSetter##property : public wxSetter \ { \ public: \ - wxSetter##property() : wxSetter( #setterMethod ) {} \ + wxINFUNC_CLASS_TYPE_FIX(Klass) \ + wxSetter##property() : wxSetter( wxT(#setterMethod) ) {} \ ~wxSetter##property() {} \ void Set( wxObject *object, const wxxVariant &variantValue ) const \ { \ Klass *obj = dynamic_cast(object) ; \ - if ( variantValue.HasData() ) \ - obj->setterMethod(variantValue.Get()) ; \ + if ( variantValue.wxTEMPLATED_MEMBER_CALL(HasData, valueType) ) \ + obj->setterMethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \ else \ - obj->setterMethod(*variantValue.Get()) ; \ + obj->setterMethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \ } \ } ; -#define WX_GETTER( property, Klass, valueType , gettermethod ) \ +#define wxGETTER( property, Klass, valueType , gettermethod ) \ class wxGetter##property : public wxGetter \ { \ public : \ - wxGetter##property() : wxGetter( #gettermethod ) {} \ + wxINFUNC_CLASS_TYPE_FIX(Klass) \ + wxGetter##property() : wxGetter( wxT(#gettermethod) ) {} \ ~wxGetter##property() {} \ void Get( const wxObject *object , wxxVariant &result) const \ { \ @@ -711,27 +795,29 @@ public : \ } \ } ; -#define WX_ADDER( property, Klass, valueType , addermethod ) \ +#define wxADDER( property, Klass, valueType , addermethod ) \ class wxAdder##property : public wxAdder \ { \ public: \ - wxAdder##property() : wxAdder( #addermethod ) {} \ + wxINFUNC_CLASS_TYPE_FIX(Klass) \ + wxAdder##property() : wxAdder( wxT(#addermethod) ) {} \ ~wxAdder##property() {} \ void Add( wxObject *object, const wxxVariant &variantValue ) const \ { \ Klass *obj = dynamic_cast(object) ; \ - if ( variantValue.HasData() ) \ - obj->addermethod(variantValue.Get()) ; \ + if ( variantValue.wxTEMPLATED_MEMBER_CALL(HasData, valueType) ) \ + obj->addermethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \ else \ - obj->addermethod(*variantValue.Get()) ; \ + obj->addermethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \ } \ } ; -#define WX_COLLECTION_GETTER( property, Klass, valueType , gettermethod ) \ +#define wxCOLLECTION_GETTER( property, Klass, valueType , gettermethod ) \ class wxCollectionGetter##property : public wxCollectionGetter \ { \ public : \ - wxCollectionGetter##property() : wxCollectionGetter( #gettermethod ) {} \ + wxINFUNC_CLASS_TYPE_FIX(Klass) \ + wxCollectionGetter##property() : wxCollectionGetter( wxT(#gettermethod) ) {} \ ~wxCollectionGetter##property() {} \ void Get( const wxObject *object , wxxVariantArray &result) const \ { \ @@ -750,19 +836,19 @@ public : // 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 ) ;} + { if ( m_setter ) m_setter->Set( object , value ) ; else wxLogError( _("SetProperty called w/o valid setter") ) ;} // 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") ) ; m_getter->Get( object , result ) ;} + { if ( m_getter ) m_getter->Get( object , result ) ; else wxLogError( _("GetProperty called w/o valid getter") ) ;} // 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 ) ;} + { if ( m_adder ) m_adder->Add( object , value ) ; else wxLogError( _("AddToPropertyCollection called w/o valid adder") ) ;} // 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") ) ; m_collectionGetter->Get( obj , result) ;} + { if ( m_collectionGetter ) m_collectionGetter->Get( obj , result) ; else wxLogError( _("GetPropertyCollection called w/o valid collection getter") ) ;} virtual bool HasSetter() const { return m_setter != NULL ; } virtual bool HasCollectionGetter() const { return m_collectionGetter != NULL ; } @@ -810,11 +896,11 @@ public : // Adding an element to a collection property virtual void AddToPropertyCollection(wxObject *WXUNUSED(object), const wxxVariant &WXUNUSED(value)) const - { wxASSERT_MSG(0,wxT("AddToPropertyCollection called on a generic accessor") ) ;} + { wxLogError( _("AddToPropertyCollection called on a generic accessor") ) ;} // Getting a collection property virtual void GetPropertyCollection( const wxObject *WXUNUSED(obj), wxxVariantArray &WXUNUSED(result)) const - { wxASSERT_MSG(0,wxT("GetPropertyCollection called on a generic accessor") ) ;} + { wxLogError ( _("GetPropertyCollection called on a generic accessor") ) ;} private : struct wxGenericPropertyAccessorInternal ; wxGenericPropertyAccessorInternal* m_data ; @@ -848,38 +934,62 @@ public : wxPropertyInfoFlags flags = 0, const wxString& helpString = wxEmptyString, const wxString& groupString = wxEmptyString) : + m_itsClass(itsClass), m_name(name), - m_groupString(groupString), - m_helpString(helpString), - m_itsClass(itsClass), - m_flags(flags), - m_typeName(typeName) , m_typeInfo(NULL), + m_typeName(typeName) , m_collectionElementTypeInfo(NULL), m_accessor(accessor), - m_defaultValue(dv) + m_defaultValue(dv), + m_flags(flags), + m_helpString(helpString), + m_groupString(groupString) { Insert(iter); } +#if wxUSE_UNICODE wxPropertyInfo(wxPropertyInfo* &iter, wxClassInfo* itsClass, const wxString& name, - wxDelegateTypeInfo* type, + const char* typeName, wxPropertyAccessor *accessor, wxxVariant dv, wxPropertyInfoFlags flags = 0, const wxString& helpString = wxEmptyString, const wxString& groupString = wxEmptyString) : + m_itsClass(itsClass), m_name(name), - m_groupString(groupString), + m_typeInfo(NULL), + m_typeName(wxString::FromAscii(typeName)) , + m_collectionElementTypeInfo(NULL), + m_accessor(accessor), + m_defaultValue(dv), + m_flags(flags), m_helpString(helpString), + m_groupString(groupString) + { + Insert(iter); + } +#endif + 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_itsClass(itsClass), - m_flags(flags), + m_name(name), m_typeInfo(type), m_collectionElementTypeInfo(NULL), m_accessor(accessor), - m_defaultValue(dv) + m_defaultValue(dv), + m_flags(flags), + m_helpString(helpString), + m_groupString(groupString) { Insert(iter); } @@ -892,20 +1002,43 @@ public : 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_name(name), m_typeInfo(NULL), m_typeName(collectionTypeName) , m_collectionElementTypeInfo(NULL), m_collectionElementTypeName(elementTypeName), - m_accessor(accessor) + m_accessor(accessor) , + m_flags(flags), + m_helpString(helpString), + m_groupString(groupString) { Insert(iter); } +#if wxUSE_UNICODE + wxPropertyInfo(wxPropertyInfo* &iter, + wxClassInfo* itsClass, const wxString& name, + const char* collectionTypeName, + const char* elementTypeName, + wxPropertyAccessor *accessor, + wxPropertyInfoFlags flags = 0, + const wxString& helpString = wxEmptyString, + const wxString& groupString = wxEmptyString) : + m_itsClass(itsClass), + m_name(name), + m_typeInfo(NULL), + m_typeName(wxString::FromAscii(collectionTypeName)) , + m_collectionElementTypeInfo(NULL), + m_collectionElementTypeName(wxString::FromAscii(elementTypeName)), + m_accessor(accessor) , + m_flags(flags), + m_helpString(helpString), + m_groupString(groupString) + { + Insert(iter); + } +#endif ~wxPropertyInfo() ; // return the class this property is declared in @@ -924,19 +1057,19 @@ public : const wxString& GetGroupString() const { return m_groupString ; } // return the element type info of this property (for collections, otherwise NULL) - const wxTypeInfo * GetCollectionElementTypeInfo() const + const wxTypeInfo * GetCollectionElementTypeInfo() const { if ( m_collectionElementTypeInfo == NULL ) m_collectionElementTypeInfo = wxTypeInfo::FindType(m_collectionElementTypeName) ; - return m_collectionElementTypeInfo ; + return m_collectionElementTypeInfo ; } // return the type info of this property - const wxTypeInfo * GetTypeInfo() const + const wxTypeInfo * GetTypeInfo() const { if ( m_typeInfo == NULL ) m_typeInfo = wxTypeInfo::FindType(m_typeName) ; - return m_typeInfo ; + return m_typeInfo ; } // return the accessor for this property @@ -962,18 +1095,18 @@ private : i->m_next = this ; } } - - wxString m_name ; - wxString m_typeName ; - wxString m_collectionElementTypeName ; - wxString m_groupString ; - wxString m_helpString ; + wxClassInfo* m_itsClass ; - wxPropertyInfoFlags m_flags ; + wxString m_name ; mutable wxTypeInfo* m_typeInfo ; + wxString m_typeName ; mutable wxTypeInfo* m_collectionElementTypeInfo ; + wxString m_collectionElementTypeName ; wxPropertyAccessor* m_accessor ; - wxxVariant m_defaultValue; + wxxVariant m_defaultValue; + wxPropertyInfoFlags m_flags ; + wxString m_helpString ; + wxString m_groupString ; // string representation of the default value // to be assigned by the designer to the property // when the component is dropped on the container. @@ -982,58 +1115,79 @@ private : WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo* , wxPropertyInfoMap , class WXDLLIMPEXP_BASE ) ; -#define WX_BEGIN_PROPERTIES_TABLE(theClass) \ +#define wxBEGIN_PROPERTIES_TABLE(theClass) \ wxPropertyInfo *theClass::GetPropertiesStatic() \ { \ typedef theClass class_t; \ static wxPropertyInfo* first = NULL ; -#define WX_END_PROPERTIES_TABLE() \ +#define wxEND_PROPERTIES_TABLE() \ return first ; } -#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 wxHIDE_PROPERTY( pname ) \ + static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#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 ) \ +#define wxPROPERTY( pname , type , setter , getter , defaultValue , flags , help , group) \ + wxSETTER( pname , class_t , type , setter ) \ static wxSetter##pname _setter##pname ; \ - WX_GETTER( pname , class_t , type , getter ) \ + wxGETTER( 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 ) ; + static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#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 ) \ +#define wxPROPERTY_FLAGS( pname , flags , type , setter , getter ,defaultValue , pflags , help , group) \ + wxSETTER( pname , class_t , type , setter ) \ static wxSetter##pname _setter##pname ; \ - WX_GETTER( pname , class_t , type , getter ) \ + wxGETTER( 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 ) ; + static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(flags).name() ,&_accessor##pname , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ; + +#define wxREADONLY_PROPERTY( pname , type , getter ,defaultValue , flags , help , group) \ + wxGETTER( 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() , wxT(#pname) , typeid(type).name() ,&_accessor##pname , wxxVariant(defaultValue), flags , help , group ) ; -#define WX_READONLY_PROPERTY( pname , type , getter ,defaultValue , flags , help , group) \ - WX_GETTER( pname , class_t , type , getter ) \ +#define wxREADONLY_PROPERTY_FLAGS( pname , flags , type , getter ,defaultValue , pflags , help , group) \ + wxGETTER( 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 ) ; + static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(flags).name() ,&_accessor##pname , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ; -#define WX_PROPERTY_COLLECTION( pname , colltype , addelemtype , adder , getter , flags , help , group ) \ - WX_ADDER( pname , class_t , addelemtype , adder ) \ +#define wxPROPERTY_COLLECTION( pname , colltype , addelemtype , adder , getter , flags , help , group ) \ + wxADDER( pname , class_t , addelemtype , adder ) \ static wxAdder##pname _adder##pname ; \ - WX_COLLECTION_GETTER( pname , class_t , colltype , getter ) \ + wxCOLLECTION_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 ) ; + static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#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 ) \ +#define wxREADONLY_PROPERTY_COLLECTION( pname , colltype , addelemtype , getter , flags , help , group) \ + wxCOLLECTION_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 ) ; + static wxPropertyInfo _propertyInfo##pname( first ,class_t::GetClassInfoStatic() , wxT(#pname) , typeid(colltype).name() ,typeid(addelemtype).name() ,&_accessor##pname , flags , help , group ) ; -#define WX_DELEGATE( name , eventType , eventClass ) \ +#define wxEVENT_PROPERTY( name , eventType , eventClass ) \ static wxDelegateTypeInfo _typeInfo##name( eventType , CLASSINFO( eventClass ) ) ; \ - static wxPropertyInfo _propertyInfo##name( first ,class_t::GetClassInfoStatic() , #name , &_typeInfo##name , NULL , wxxVariant() ) ; \ + static wxPropertyInfo _propertyInfo##name( first ,class_t::GetClassInfoStatic() , wxT(#name) , &_typeInfo##name , NULL , wxxVariant() ) ; \ + +#define wxEVENT_RANGE_PROPERTY( name , eventType , lastEventType , eventClass ) \ + static wxDelegateTypeInfo _typeInfo##name( eventType , lastEventType , CLASSINFO( eventClass ) ) ; \ + static wxPropertyInfo _propertyInfo##name( first , class_t::GetClassInfoStatic() , wxT(#name) , &_typeInfo##name , NULL , wxxVariant() ) ; \ + +// ---------------------------------------------------------------------------- +// Implementation Helper for Simple Properties +// ---------------------------------------------------------------------------- + +#define wxIMPLEMENT_PROPERTY(name, type) \ +private:\ + type m_##name; \ +public: \ + void Set##name( type const & p) { m_##name = p; } \ + type const & Get##name() const { return m_##name; } // ---------------------------------------------------------------------------- // Handler Info @@ -1093,16 +1247,16 @@ private : wxClassInfo* m_itsClass ; }; -#define WX_HANDLER(name,eventClassType) \ - static wxHandlerInfo _handlerInfo##name( first , class_t::GetClassInfoStatic() , #name , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ; +#define wxHANDLER(name,eventClassType) \ + static wxHandlerInfo _handlerInfo##name( first , class_t::GetClassInfoStatic() , wxT(#name) , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ; -#define WX_BEGIN_HANDLERS_TABLE(theClass) \ +#define wxBEGIN_HANDLERS_TABLE(theClass) \ wxHandlerInfo *theClass::GetHandlersStatic() \ { \ typedef theClass class_t; \ static wxHandlerInfo* first = NULL ; -#define WX_END_HANDLERS_TABLE() \ +#define wxEND_HANDLERS_TABLE() \ return first ; } // ---------------------------------------------------------------------------- @@ -1114,9 +1268,18 @@ private : class WXDLLIMPEXP_BASE wxConstructorBridge { public : - virtual void Create(wxObject *o, wxxVariant *args) = 0; + virtual void Create(wxObject * &o, wxxVariant *args) = 0; }; +// a direct constructor bridge calls the operator new for this class and +// passes all params to the constructor. needed for classes that cannot be +// instantiated using alloc-create semantics +class WXDLLIMPEXP_BASE wxDirectConstructorBrigde : public wxConstructorBridge +{ +public : + virtual void Create(wxObject * &o, wxxVariant *args) = 0; +} ; + // Creator Bridges for all Numbers of Params // no params @@ -1124,7 +1287,7 @@ public : template struct wxConstructorBridge_0 : public wxConstructorBridge { - void Create(wxObject *o, wxxVariant *) + void Create(wxObject * &o, wxxVariant *) { Class *obj = dynamic_cast(o); obj->Create(); @@ -1133,42 +1296,42 @@ struct wxConstructorBridge_0 : public wxConstructorBridge struct wxConstructorBridge_Dummy : public wxConstructorBridge { - void Create(wxObject *, wxxVariant *) + void Create(wxObject *&, wxxVariant *) { } } ; -#define WX_CONSTRUCTOR_0(klass) \ +#define wxCONSTRUCTOR_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* klass::ms_constructor = &constructor##klass ; \ + const wxChar *klass::ms_constructorProperties[] = { NULL } ; \ + const int klass::ms_constructorPropertiesCount = 0 ; -#define WX_CONSTRUCTOR_DUMMY(klass) \ +#define wxCONSTRUCTOR_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* klass::ms_constructor = &constructor##klass ; \ + const wxChar *klass::ms_constructorProperties[] = { NULL } ; \ + const int klass::ms_constructorPropertiesCount = 0 ; // 1 param template struct wxConstructorBridge_1 : public wxConstructorBridge { - void Create(wxObject *o, wxxVariant *args) + void Create(wxObject * &o, wxxVariant *args) { Class *obj = dynamic_cast(o); obj->Create( - args[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) + args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ); } }; -#define WX_CONSTRUCTOR_1(klass,t0,v0) \ +#define wxCONSTRUCTOR_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* klass::ms_constructor = &constructor##klass ; \ + const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) } ; \ + const int klass::ms_constructorPropertiesCount = 1 ; // 2 params @@ -1176,21 +1339,43 @@ template struct wxConstructorBridge_2 : public wxConstructorBridge { - void Create(wxObject *o, wxxVariant *args) + void Create(wxObject * &o, wxxVariant *args) { Class *obj = dynamic_cast(o); obj->Create( - args[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) , - args[1].WX_TEMPLATED_MEMBER_CALL(Get , T1) + args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) , + args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ); } }; -#define WX_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \ +#define wxCONSTRUCTOR_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* klass::ms_constructor = &constructor##klass ; \ + const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) } ; \ + const int klass::ms_constructorPropertiesCount = 2; + +// direct constructor version + +template +struct wxDirectConstructorBridge_2 : public wxDirectConstructorBrigde +{ + void Create(wxObject * &o, wxxVariant *args) + { + o = new Class( + args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) , + args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) + ); + } +}; + +#define wxDIRECT_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \ + wxDirectConstructorBridge_2 constructor##klass ; \ + wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \ + const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) } ; \ + const int klass::ms_constructorPropertiesCount = 2; + // 3 params @@ -1198,22 +1383,22 @@ template struct wxConstructorBridge_3 : public wxConstructorBridge { - void Create(wxObject *o, wxxVariant *args) + void Create(wxObject * &o, wxxVariant *args) { Class *obj = dynamic_cast(o); obj->Create( - 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[0].wxTEMPLATED_MEMBER_CALL(Get , T0) , + args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) , + args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ); } }; -#define WX_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \ +#define wxCONSTRUCTOR_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* klass::ms_constructor = &constructor##klass ; \ + const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) } ; \ + const int klass::ms_constructorPropertiesCount = 3 ; // 4 params @@ -1221,23 +1406,23 @@ template struct wxConstructorBridge_4 : public wxConstructorBridge { - void Create(wxObject *o, wxxVariant *args) + void Create(wxObject * &o, wxxVariant *args) { Class *obj = dynamic_cast(o); obj->Create( - 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[0].wxTEMPLATED_MEMBER_CALL(Get , T0) , + args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) , + args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) , + args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ); } }; -#define WX_CONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \ +#define wxCONSTRUCTOR_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* klass::ms_constructor = &constructor##klass ; \ + const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) , wxT(#v3) } ; \ + const int klass::ms_constructorPropertiesCount = 4 ; // 5 params @@ -1245,24 +1430,24 @@ template struct wxConstructorBridge_5 : public wxConstructorBridge { - void Create(wxObject *o, wxxVariant *args) + void Create(wxObject * &o, wxxVariant *args) { Class *obj = dynamic_cast(o); obj->Create( - 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[0].wxTEMPLATED_MEMBER_CALL(Get , T0) , + args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) , + args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) , + args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) , + args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ); } }; -#define WX_CONSTRUCTOR_5(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4) \ +#define wxCONSTRUCTOR_5(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4) \ wxConstructorBridge_5 constructor##klass ; \ - wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ - const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 } ; \ - const int klass::sm_constructorPropertiesCount##klass = 5; + wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \ + const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) , wxT(#v3) , wxT(#v4) } ; \ + const int klass::ms_constructorPropertiesCount = 5; // 6 params @@ -1270,48 +1455,50 @@ template struct wxConstructorBridge_6 : public wxConstructorBridge { - void Create(wxObject *o, wxxVariant *args) + void Create(wxObject * &o, wxxVariant *args) { Class *obj = dynamic_cast(o); obj->Create( - 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[0].wxTEMPLATED_MEMBER_CALL(Get , T0) , + args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) , + args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) , + args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) , + args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) , + args[5].wxTEMPLATED_MEMBER_CALL(Get , T5) ); } }; +#define wxCONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \ + wxConstructorBridge_6 constructor##klass ; \ + wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \ + const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) , wxT(#v3) , wxT(#v4) , wxT(#v5) } ; \ + const int klass::ms_constructorPropertiesCount = 6; + +// direct constructor version + template -struct wxDirectConstructorBridge_6 : public wxConstructorBridge +struct wxDirectConstructorBridge_6 : public wxDirectConstructorBrigde { - void Create(wxObject *o, wxxVariant *args) + 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) + o = new Class( + args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) , + args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) , + args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) , + args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) , + args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) , + args[5].wxTEMPLATED_MEMBER_CALL(Get , T5) ); } }; -#define WX_DIRECT_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \ +#define wxDIRECT_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 ; \ - const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 , #v5 } ; \ - const int klass::sm_constructorPropertiesCount##klass = 6; + wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \ + const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) , wxT(#v3) , wxT(#v4) , wxT(#v5) } ; \ + const int klass::ms_constructorPropertiesCount = 6; // 7 params @@ -1319,26 +1506,26 @@ template struct wxConstructorBridge_7 : public wxConstructorBridge { - void Create(wxObject *o, wxxVariant *args) + void Create(wxObject * &o, wxxVariant *args) { Class *obj = dynamic_cast(o); obj->Create( - 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[0].wxTEMPLATED_MEMBER_CALL(Get , T0) , + args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) , + args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) , + args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) , + args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) , + args[5].wxTEMPLATED_MEMBER_CALL(Get , T5) , + args[6].wxTEMPLATED_MEMBER_CALL(Get , T6) ); } }; -#define WX_CONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \ +#define wxCONSTRUCTOR_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; + wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \ + const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) , wxT(#v3) , wxT(#v4) , wxT(#v5) , wxT(#v6) } ; \ + const int klass::ms_constructorPropertiesCount = 7; // 8 params @@ -1346,27 +1533,27 @@ template struct wxConstructorBridge_8 : public wxConstructorBridge { - void Create(wxObject *o, wxxVariant *args) + void Create(wxObject * &o, wxxVariant *args) { Class *obj = dynamic_cast(o); obj->Create( - 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) + args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) , + args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) , + args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) , + args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) , + args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) , + args[5].wxTEMPLATED_MEMBER_CALL(Get , T5) , + args[6].wxTEMPLATED_MEMBER_CALL(Get , T6) , + args[7].wxTEMPLATED_MEMBER_CALL(Get , T7) ); } }; -#define WX_CONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \ +#define wxCONSTRUCTOR_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; + wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \ + const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) , wxT(#v3) , wxT(#v4) , wxT(#v5) , wxT(#v6) , wxT(#v7) } ; \ + const int klass::ms_constructorPropertiesCount = 8; // ---------------------------------------------------------------------------- // wxClassInfo // ---------------------------------------------------------------------------- @@ -1399,8 +1586,8 @@ public: wxVariantToObjectConverter _Converter2 , wxObjectToVariantConverter _Converter3 , wxObjectStreamingCallback _streamingCallback = NULL - ) : - + ) : + m_className(_ClassName), m_objectSize(size), m_objectConstructor(ctor), @@ -1408,7 +1595,7 @@ public: m_firstProperty(_Props), m_firstHandler(_Handlers), m_parents(_Parents), - m_unitName(_UnitName), + m_unitName(_UnitName), m_constructor(_Constructor), m_constructorProperties(_ConstructorProperties), m_constructorPropertiesCount(_ConstructorPropertiesCount), @@ -1422,7 +1609,7 @@ public: } wxClassInfo(const wxChar *_UnitName, const wxChar *_ClassName, - const wxClassInfo **_Parents) : + const wxClassInfo **_Parents) : m_className(_ClassName), m_objectSize(0), m_objectConstructor(NULL), @@ -1452,7 +1639,26 @@ public: // 'old naming' for AllocateObject staying here for backward compatibility wxObject *CreateObject() const { return AllocateObject() ; } + // direct construction call for classes that cannot construct instances via alloc/create + wxObject *ConstructObject(int ParamCount, wxxVariant *Params) const + { + if ( ParamCount != m_constructorPropertiesCount ) + { + wxLogError( _("Illegal Parameter Count for ConstructObject Method") ) ; + return NULL ; + } + wxObject *object = NULL ; + m_constructor->Create( object , Params ) ; + return object ; + } + + bool NeedsDirectConstruction() const { return dynamic_cast( m_constructor) != NULL ; } + const wxChar *GetClassName() const { return m_className; } + const wxChar *GetBaseClassName1() const + { return m_parents[0] ? m_parents[0]->GetClassName() : NULL; } + const wxChar *GetBaseClassName2() const + { return (m_parents[0] && m_parents[1]) ? m_parents[1]->GetClassName() : NULL; } const wxChar *GetIncludeName() const { return m_unitName ; } const wxClassInfo **GetParents() const { return m_parents; } int GetSize() const { return m_objectSize; } @@ -1491,13 +1697,13 @@ public: // gets the streaming callback from this class or any superclass wxObjectStreamingCallback GetStreamingCallback() const ; -#ifdef WXWIN_COMPATIBILITY_2_4 +#if WXWIN_COMPATIBILITY_2_4 // Initializes parent pointers and hash table for fast searching. - wxDEPRECATED( static void InitializeClasses() ); + wxDEPRECATED( static void InitializeClasses() ); // Cleans up hash table used for fast searching. - wxDEPRECATED( static void CleanUpClasses() ); + wxDEPRECATED( static void CleanUpClasses() ); #endif - static void CleanUp(); + static void CleanUp(); // returns the first property const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; } @@ -1509,7 +1715,11 @@ public: // initialized virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params) const { - wxASSERT_MSG( ParamCount == m_constructorPropertiesCount , wxT("Illegal Parameter Count for Create Method")) ; + if ( ParamCount != m_constructorPropertiesCount ) + { + wxLogError( _("Illegal Parameter Count for Create Method") ) ; + return ; + } m_constructor->Create( object , Params ) ; } @@ -1606,6 +1816,7 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); class WXDLLIMPEXP_BASE wxDynamicClassInfo : public wxClassInfo { + friend class WXDLLIMPEXP_BASE wxDynamicObject ; public : wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName , const wxClassInfo* superClass ) ; virtual ~wxDynamicClassInfo() ; @@ -1643,6 +1854,9 @@ public : // renames an existing runtime-handler void RenameHandler( const wxChar *oldHandlerName , const wxChar *newHandlerName ) ; +private : + struct wxDynamicClassInfoInternal ; + wxDynamicClassInfoInternal* m_data ; } ; // ---------------------------------------------------------------------------- @@ -1651,19 +1865,31 @@ public : #define _DECLARE_DYNAMIC_CLASS(name) \ public: \ - static wxClassInfo sm_class##name; \ - static const wxClassInfo* sm_classParents##name[] ; \ + static wxClassInfo ms_classInfo; \ + static const wxClassInfo* ms_classParents[] ; \ static wxPropertyInfo* GetPropertiesStatic() ; \ static wxHandlerInfo* GetHandlersStatic() ; \ static wxClassInfo *GetClassInfoStatic() \ -{ return &name::sm_class##name; } \ +{ return &name::ms_classInfo; } \ virtual wxClassInfo *GetClassInfo() const \ -{ return &name::sm_class##name; } +{ return &name::ms_classInfo; } +/* +#define _DECLARE_DYNAMIC_CLASS(name) \ + public: \ + static wxClassInfo ms_class##name; \ + static const wxClassInfo* ms_classParents##name[] ; \ + static wxPropertyInfo* GetPropertiesStatic() ; \ + static wxHandlerInfo* GetHandlersStatic() ; \ + static wxClassInfo *GetClassInfoStatic() \ +{ return &name::ms_class##name; } \ + virtual wxClassInfo *GetClassInfo() const \ +{ return &name::ms_class##name; } +*/ #define DECLARE_DYNAMIC_CLASS(name) \ - static wxConstructorBridge* sm_constructor##name ; \ - static const wxChar * sm_constructorProperties##name[] ; \ - static const int sm_constructorPropertiesCount##name ; \ + static wxConstructorBridge* ms_constructor ; \ + static const wxChar * ms_constructorProperties[] ; \ + static const int ms_constructorPropertiesCount ; \ _DECLARE_DYNAMIC_CLASS(name) #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name) \ @@ -1683,79 +1909,86 @@ 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 _TYPEINFO_CLASSES(n , toString , fromString ) \ + wxClassTypeInfo s_typeInfo##n(wxT_OBJECT , &n::ms_classInfo , toString , fromString , typeid(n).name()) ; \ + wxClassTypeInfo s_typeInfoPtr##n(wxT_OBJECT_PTR , &n::ms_classInfo , toString , fromString , typeid(n*).name()) ; #define _IMPLEMENT_DYNAMIC_CLASS(name, basename, unit , callback) \ wxObject* wxConstructorFor##name() \ { return new name; } \ - const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,NULL } ; \ - wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get() ; } \ + const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \ + wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ - wxClassInfo name::sm_class##name(sm_classParents##name , wxT(unit) , wxT(#name), \ + wxClassInfo name::ms_classInfo(name::ms_classParents , 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 , NULL , wxObjectToVariantConverter##name , callback); \ - _TYPEINFO_CLASSES(name) + name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties , \ + name::ms_constructorPropertiesCount , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name , callback); #define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit, callback ) \ 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() ; } \ + const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \ + wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return &data.wxTEMPLATED_MEMBER_CALL(Get , name) ; } \ + wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ - wxClassInfo name::sm_class##name(sm_classParents##name , wxT(unit) , wxT(#name), \ + wxClassInfo name::ms_classInfo(name::ms_classParents , 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, callback); \ - _TYPEINFO_CLASSES(name) + name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties, \ + name::ms_constructorPropertiesCount , wxVariantOfPtrToObjectConverter##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name, callback); #define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename ) \ _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , "" , NULL ) \ + _TYPEINFO_CLASSES(name, NULL , NULL) \ const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \ const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ - WX_CONSTRUCTOR_DUMMY( name ) + wxCONSTRUCTOR_DUMMY( name ) #define IMPLEMENT_DYNAMIC_CLASS( name , basename ) \ _IMPLEMENT_DYNAMIC_CLASS( name , basename , "" , NULL ) \ - wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \ + _TYPEINFO_CLASSES(name, NULL , NULL) \ + wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \ wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ - WX_CONSTRUCTOR_DUMMY( name ) + wxCONSTRUCTOR_DUMMY( name ) #define IMPLEMENT_DYNAMIC_CLASS_XTI( name , basename , unit ) \ - _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , NULL ) + _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , NULL ) \ + _TYPEINFO_CLASSES(name, NULL , NULL) #define IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK( name , basename , unit , callback ) \ - _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , &callback ) + _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , &callback ) \ + _TYPEINFO_CLASSES(name, NULL , NULL) #define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name , basename , unit ) \ - _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit , NULL ) + _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit , NULL ) \ + _TYPEINFO_CLASSES(name, NULL , NULL) + +#define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( name , basename , unit , toString , fromString ) \ + _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit , NULL ) \ + _TYPEINFO_CLASSES(name, toString , fromString) // 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 ) \ - const wxClassInfo* name::sm_classParents##name[] = { NULL } ; \ - wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name), \ + const wxClassInfo* name::ms_classParents[] = { NULL } ; \ + wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ 0 , 0 , 0 ); \ - _TYPEINFO_CLASSES(name) + _TYPEINFO_CLASSES(name, NULL , NULL) // this is for subclasses that still do not derive from wxobject #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name , basename, unit ) \ - const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,NULL } ; \ - wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name), \ + const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \ + wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ 0 , 0 , 0 ); \ - _TYPEINFO_CLASSES(name) + _TYPEINFO_CLASSES(name, NULL , NULL) // Multiple inheritance with two base classes @@ -1763,24 +1996,26 @@ public : #define _IMPLEMENT_DYNAMIC_CLASS2(name, basename, basename2, 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 ( wxxVariant &data ) { return data.Get() ; } \ + const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,&basename2::ms_classInfo , NULL } ; \ + wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ - wxClassInfo name::sm_class##name(sm_classParents##name , wxT(unit) , wxT(#name), \ + wxClassInfo name::ms_classInfo(name::ms_classParents , 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); \ - _TYPEINFO_CLASSES(name) + name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties , \ + name::ms_constructorPropertiesCount , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name); \ #define IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2) \ _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "") \ + _TYPEINFO_CLASSES(name, NULL , NULL) \ wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \ wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ - WX_CONSTRUCTOR_DUMMY( name ) + wxCONSTRUCTOR_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) \ + _TYPEINFO_CLASSES(name, NULL , NULL) + // ----------------------------------- // for abstract classes @@ -1789,16 +2024,16 @@ public : // Single inheritance with one base class #define _IMPLEMENT_ABSTRACT_CLASS(name, basename) \ - 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() ; } \ + const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \ + wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \ + wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ - wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name), \ + wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ 0 , wxVariantOfPtrToObjectConverter##name ,wxVariantToObjectConverter##name , wxObjectToVariantConverter##name); \ - _TYPEINFO_CLASSES(name) + _TYPEINFO_CLASSES(name, NULL , NULL) #define IMPLEMENT_ABSTRACT_CLASS( name , basename ) \ _IMPLEMENT_ABSTRACT_CLASS( name , basename ) \ @@ -1808,13 +2043,16 @@ public : // Multiple inheritance with two base classes #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \ - wxClassInfo name::sm_class##name(wxT(#name), wxT(#basename1), \ + wxClassInfo name::ms_classInfo(wxT(#name), wxT(#basename1), \ wxT(#basename2), (int) sizeof(name), \ (wxObjectConstructorFn) 0); #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2 +#define wxBEGIN_EVENT_TABLE( a , b ) BEGIN_EVENT_TABLE( a , b ) +#define wxEND_EVENT_TABLE() END_EVENT_TABLE() + // -------------------------------------------------------------------------- // Collection Support // --------------------------------------------------------------------------