X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9dabddc292a8066fd6bd172d1628589d61d5b791..cd30330fc67d0fe32f325ab16f2764cbd90d24af:/include/wx/xti.h?ds=inline diff --git a/include/wx/xti.h b/include/wx/xti.h index e6845c10cb..2eb3e35e22 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,41 +42,69 @@ #include "wx/string.h" #include "wx/arrstr.h" #include "wx/hashmap.h" +#include "wx/log.h" +#include "wx/intl.h" #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 wxTEMPLATED_MEMBER_CALL( method , type ) method() -#define wxTEMPLATED_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 +# 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 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; class WXDLLIMPEXP_BASE wxHashTable; class WXDLLIMPEXP_BASE wxObjectRefData; class WXDLLIMPEXP_BASE wxEvent; +class WXDLLIMPEXP_BASE wxEvtHandler; -typedef void (wxObject::*wxObjectEventFunction)(wxEvent&); +typedef void (wxEvtHandler::*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 @@ -146,8 +174,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 @@ -179,7 +209,7 @@ private : // ---------------------------------------------------------------------------- // in order to remove dependancy on string tokenizer -void wxSetStringToArray( const wxString &s , wxArrayString &array ) ; +void WXDLLIMPEXP_BASE wxSetStringToArray( const wxString &s , wxArrayString &array ) ; template void wxSetFromString(const wxString &s , wxBitset &data ) @@ -214,7 +244,7 @@ void wxSetToString( wxString &s , const wxBitset &data ) if ( data.test( value ) ) { // this could also be done by the templated calls - if ( !s.IsEmpty() ) + if ( !s.empty() ) s +=wxT("|") ; s += edata->GetEnumMemberNameByIndex(i) ; } @@ -231,8 +261,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 @@ -272,7 +304,7 @@ void wxFlagsToString( wxString &s , const e& data ) // clear the flags we just set dataValue &= ~value ; // this could also be done by the templated calls - if ( !s.IsEmpty() ) + if ( !s.empty() ) s +=wxT("|") ; s += edata->GetEnumMemberNameByIndex(i) ; } @@ -296,8 +328,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 // ---------------------------------------------------------------------------- @@ -357,8 +391,8 @@ public : } #if wxUSE_UNICODE wxTypeInfo(wxTypeKind kind, - converterToString_t to = NULL, converterFromString_t from = NULL, - const char *name = ""): + converterToString_t to, converterFromString_t from, + const char *name): m_toString(to), m_fromString(from), m_kind(kind), m_name(wxString::FromAscii(name)) { Register(); @@ -391,11 +425,11 @@ 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) ) ; } @@ -410,7 +444,7 @@ private : converterToString_t m_toString ; converterFromString_t m_fromString ; - static wxTypeInfoMap* sm_typeTable ; + static wxTypeInfoMap* ms_typeTable ; wxTypeKind m_kind; wxString m_name; @@ -464,11 +498,11 @@ public : // 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 ; @@ -500,8 +534,8 @@ public : wxTypeInfo( wxT_COLLECTION , to , from , name ) { m_elementTypeName = wxString::FromAscii( elementName ) ; m_elementType = NULL ;} #endif - const wxTypeInfo* GetElementType() const - { + const wxTypeInfo* GetElementType() const + { if ( m_elementType == NULL ) m_elementType = wxTypeInfo::FindType( m_elementTypeName ) ; return m_elementType ; } @@ -530,21 +564,23 @@ template const wxTypeInfo* wxGetTypeInfo( T * ) { return wxTypeInfo: // this macro is for usage with custom, non-object derived classes and structs, wxPoint is such a custom type +#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 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 wxILLEGAL_TYPE_SPECIALIZATION( a ) -/* - template<> const wxTypeInfo* wxGetTypeInfo( a * ) { assert(0) ; \ - static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ; return &s_typeInfo ; } \ - template<> void wxStringReadValue(const wxString & , a & ) { assert(0) ; }\ - template<> void wxStringWriteValue(wxString & , a const & ) { assert(0) ; } -*/ // ---------------------------------------------------------------------------- // wxxVariant as typesafe data holder @@ -591,10 +627,10 @@ class WXDLLIMPEXP_BASE wxxVariant { public : wxxVariant() { m_data = NULL ; } - wxxVariant( wxxVariantData* data , const wxString& name = wxT("") ) : m_data(data) , m_name(name) {} + wxxVariant( wxxVariantData* data , const wxString& name = wxEmptyString ) : m_data(data) , m_name(name) {} wxxVariant( const wxxVariant &d ) { if ( d.m_data ) m_data = d.m_data->Clone() ; else m_data = NULL ; m_name = d.m_name ; } - template wxxVariant( const T& data , const wxString& name = wxT("") ) : + template wxxVariant( const T& data , const wxString& name = wxEmptyString ) : m_data(new wxxVariantDataT(data) ), m_name(name) {} ~wxxVariant() { delete m_data ; } @@ -603,7 +639,7 @@ public : 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() ; } @@ -611,13 +647,13 @@ public : 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() ; } bool IsEmpty() const { return m_data == NULL ; } - template bool HasData() const + template bool HasData(wxTEMPLATED_MEMBER_FIX(T)) const { const wxxVariantDataT *dataptr = dynamic_cast*> (m_data) ; return dataptr != NULL ; @@ -632,7 +668,8 @@ public : wxxVariant& operator=(const wxxVariant &d) { - m_data = d.m_data->Clone() ; + delete m_data; + m_data = d.m_data ? d.m_data->Clone() : NULL ; m_name = d.m_name ; return *this ; } @@ -669,10 +706,10 @@ template void wxStringWriteValue( wxString &s , const T &data); template -void wxToStringConverter( const wxxVariant &v, wxString &s) { wxStringWriteValue( s , v.wxTEMPLATED_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 @@ -715,7 +752,7 @@ private : wxString m_name ; } ; -template void wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ; +template void WXDLLIMPEXP_BASE wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ; class WXDLLIMPEXP_BASE wxAdder { @@ -729,20 +766,20 @@ private : } ; - #define wxSETTER( property, Klass, valueType, setterMethod ) \ class wxSetter##property : public wxSetter \ { \ public: \ + 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*)) ; \ } \ } ; @@ -750,6 +787,7 @@ public: \ class wxGetter##property : public wxGetter \ { \ public : \ + wxINFUNC_CLASS_TYPE_FIX(Klass) \ wxGetter##property() : wxGetter( wxT(#gettermethod) ) {} \ ~wxGetter##property() {} \ void Get( const wxObject *object , wxxVariant &result) const \ @@ -763,15 +801,16 @@ public : \ class wxAdder##property : public wxAdder \ { \ public: \ + 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*)) ; \ } \ } ; @@ -779,6 +818,7 @@ public: \ class wxCollectionGetter##property : public wxCollectionGetter \ { \ public : \ + wxINFUNC_CLASS_TYPE_FIX(Klass) \ wxCollectionGetter##property() : wxCollectionGetter( wxT(#gettermethod) ) {} \ ~wxCollectionGetter##property() {} \ void Get( const wxObject *object , wxxVariantArray &result) const \ @@ -798,19 +838,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 ; } @@ -839,7 +879,8 @@ public : wxGenericPropertyAccessor( const wxString &propName ) ; ~wxGenericPropertyAccessor() ; - void RenameProperty( const wxString &oldName , const wxString &newName ) + void RenameProperty( const wxString& WXUNUSED_UNLESS_DEBUG(oldName), + const wxString& newName ) { wxASSERT( oldName == m_propertyName ) ; m_propertyName = newName ; } @@ -858,11 +899,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 ; @@ -1004,13 +1045,13 @@ public : ~wxPropertyInfo() ; // return the class this property is declared in - const wxClassInfo* GetDeclaringClass() const { return m_itsClass ; } + const wxClassInfo* GetDeclaringClass() const { return m_itsClass ; } // return the name of this property - const wxString& GetName() const { return m_name ; } + const wxString& GetName() const { return m_name ; } // returns the flags of this property - wxPropertyInfoFlags GetFlags() const { return m_flags ;} + wxPropertyInfoFlags GetFlags() const { return m_flags ;} // returns the short help string of this property const wxString& GetHelpString() const { return m_helpString ; } @@ -1019,7 +1060,7 @@ 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) ; @@ -1027,7 +1068,7 @@ public : } // 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) ; @@ -1041,7 +1082,7 @@ public : wxPropertyInfo* GetNext() const { return m_next ; } // returns the default value of this property, its kind may be wxT_VOID if it is not valid - wxxVariant GetDefaultValue() const { return m_defaultValue ; } + wxxVariant GetDefaultValue() const { return m_defaultValue ; } private : void Insert(wxPropertyInfo* &iter) { @@ -1065,7 +1106,7 @@ private : 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 ; @@ -1089,7 +1130,7 @@ WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo* , wxPropertyInfoMap , clas #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 wxPROPERTY( pname , type , setter , getter ,defaultValue , flags , help , group) \ +#define wxPROPERTY( pname , type , setter , getter , defaultValue , flags , help , group) \ wxSETTER( pname , class_t , type , setter ) \ static wxSetter##pname _setter##pname ; \ wxGETTER( pname , class_t , type , getter ) \ @@ -1187,13 +1228,13 @@ public : ~wxHandlerInfo() ; // return the name of this handler - const wxString& GetName() const { return m_name ; } + const wxString& GetName() const { return m_name ; } // return the class info of the event - const wxClassInfo * GetEventClassInfo() const { return m_eventClassInfo ; } + const wxClassInfo *GetEventClassInfo() const { return m_eventClassInfo ; } // get the handler function pointer - wxObjectEventFunction GetEventFunction() const { return m_eventFunction ; } + wxObjectEventFunction GetEventFunction() const { return m_eventFunction ; } // returns NULL if this is the last handler of this class wxHandlerInfo* GetNext() const { return m_next ; } @@ -1210,7 +1251,7 @@ private : }; #define wxHANDLER(name,eventClassType) \ - static wxHandlerInfo _handlerInfo##name( first , class_t::GetClassInfoStatic() , #name , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ; + static wxHandlerInfo _handlerInfo##name( first , class_t::GetClassInfoStatic() , wxT(#name) , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ; #define wxBEGIN_HANDLERS_TABLE(theClass) \ wxHandlerInfo *theClass::GetHandlersStatic() \ @@ -1265,15 +1306,15 @@ struct wxConstructorBridge_Dummy : public wxConstructorBridge #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 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 @@ -1291,9 +1332,9 @@ struct wxConstructorBridge_1 : public wxConstructorBridge #define wxCONSTRUCTOR_1(klass,t0,v0) \ wxConstructorBridge_1 constructor##klass ; \ - wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ - const wxChar *klass::sm_constructorProperties##klass[] = { wxT(#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 @@ -1313,9 +1354,9 @@ struct wxConstructorBridge_2 : public wxConstructorBridge #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[] = { wxT(#v0) , wxT(#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 @@ -1334,9 +1375,9 @@ struct wxDirectConstructorBridge_2 : public wxDirectConstructorBrigde #define wxDIRECT_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \ wxDirectConstructorBridge_2 constructor##klass ; \ - wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \ - const wxChar *klass::sm_constructorProperties##klass[] = { wxT(#v0) , wxT(#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; // 3 params @@ -1358,9 +1399,9 @@ struct wxConstructorBridge_3 : public wxConstructorBridge #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[] = { wxT(#v0) , wxT(#v1) , wxT(#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 @@ -1382,9 +1423,9 @@ struct wxConstructorBridge_4 : public wxConstructorBridge #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[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) , wxT(#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 @@ -1407,9 +1448,9 @@ struct wxConstructorBridge_5 : public wxConstructorBridge #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[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) , wxT(#v3) , wxT(#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 @@ -1433,9 +1474,9 @@ struct wxConstructorBridge_6 : public wxConstructorBridge #define wxCONSTRUCTOR_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[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) , wxT(#v3) , wxT(#v4) , wxT(#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; // direct constructor version @@ -1458,9 +1499,9 @@ struct wxDirectConstructorBridge_6 : public wxDirectConstructorBrigde #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[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) , wxT(#v3) , wxT(#v4) , wxT(#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 @@ -1485,9 +1526,9 @@ struct wxConstructorBridge_7 : public wxConstructorBridge #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[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) , wxT(#v3) , wxT(#v4) , wxT(#v5) , wxT(#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 @@ -1513,9 +1554,9 @@ struct wxConstructorBridge_8 : public wxConstructorBridge #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[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) , wxT(#v3) , wxT(#v4) , wxT(#v5) , wxT(#v6) , wxT(#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 // ---------------------------------------------------------------------------- @@ -1604,7 +1645,11 @@ public: // direct construction call for classes that cannot construct instances via alloc/create wxObject *ConstructObject(int ParamCount, wxxVariant *Params) const { - wxASSERT_MSG( ParamCount == m_constructorPropertiesCount , wxT("Illegal Parameter Count for ConstructObject Method")) ; + if ( ParamCount != m_constructorPropertiesCount ) + { + wxLogError( _("Illegal Parameter Count for ConstructObject Method") ) ; + return NULL ; + } wxObject *object = NULL ; m_constructor->Create( object , Params ) ; return object ; @@ -1655,13 +1700,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 ; } @@ -1673,7 +1718,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 ) ; } @@ -1693,10 +1742,11 @@ public: // we must be able to cast variants to wxObject pointers, templates seem not to be suitable wxObject* VariantToInstance( wxxVariant &data ) const - { if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT ) - return m_variantToObjectConverter( data ) ; - else - return m_variantOfPtrToObjectConverter( data ) ; + { + if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT ) + return m_variantToObjectConverter( data ) ; + else + return m_variantOfPtrToObjectConverter( data ) ; } wxxVariant InstanceToVariant( wxObject *object ) const { return m_objectToVariantConverter( object ) ; } @@ -1732,15 +1782,15 @@ public: static wxHashTable *sm_classTable; protected : - wxPropertyInfo * m_firstProperty ; - wxHandlerInfo * m_firstHandler ; + wxPropertyInfo * m_firstProperty ; + wxHandlerInfo * m_firstHandler ; private: - const wxClassInfo** m_parents ; - const wxChar* m_unitName; + const wxClassInfo** m_parents ; + const wxChar* m_unitName; - wxConstructorBridge* m_constructor ; - const wxChar ** m_constructorProperties ; - const int m_constructorPropertiesCount ; + wxConstructorBridge* m_constructor ; + const wxChar ** m_constructorProperties ; + const int m_constructorPropertiesCount ; wxVariantToObjectConverter m_variantOfPtrToObjectConverter ; wxVariantToObjectConverter m_variantToObjectConverter ; wxObjectToVariantConverter m_objectToVariantConverter ; @@ -1770,6 +1820,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() ; @@ -1807,6 +1858,9 @@ public : // renames an existing runtime-handler void RenameHandler( const wxChar *oldHandlerName , const wxChar *newHandlerName ) ; +private : + struct wxDynamicClassInfoInternal ; + wxDynamicClassInfoInternal* m_data ; } ; // ---------------------------------------------------------------------------- @@ -1815,19 +1869,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) \ @@ -1848,33 +1914,33 @@ public : // Single inheritance with one base class #define _TYPEINFO_CLASSES(n , toString , fromString ) \ - wxClassTypeInfo s_typeInfo##n(wxT_OBJECT , &n::sm_class##n , toString , fromString , typeid(n).name()) ; \ - wxClassTypeInfo s_typeInfoPtr##n(wxT_OBJECT_PTR , &n::sm_class##n , toString , fromString , typeid(n*).name()) ; + 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); + 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); + 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 ) \ @@ -1909,8 +1975,8 @@ public : // 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 , wxEmptyString , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ @@ -1920,8 +1986,8 @@ public : // 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 , wxEmptyString , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ @@ -1934,14 +2000,14 @@ 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); \ + 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 , "") \ @@ -1962,11 +2028,11 @@ 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 , wxEmptyString , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ @@ -1981,7 +2047,7 @@ 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);