/////////////////////////////////////////////////////////////////////////////
-// Name: wx/xti.hG
+// Name: wx/xti.h
// Purpose: runtime metadata information (extended class info)
// Author: Stefan Csomor
// Modified by:
#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.
#include "wx/string.h"
#include "wx/arrstr.h"
#include "wx/hashmap.h"
+#include "wx/log.h"
+#include "wx/intl.h"
#include <typeinfo>
// 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<type>()
-#define WX_TEMPLATED_MEMBER_FIX( type )
+# define wxTEMPLATED_MEMBER_CALL( method , type ) method<type>()
+# define wxTEMPLATED_MEMBER_FIX( type )
#else
-#define WX_TEMPLATED_MEMBER_CALL( method , type ) method((type*)NULL)
-#define WX_TEMPLATED_MEMBER_FIX( type ) type* =NULL
+# define wxTEMPLATED_MEMBER_CALL( method , type ) method(NULL)
+# define wxTEMPLATED_MEMBER_FIX( type ) type* =NULL
#endif
-class WXDLLIMPEXP_BASE wxObject;
-class WXDLLIMPEXP_BASE wxClassInfo;
-class WXDLLIMPEXP_BASE wxDynamicClassInfo;
-class WXDLLIMPEXP_BASE wxHashTable;
-class WXDLLIMPEXP_BASE wxObjectRefData;
-class WXDLLIMPEXP_BASE wxEvent;
+#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_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&);
+#if wxUSE_FUNC_TEMPLATE_POINTER
+# define wxTO_STRING(type) wxToStringConverter<type>
+# define wxTO_STRING_IMP(type)
+# define wxFROM_STRING(type) wxFromStringConverter<type>
+# 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<type>(data, result); }
+# define wxFROM_STRING(type) FromString##type
+# define wxFROM_STRING_IMP(type) inline void FromString##type( const wxString& data , wxxVariant &result ) { wxFromStringConverter<type>(data, result); }
+#endif
+
// ----------------------------------------------------------------------------
// Enum Support
//
// 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
// 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 ) { wxT(#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 ) \
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<e>() ;} \
- wxEnumTypeInfo s_typeInfo##e(wxT_ENUM , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &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
//
// 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
// ----------------------------------------------------------------------------
// 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<typename e>
void wxSetFromString(const wxString &s , wxBitset<e> &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) ;
}
}
}
-#define WX_IMPLEMENT_SET_STREAMING(SetName,e) \
+#define wxIMPLEMENT_SET_STREAMING(SetName,e) \
template<> void wxStringReadValue(const wxString &s , wxBitset<e> &data ) \
{ \
wxSetFromString( s , 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<SetName>().to_ulong() ;} \
- wxEnumTypeInfo s_typeInfo##SetName(wxT_SET , &s_enumData##e , &wxToStringConverter<SetName> , &wxFromStringConverter<SetName> , &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<typename e>
// 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) ;
}
}
}
-#define WX_BEGIN_FLAGS( e ) \
+#define wxBEGIN_FLAGS( e ) \
wxEnumMemberData s_enumDataMembers##e[] = {
-#define WX_FLAGS_MEMBER( v ) { wxT(#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 ) \
wxFlagsToString<e>( 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<e>().m_data ;} \
- wxEnumTypeInfo s_typeInfo##e(wxT_SET , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &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
// ----------------------------------------------------------------------------
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 ) ;
}
#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();
// 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( 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
- { wxASSERT_MSG( m_fromString , wxT("String conversions not supported") ) ; (*m_fromString)( data , result ) ; }
+ { 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 :
converterToString_t m_toString ;
converterFromString_t m_fromString ;
- static wxTypeInfoMap* sm_typeTable ;
+ static wxTypeInfoMap* ms_typeTable ;
wxTypeKind m_kind;
wxString m_name;
// 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( 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
- { wxASSERT_MSG( m_fromLong , wxT("Long conversions not supported") ) ; (*m_fromLong)( data , result ) ; }
+ { if( m_fromLong ) (*m_fromLong)( data , result ) ; else wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ) ;}
private :
converterToLong_t m_toLong ;
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 ;}
+ { m_elementTypeName = elementName ; m_elementType = NULL ;}
#if wxUSE_UNICODE
- wxCollectionTypeInfo( wxTypeInfo *elementType , converterToString_t to , converterFromString_t from , const char *name ) :
+ wxCollectionTypeInfo( const char *elementName , converterToString_t to , converterFromString_t from , const char *name ) :
wxTypeInfo( wxT_COLLECTION , to , from , name )
- { m_elementType = elementType ;}
+ { m_elementTypeName = wxString::FromAscii( elementName ) ; m_elementType = NULL ;}
#endif
- const wxTypeInfo* GetElementType() const { return m_elementType ; }
+ 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
{
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<typename T> 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
virtual wxxVariantData* Clone() const { return new wxxVariantDataT<T>( 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;
{
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<typename T> wxxVariant( const T& data , const wxString& name = wxT("") ) :
+ template<typename T> wxxVariant( const T& data , const wxString& name = wxEmptyString ) :
m_data(new wxxVariantDataT<T>(data) ), m_name(name) {}
~wxxVariant() { delete m_data ; }
// get a ref to the stored data
- template<typename T> T& Get(WX_TEMPLATED_MEMBER_FIX(T))
+ template<typename T> T& Get(wxTEMPLATED_MEMBER_FIX(T))
{
wxxVariantDataT<T> *dataptr = dynamic_cast<wxxVariantDataT<T>*> (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<typename T> const T& Get(WX_TEMPLATED_MEMBER_FIX(T)) const
+ template<typename T> const T& Get(wxTEMPLATED_MEMBER_FIX(T)) const
{
const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (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<typename T> bool HasData() const
+ template<typename T> bool HasData(wxTEMPLATED_MEMBER_FIX(T)) const
{
const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;
return dataptr != NULL ;
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 ;
}
wxString m_name ;
} ;
-#include <wx/dynarray.h>
+#include "wx/dynarray.h"
WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE);
void wxStringWriteValue( wxString &s , const T &data);
template<typename T>
-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<typename T>
-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
wxString m_name ;
} ;
-template<typename coll_t> void wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ;
+template<typename coll_t> void WXDLLIMPEXP_BASE wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ;
class WXDLLIMPEXP_BASE wxAdder
{
} ;
-
-#define WX_SETTER( property, Klass, valueType, setterMethod ) \
+#define wxSETTER( property, Klass, valueType, setterMethod ) \
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<Klass*>(object) ; \
- if ( variantValue.HasData<valueType>() ) \
- obj->setterMethod(variantValue.Get<valueType>()) ; \
+ if ( variantValue.wxTEMPLATED_MEMBER_CALL(HasData, valueType) ) \
+ obj->setterMethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \
else \
- obj->setterMethod(*variantValue.Get<valueType*>()) ; \
+ 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 : \
+ 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<const Klass*>(object) ; \
} \
} ;
-#define WX_ADDER( property, Klass, valueType , addermethod ) \
+#define wxADDER( property, Klass, valueType , addermethod ) \
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<Klass*>(object) ; \
- if ( variantValue.HasData<valueType>() ) \
- obj->addermethod(variantValue.Get<valueType>()) ; \
+ if ( variantValue.wxTEMPLATED_MEMBER_CALL(HasData, valueType) ) \
+ obj->addermethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \
else \
- obj->addermethod(*variantValue.Get<valueType*>()) ; \
+ 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 : \
+ 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<const Klass*>(object) ; \
// 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( wxGetTranslation(wxT("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( wxGetTranslation(wxT("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( wxGetTranslation(wxT("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( 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 ; }
{
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 ;
}
// 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( wxGetTranslation(wxT("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 ( wxGetTranslation(wxT("GetPropertyCollection called on a generic accessor")) ) ;}
private :
struct wxGenericPropertyAccessorInternal ;
wxGenericPropertyAccessorInternal* m_data ;
class WXDLLIMPEXP_BASE wxPropertyInfo
{
- friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ;
+ friend class WXDLLIMPEXP_FWD_BASE wxDynamicClassInfo ;
public :
wxPropertyInfo(wxPropertyInfo* &iter,
wxClassInfo* itsClass,
~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 ; }
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 the type info of this property
- const wxTypeInfo * GetTypeInfo() const
+ const wxTypeInfo * GetTypeInfo() const
{
if ( m_typeInfo == NULL )
m_typeInfo = wxTypeInfo::FindType(m_typeName) ;
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)
{
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 ;
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 ) \
+#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() , 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() , wxT(#pname) , typeid(flags).name() ,&_accessor##pname , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ;
-#define WX_READONLY_PROPERTY( pname , type , getter ,defaultValue , flags , help , group) \
- WX_GETTER( pname , class_t , type , getter ) \
+#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_FLAGS( pname , flags , type , getter ,defaultValue , pflags , 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() , 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() , 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() , 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() , 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
//
class WXDLLIMPEXP_BASE wxHandlerInfo
{
- friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ;
+ friend class WXDLLIMPEXP_FWD_BASE wxDynamicClassInfo ;
public :
wxHandlerInfo(wxHandlerInfo* &iter,
wxClassInfo* itsClass,
~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 ; }
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 ; }
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxConstructorBridge
{
public :
+ virtual ~wxConstructorBridge() {};
virtual void Create(wxObject * &o, wxxVariant *args) = 0;
};
}
} ;
-#define WX_CONSTRUCTOR_0(klass) \
+#define wxCONSTRUCTOR_0(klass) \
wxConstructorBridge_0<klass> 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
{
Class *obj = dynamic_cast<Class*>(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<klass,t0> 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
{
Class *obj = dynamic_cast<Class*>(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<klass,t0,t1> 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
void Create(wxObject * &o, wxxVariant *args)
{
o = new Class(
- 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_DIRECT_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
+#define wxDIRECT_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
wxDirectConstructorBridge_2<klass,t0,t1> 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
{
Class *obj = dynamic_cast<Class*>(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<klass,t0,t1,t2> 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 ;
+
+// direct constructor version
+
+template<typename Class,
+typename T0, typename T1, typename T2>
+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<klass,t0,t1,t2> 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
{
Class *obj = dynamic_cast<Class*>(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<klass,t0,t1,t2,t3> 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
{
Class *obj = dynamic_cast<Class*>(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<klass,t0,t1,t2,t3,t4> 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
{
Class *obj = dynamic_cast<Class*>(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 WX_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
+#define wxCONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
wxConstructorBridge_6<klass,t0,t1,t2,t3,t4,t5> 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
void Create(wxObject * &o, wxxVariant *args)
{
o = 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)
+ 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<klass,t0,t1,t2,t3,t4,t5> 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
{
Class *obj = dynamic_cast<Class*>(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<klass,t0,t1,t2,t3,t4,t5,t6> 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
{
Class *obj = dynamic_cast<Class*>(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<klass,t0,t1,t2,t3,t4,t5,t6,t7> 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
// ----------------------------------------------------------------------------
typedef wxObject* (*wxVariantToObjectConverter)( wxxVariant &data ) ;
typedef wxxVariant (*wxObjectToVariantConverter)( wxObject* ) ;
-class WXDLLIMPEXP_BASE wxWriter;
-class WXDLLIMPEXP_BASE wxPersister;
+class WXDLLIMPEXP_FWD_BASE wxWriter;
+class WXDLLIMPEXP_FWD_BASE wxPersister;
typedef bool (*wxObjectStreamingCallback) ( const wxObject *, wxWriter * , wxPersister * , wxxVariantArray & ) ;
class WXDLLIMPEXP_BASE wxClassInfo
{
- friend class WXDLLIMPEXP_BASE wxPropertyInfo ;
- friend class WXDLLIMPEXP_BASE wxHandlerInfo ;
+ friend class WXDLLIMPEXP_FWD_BASE wxPropertyInfo ;
+ friend class WXDLLIMPEXP_FWD_BASE wxHandlerInfo ;
+ friend wxObject *wxCreateDynamicObject(const wxString& name);
public:
wxClassInfo(const wxClassInfo **_Parents,
const wxChar *_UnitName,
// 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( wxGetTranslation(wxT("Illegal Parameter Count for ConstructObject Method")) ) ;
+ return NULL ;
+ }
wxObject *object = NULL ;
m_constructor->Create( object , Params ) ;
return object ;
bool NeedsDirectConstruction() const { return dynamic_cast<wxDirectConstructorBrigde*>( 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; }
+ bool IsDynamic() const { return (NULL != m_objectConstructor); }
wxObjectConstructorFn GetConstructor() const { return m_objectConstructor; }
static const wxClassInfo *GetFirst() { return sm_first; }
const wxClassInfo *GetNext() const { return m_next; }
- static wxClassInfo *FindClass(const wxChar *className);
+ static wxClassInfo *FindClass(const wxString& className);
// Climb upwards through inheritance hierarchy.
// Dual inheritance is catered for.
return false ;
}
+ DECLARE_CLASS_INFO_ITERATORS()
+
// if there is a callback registered with that class it will be called
// before this object will be written to disk, it can veto streaming out
// this object by returning false, if this class has not registered a
// gets the streaming callback from this class or any superclass
wxObjectStreamingCallback GetStreamingCallback() const ;
-#ifdef WXWIN_COMPATIBILITY_2_4
- // Initializes parent pointers and hash table for fast searching.
- wxDEPRECATED( static void InitializeClasses() );
- // Cleans up hash table used for fast searching.
- wxDEPRECATED( static void CleanUpClasses() );
-#endif
- static void CleanUp();
+ static void CleanUp();
// returns the first property
const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; }
// 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( wxGetTranslation(wxT("Illegal Parameter Count for Create Method")) ) ;
+ return ;
+ }
m_constructor->Create( object , Params ) ;
}
// 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 ) ; }
// 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;
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 :
- 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 ;
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
class WXDLLIMPEXP_BASE wxDynamicClassInfo : public wxClassInfo
{
+ friend class WXDLLIMPEXP_FWD_BASE wxDynamicObject ;
public :
wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName , const wxClassInfo* superClass ) ;
virtual ~wxDynamicClassInfo() ;
// renames an existing runtime-handler
void RenameHandler( const wxChar *oldHandlerName , const wxChar *newHandlerName ) ;
+private :
+ struct wxDynamicClassInfoInternal ;
+ wxDynamicClassInfoInternal* m_data ;
} ;
// ----------------------------------------------------------------------------
#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) \
// 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<name*>() ; } \
+ 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<name*> (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<name>() ; } \
- wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \
+ 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<name*> (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 ) \
_TYPEINFO_CLASSES(name, NULL , NULL) \
- const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
- const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
- WX_CONSTRUCTOR_DUMMY( name )
+ 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 ; } \
- WX_CONSTRUCTOR_DUMMY( name )
+ wxPropertyInfo *name::GetPropertiesStatic() { return NULL ; } \
+ wxHandlerInfo *name::GetHandlersStatic() { return NULL ; } \
+ wxCONSTRUCTOR_DUMMY( name )
#define IMPLEMENT_DYNAMIC_CLASS_XTI( name , basename , unit ) \
_IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , NULL ) \
// 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 , \
// 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 , \
// 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::sm_classParents##name[] = { &basename::sm_class##basename ,&basename2::sm_class##basename2 , NULL } ; \
- wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \
+ const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,&basename2::ms_classInfo , NULL } ; \
+ wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (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 , 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 ; } \
- WX_CONSTRUCTOR_DUMMY( name )
+ 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)
// 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<name*>() ; } \
- wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \
+ 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<name*> (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 , \
#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
#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
// --------------------------------------------------------------------------
}
-#endif
+#endif // _WX_XTIH__
projects / wxWidgets.git / blobdiff