X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1296186133b677fdbaddfc1551b2b2c7321dac39..19b409860202ab9bdc27dab3d17f388c1a1d9717:/include/wx/xti.h diff --git a/include/wx/xti.h b/include/wx/xti.h index 8137aa64a8..45e474fa7c 100644 --- a/include/wx/xti.h +++ b/include/wx/xti.h @@ -13,10 +13,6 @@ #ifndef _WX_XTIH__ #define _WX_XTIH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "xti.h" -#endif - // We want to support properties, event sources and events sinks through // explicit declarations, using templates and specialization to make the // effort as painless as possible. @@ -70,7 +66,7 @@ # 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_CALL( method , type ) method(NULL) # define wxTEMPLATED_MEMBER_FIX( type ) type* =NULL #endif @@ -84,12 +80,14 @@ #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_FWD_BASE wxObject; +class WXDLLIMPEXP_FWD_BASE wxClassInfo; +class WXDLLIMPEXP_FWD_BASE wxDynamicClassInfo; +class WXDLLIMPEXP_FWD_BASE wxHashTable; +class WXDLLIMPEXP_FWD_BASE wxHashTable_Node; +class WXDLLIMPEXP_FWD_BASE wxObjectRefData; +class WXDLLIMPEXP_FWD_BASE wxEvent; +class WXDLLIMPEXP_FWD_BASE wxEvtHandler; typedef void (wxObject::*wxObjectEventFunction)(wxEvent&); @@ -243,7 +241,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) ; } @@ -303,7 +301,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) ; } @@ -370,8 +368,8 @@ enum wxTypeKind wxT_LAST_TYPE_KIND = wxT_DELEGATE // sentinel for bad data, asserts, debugging }; -class WXDLLIMPEXP_BASE wxxVariant ; -class WXDLLIMPEXP_BASE wxTypeInfo ; +class WXDLLIMPEXP_FWD_BASE wxxVariant ; +class WXDLLIMPEXP_FWD_BASE wxTypeInfo ; WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxTypeInfo* , wxTypeInfoMap , class WXDLLIMPEXP_BASE ) ; @@ -424,16 +422,24 @@ public : // convert a wxxVariant holding data of this type into a string void ConvertToString( const wxxVariant& data , wxString &result ) const - { if ( m_toString ) (*m_toString)( data , result ) ; else wxLogError( _("String conversions not supported") ) ; } + { if ( m_toString ) (*m_toString)( data , result ) ; else wxLogError( wxGetTranslation(wxT("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 - { if( m_fromString ) (*m_fromString)( data , result ) ; else wxLogError( _("String conversions not supported") ) ; } + { if( m_fromString ) (*m_fromString)( data , result ) ; else wxLogError( wxGetTranslation(wxT("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); + static wxTypeInfo *FindType(const wxString typeName) + { +#if wxUSE_UNICODE + return FindType( typeName.wchar_str() ); +#else + return FindType( typeName.char_str() ); +#endif + } private : @@ -497,11 +503,11 @@ public : // convert a wxxVariant holding data of this type into a long void ConvertToLong( const wxxVariant& data , long &result ) const - { if( m_toLong ) (*m_toLong)( data , result ) ; else wxLogError( _("Long Conversions not supported") ) ; } + { if( m_toLong ) (*m_toLong)( data , result ) ; else wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ) ; } // convert a long into a wxxVariant holding the corresponding data in this type void ConvertFromLong( long data , wxxVariant &result ) const - { if( m_fromLong ) (*m_fromLong)( data , result ) ; else wxLogError( _("Long Conversions not supported") ) ;} + { if( m_fromLong ) (*m_fromLong)( data , result ) ; else wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ) ;} private : converterToLong_t m_toLong ; @@ -616,7 +622,7 @@ public: virtual wxxVariantData* Clone() const { return new wxxVariantDataT( Get() ) ; } // returns the type info of the contentc - virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( (T*) NULL ) ; } + virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( NULL ) ; } private: T m_data; @@ -667,7 +673,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 ; } @@ -691,7 +698,7 @@ private : wxString m_name ; } ; -#include +#include "wx/dynarray.h" WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE); @@ -770,7 +777,7 @@ class wxSetter##property : public wxSetter \ public: \ wxINFUNC_CLASS_TYPE_FIX(Klass) \ wxSetter##property() : wxSetter( wxT(#setterMethod) ) {} \ - ~wxSetter##property() {} \ + virtual ~wxSetter##property() {} \ void Set( wxObject *object, const wxxVariant &variantValue ) const \ { \ Klass *obj = dynamic_cast(object) ; \ @@ -787,7 +794,7 @@ class wxGetter##property : public wxGetter \ public : \ wxINFUNC_CLASS_TYPE_FIX(Klass) \ wxGetter##property() : wxGetter( wxT(#gettermethod) ) {} \ - ~wxGetter##property() {} \ + virtual ~wxGetter##property() {} \ void Get( const wxObject *object , wxxVariant &result) const \ { \ const Klass *obj = dynamic_cast(object) ; \ @@ -801,7 +808,7 @@ class wxAdder##property : public wxAdder \ public: \ wxINFUNC_CLASS_TYPE_FIX(Klass) \ wxAdder##property() : wxAdder( wxT(#addermethod) ) {} \ - ~wxAdder##property() {} \ + virtual ~wxAdder##property() {} \ void Add( wxObject *object, const wxxVariant &variantValue ) const \ { \ Klass *obj = dynamic_cast(object) ; \ @@ -818,7 +825,7 @@ class wxCollectionGetter##property : public wxCollectionGetter \ public : \ wxINFUNC_CLASS_TYPE_FIX(Klass) \ wxCollectionGetter##property() : wxCollectionGetter( wxT(#gettermethod) ) {} \ - ~wxCollectionGetter##property() {} \ + virtual ~wxCollectionGetter##property() {} \ void Get( const wxObject *object , wxxVariantArray &result) const \ { \ const Klass *obj = dynamic_cast(object) ; \ @@ -836,19 +843,19 @@ public : // Setting a simple property (non-collection) virtual void SetProperty(wxObject *object, const wxxVariant &value) const - { if ( m_setter ) m_setter->Set( object , value ) ; else wxLogError( _("SetProperty called w/o valid setter") ) ;} + { if ( m_setter ) m_setter->Set( object , value ) ; else wxLogError( wxGetTranslation(wxT("SetProperty called w/o valid setter")) ) ;} // Getting a simple property (non-collection) virtual void GetProperty(const wxObject *object, wxxVariant &result) const - { if ( m_getter ) m_getter->Get( object , result ) ; else wxLogError( _("GetProperty called w/o valid getter") ) ;} + { if ( m_getter ) m_getter->Get( object , result ) ; else wxLogError( wxGetTranslation(wxT("GetProperty called w/o valid getter")) ) ;} // Adding an element to a collection property virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const - { if ( m_adder ) m_adder->Add( object , value ) ; else wxLogError( _("AddToPropertyCollection called w/o valid adder") ) ;} + { if ( m_adder ) m_adder->Add( object , value ) ; else wxLogError( wxGetTranslation(wxT("AddToPropertyCollection called w/o valid adder")) ) ;} // Getting a collection property virtual void GetPropertyCollection( const wxObject *obj, wxxVariantArray &result) const - { if ( m_collectionGetter ) m_collectionGetter->Get( obj , result) ; else wxLogError( _("GetPropertyCollection called w/o valid collection getter") ) ;} + { if ( m_collectionGetter ) m_collectionGetter->Get( obj , result) ; else wxLogError( wxGetTranslation(wxT("GetPropertyCollection called w/o valid collection getter")) ) ;} virtual bool HasSetter() const { return m_setter != NULL ; } virtual bool HasCollectionGetter() const { return m_collectionGetter != NULL ; } @@ -875,9 +882,10 @@ class WXDLLIMPEXP_BASE wxGenericPropertyAccessor : public wxPropertyAccessor { public : wxGenericPropertyAccessor( const wxString &propName ) ; - ~wxGenericPropertyAccessor() ; + virtual ~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 ; } @@ -896,11 +904,11 @@ public : // Adding an element to a collection property virtual void AddToPropertyCollection(wxObject *WXUNUSED(object), const wxxVariant &WXUNUSED(value)) const - { wxLogError( _("AddToPropertyCollection called on a generic accessor") ) ;} + { wxLogError( wxGetTranslation(wxT("AddToPropertyCollection called on a generic accessor")) ) ;} // Getting a collection property virtual void GetPropertyCollection( const wxObject *WXUNUSED(obj), wxxVariantArray &WXUNUSED(result)) const - { wxLogError ( _("GetPropertyCollection called on a generic accessor") ) ;} + { wxLogError ( wxGetTranslation(wxT("GetPropertyCollection called on a generic accessor")) ) ;} private : struct wxGenericPropertyAccessorInternal ; wxGenericPropertyAccessorInternal* m_data ; @@ -923,7 +931,7 @@ enum { class WXDLLIMPEXP_BASE wxPropertyInfo { - friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ; + friend class WXDLLIMPEXP_FWD_BASE wxDynamicClassInfo ; public : wxPropertyInfo(wxPropertyInfo* &iter, wxClassInfo* itsClass, @@ -1197,7 +1205,7 @@ public: \ class WXDLLIMPEXP_BASE wxHandlerInfo { - friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ; + friend class WXDLLIMPEXP_FWD_BASE wxDynamicClassInfo ; public : wxHandlerInfo(wxHandlerInfo* &iter, wxClassInfo* itsClass, @@ -1268,6 +1276,7 @@ private : class WXDLLIMPEXP_BASE wxConstructorBridge { public : + virtual ~wxConstructorBridge() {}; virtual void Create(wxObject * &o, wxxVariant *args) = 0; }; @@ -1400,6 +1409,28 @@ struct wxConstructorBridge_3 : public wxConstructorBridge const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) } ; \ const int klass::ms_constructorPropertiesCount = 3 ; +// direct constructor version + +template +struct wxDirectConstructorBridge_3 : 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) , + args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) + ); + } +}; + +#define wxDIRECT_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \ + wxDirectConstructorBridge_3 constructor##klass ; \ + 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 templateCreate( object , Params ) ; @@ -1763,7 +1792,7 @@ public: // puts all the properties of this class and its superclasses in the map, as long as there is not yet // an entry with the same name (overriding mechanism) void GetProperties( wxPropertyInfoMap &map ) const ; -public: +private: const wxChar *m_className; int m_objectSize; wxObjectConstructorFn m_objectConstructor; @@ -1774,8 +1803,6 @@ public: static wxClassInfo *sm_first; wxClassInfo *m_next; - // FIXME: this should be private (currently used directly by way too - // many clients) static wxHashTable *sm_classTable; protected : @@ -1794,20 +1821,16 @@ private: wxObjectStreamingCallback m_streamingCallback ; const wxPropertyAccessor *FindAccessor (const wxChar *propertyName) const ; - - // InitializeClasses() helper - static wxClassInfo *GetBaseByName(const wxChar *name) ; - protected: // registers the class void Register(); void Unregister(); - DECLARE_NO_COPY_CLASS(wxClassInfo) + wxDECLARE_NO_COPY_CLASS(wxClassInfo); }; -WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); +WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name); // ---------------------------------------------------------------------------- // wxDynamicObject @@ -1817,7 +1840,7 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); class WXDLLIMPEXP_BASE wxDynamicClassInfo : public wxClassInfo { - friend class WXDLLIMPEXP_BASE wxDynamicObject ; + friend class WXDLLIMPEXP_FWD_BASE wxDynamicObject ; public : wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName , const wxClassInfo* superClass ) ; virtual ~wxDynamicClassInfo() ; @@ -1942,15 +1965,15 @@ private : #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 ; } \ + const wxPropertyInfo *name::GetPropertiesStatic() { return NULL ; } \ + const wxHandlerInfo *name::GetHandlersStatic() { return NULL ; } \ wxCONSTRUCTOR_DUMMY( name ) #define IMPLEMENT_DYNAMIC_CLASS( name , basename ) \ _IMPLEMENT_DYNAMIC_CLASS( name , basename , "" , NULL ) \ _TYPEINFO_CLASSES(name, NULL , NULL) \ - wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \ - wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ + wxPropertyInfo *name::GetPropertiesStatic() { return NULL ; } \ + wxHandlerInfo *name::GetHandlersStatic() { return NULL ; } \ wxCONSTRUCTOR_DUMMY( name ) #define IMPLEMENT_DYNAMIC_CLASS_XTI( name , basename , unit ) \ @@ -1973,7 +1996,7 @@ private : #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name , unit ) \ const wxClassInfo* name::ms_classParents[] = { NULL } ; \ - wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name), \ + wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ @@ -1984,7 +2007,7 @@ private : #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name , basename, unit ) \ const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \ - wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name), \ + wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ @@ -1994,27 +2017,27 @@ private : // Multiple inheritance with two base classes -#define _IMPLEMENT_DYNAMIC_CLASS2(name, basename, basename2, unit) \ +#define _IMPLEMENT_DYNAMIC_CLASS2(name, basename, basename2, unit, callback) \ wxObject* wxConstructorFor##name() \ { return new name; } \ const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,&basename2::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::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) wxConstructorFor##name , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties , \ - name::ms_constructorPropertiesCount , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name); \ + name::ms_constructorPropertiesCount , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name , callback); #define IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2) \ - _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "") \ + _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "", NULL) \ _TYPEINFO_CLASSES(name, NULL , NULL) \ - wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \ - wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ + wxPropertyInfo *name::GetPropertiesStatic() { return NULL ; } \ + wxHandlerInfo *name::GetHandlersStatic() { return NULL ; } \ 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, NULL) \ _TYPEINFO_CLASSES(name, NULL , NULL) @@ -2029,7 +2052,7 @@ private : 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::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name), \ + wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name), \ (int) sizeof(name), \ (wxObjectConstructorFn) 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ @@ -2038,8 +2061,8 @@ private : #define IMPLEMENT_ABSTRACT_CLASS( name , basename ) \ _IMPLEMENT_ABSTRACT_CLASS( name , basename ) \ - wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \ - wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } + wxHandlerInfo *name::GetHandlersStatic() { return NULL ; } \ + wxPropertyInfo *name::GetPropertiesStatic() { return NULL ; } // Multiple inheritance with two base classes @@ -2077,4 +2100,4 @@ template void wxArrayCollectionToVariantArray( const coll } -#endif +#endif // _WX_XTIH__