Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xti macro fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-08-14 18:51:07 +00:00
parent 2be028e23c
commit 75890a3f39
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/wx/xti.h
View File

@@ -254,7 +254,7 @@ enum wxTypeKind
wxT_SET, // must be wxSet<> template wxT_SET, // must be wxSet<> template
wxT_ENUM, wxT_ENUM,
wxT_CUSTOM, // user defined type (e.g. wxPoint) wxT_CUSTOM, // user defined type (e.g. wxPoint)
wxT_LAST_SIMPLE_TYPE_KIND = wxT_CUSTOM , wxT_LAST_SIMPLE_TYPE_KIND = wxT_CUSTOM ,
wxT_OBJECT_PTR, // object reference wxT_OBJECT_PTR, // object reference
@@ -262,7 +262,7 @@ enum wxTypeKind
wxT_COLLECTION , // collection wxT_COLLECTION , // collection
wxT_DELEGATE , // for connecting against an event source wxT_DELEGATE , // for connecting against an event source
wxT_LAST_TYPE_KIND = wxT_DELEGATE // sentinel for bad data, asserts, debugging wxT_LAST_TYPE_KIND = wxT_DELEGATE // sentinel for bad data, asserts, debugging
}; };
@@ -517,7 +517,7 @@ public :
#endif #endif
wxPropertyAccessor() { m_setterName = NULL ; m_getterName = NULL ; m_adderName = NULL ;} wxPropertyAccessor() { m_setterName = NULL ; m_getterName = NULL ; m_adderName = NULL ;}
virtual ~wxPropertyAccessor() {} virtual ~wxPropertyAccessor() {}
// Setting a simple property (non-collection) // Setting a simple property (non-collection)
virtual void SetProperty(wxObject *object, const wxxVariant &value) const = 0 ; virtual void SetProperty(wxObject *object, const wxxVariant &value) const = 0 ;
@@ -525,11 +525,11 @@ public :
virtual wxxVariant GetProperty(const wxObject *object) const = 0 ; virtual wxxVariant GetProperty(const wxObject *object) const = 0 ;
// Adding an element to a collection property // Adding an element to a collection property
virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const
{ wxASSERT_MSG(0,wxT("Collection Operation called on non Collection Property")) ; } { wxASSERT_MSG(0,wxT("Collection Operation called on non Collection Property")) ; }
// Getting a collection property // Getting a collection property
virtual wxxVariantArray GetPropertyCollection( const wxObject *obj) const virtual wxxVariantArray GetPropertyCollection( const wxObject *obj) const
{ wxASSERT_MSG(0,wxT("Collection Operation called on non Collection Property")) ; return wxxVariantArray() ; } { wxASSERT_MSG(0,wxT("Collection Operation called on non Collection Property")) ; return wxxVariantArray() ; }
virtual bool HasSetter() const = 0 ; virtual bool HasSetter() const = 0 ;
@@ -552,7 +552,7 @@ class WXDLLIMPEXP_BASE wxGenericPropertyAccessor : public wxPropertyAccessor
{ {
public : public :
wxGenericPropertyAccessor( const wxChar* propertyName ) ; wxGenericPropertyAccessor( const wxChar* propertyName ) ;
~wxGenericPropertyAccessor() ; ~wxGenericPropertyAccessor() ;
virtual void SetProperty(wxObject *object, const wxxVariant &value) const ; virtual void SetProperty(wxObject *object, const wxxVariant &value) const ;
virtual wxxVariant GetProperty(const wxObject *object) const ; virtual wxxVariant GetProperty(const wxObject *object) const ;
@@ -723,7 +723,7 @@ public:
} }
// gets the property this accessor is responsible for from an object // gets the property this accessor is responsible for from an object
wxxVariantArray GetPropertyCollection(const wxObject *o) const wxxVariantArray GetPropertyCollection(const wxObject *o) const
{ {
const Klass *obj = dynamic_cast<const Klass*>(o); const Klass *obj = dynamic_cast<const Klass*>(o);
@@ -843,19 +843,19 @@ private :
return first ; } return first ; }
#if WX_XTI_TEMPLATE_FIX #if WX_XTI_TEMPLATE_FIX
#define WX_PROPERTY( name , type , setter , getter ,defaultValue ) \ #define WX_PROPERTY( name , type , setter , getter ,defaultValue ) \
static wxPropertyAccessorT<class_t , type> _accessor##name( &setter , &getter , #setter , #getter ) ; \ static wxPropertyAccessorT<class_t , type> _accessor##name( &setter , &getter , #setter , #getter ) ; \
static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ; static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
#define WX_PROPERTY_COLLECTION( name , colltype , addelemtype , adder , getter ) \ #define WX_PROPERTY_COLLECTION( name , colltype , addelemtype , adder , getter ) \
static wxPropertyCollectionAccessorT<class_t , colltype , addelemtype > _accessor##name( &adder , &getter , #adder , #getter ) ; \ static wxPropertyCollectionAccessorT<class_t , colltype , addelemtype > _accessor##name( &adder , &getter , #adder , #getter ) ; \
static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ; static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ;
#define WX_READONLY_PROPERTY_COLLECTION( name , colltype , addelemtype , getter ) \ #define WX_READONLY_PROPERTY_COLLECTION( name , colltype , addelemtype , getter ) \
static wxPropertyCollectionAccessorT<class_t , colltype , addelemtype > _accessor##name( NULL , &getter , #adder , #getter ) ; \ static wxPropertyCollectionAccessorT<class_t , colltype , addelemtype > _accessor##name( NULL , &getter , "" , #getter ) ; \
static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ; static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ;
#define WX_PROPERTY_SET_RET_BOOL( name , type , setter , getter ,defaultValue ) \ #define WX_PROPERTY_SET_RET_BOOL( name , type , setter , getter ,defaultValue ) \
static wxPropertyAccessorT<class_t , type> _accessor##name( (wxPropertyAccessor::SetRetBool*)NULL , &setter , &getter , #setter , #getter ) ; \ static wxPropertyAccessorT<class_t , type> _accessor##name( (wxPropertyAccessor::SetRetBool*)NULL , &setter , &getter , #setter , #getter ) ; \
@@ -1248,7 +1248,7 @@ public:
wxDEPRECATED( static void CleanUpClasses() ); wxDEPRECATED( static void CleanUpClasses() );
#endif #endif
static void CleanUp(); static void CleanUp();
// returns the first property // returns the first property
const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; } const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; }
@@ -1332,7 +1332,7 @@ private:
// InitializeClasses() helper // InitializeClasses() helper
static wxClassInfo *GetBaseByName(const wxChar *name) ; static wxClassInfo *GetBaseByName(const wxChar *name) ;
protected: protected:
// registers the class // registers the class
void Register(); void Register();