use univ/setup.h when building wxUniv

[wxWidgets.git] / include / wx / xti.h

diff --git a/include/wx/xti.h b/include/wx/xti.h
index dbb94294b5e5b117f2bb2452a4554cf8f67d1f70..75b4c8215175449776de8879922ca8a544a32df1 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -2,7 +2,7 @@
 // Name:        wx/xti.h
 // Purpose:     runtime metadata information (extended class info)
 // Author:      Stefan Csomor
 // Name:        wx/xti.h
 // Purpose:     runtime metadata information (extended class info)
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Julian Smart
 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Julian Smart


@@ -13,20 +13,20 @@
 #ifndef _WX_XTIH__
 #define _WX_XTIH__
 
 #ifndef _WX_XTIH__
 #define _WX_XTIH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#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
 #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. 
+// effort as painless as possible.

 //
 // This means we have the following domains :
 //
 // - Type Information for categorizing built in types as well as custom types
 // this includes information about enums, their values and names
 // - Type safe value storage : a kind of wxVariant, called right now wxxVariant
 //
 // This means we have the following domains :
 //
 // - Type Information for categorizing built in types as well as custom types
 // this includes information about enums, their values and names
 // - Type safe value storage : a kind of wxVariant, called right now wxxVariant

-// which will be merged with wxVariant 
+// which will be merged with wxVariant

 // - Property Information and Property Accessors providing access to a class'
 // values and exposed event delegates
 // - Information about event handlers
 // - Property Information and Property Accessors providing access to a class'
 // values and exposed event delegates
 // - Information about event handlers


@@ -40,6 +40,20 @@
 #include "wx/memory.h"
 #include "wx/set.h"
 #include "wx/string.h"
 #include "wx/memory.h"
 #include "wx/set.h"
 #include "wx/string.h"

+#include "wx/arrstr.h"
+
+// some compilers have troubles getting the correct wxPropertyAccessorT constructor
+// set this to 1 to make things work for these, too
+
+#ifndef WX_XTI_TEMPLATE_FIX
+#define WX_XTI_TEMPLATE_FIX 0
+#endif
+
+#if WX_XTI_TEMPLATE_FIX
+#define WX_XTI_PARAM_FIX(a,b) a,b
+#else
+#define WX_XTI_PARAM_FIX(a,b)
+#endif

 
 class WXDLLIMPEXP_BASE wxObject;
 class WXDLLIMPEXP_BASE wxClassInfo;
 
 class WXDLLIMPEXP_BASE wxObject;
 class WXDLLIMPEXP_BASE wxClassInfo;


@@ -52,7 +66,7 @@ typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
 // ----------------------------------------------------------------------------
 // Enum Support
 //
 // ----------------------------------------------------------------------------
 // Enum Support
 //

-// In the header files there would no change from pure c++ code, in the 
+// In the header files there would no change from pure c++ code, in the

 // implementation, an enum would have
 // to be enumerated eg :
 //
 // implementation, an enum would have
 // to be enumerated eg :
 //


@@ -65,84 +79,93 @@ typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
 
 struct WXDLLIMPEXP_BASE wxEnumMemberData
 {
 
 struct WXDLLIMPEXP_BASE wxEnumMemberData
 {

-    const wxChar*      m_name;
-    int                                m_value;
+    const wxChar*   m_name;
+    int             m_value;

 };
 
 class WXDLLIMPEXP_BASE wxEnumData
 {
 public :
 };
 
 class WXDLLIMPEXP_BASE wxEnumData
 {
 public :

-       wxEnumData( wxEnumMemberData* data ) ;
-
-       // 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 ) ;
-       
-       // 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 );
-       
-       // returns the name of the enum member having the passed in value
-       // returns an emtpy string if not found
+    wxEnumData( wxEnumMemberData* data ) ;
+
+    // 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 ) ;
+
+    // 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 );
+
+    // 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);

-       
-       // returns the number of members in this enum
-       int GetEnumCount() { return m_count ; }
-       
-       // returns the value of the nth member
-       int GetEnumMemberValueByIndex( int n ) ;
-       
-       // returns the value of the nth member
-       const wxChar *GetEnumMemberNameByIndex( int n ) ;
+
+    // returns the number of members in this enum
+    int GetEnumCount() { return m_count ; }
+
+    // returns the value of the nth member
+    int GetEnumMemberValueByIndex( int n ) ;
+
+    // returns the value of the nth member
+    const wxChar *GetEnumMemberNameByIndex( int n ) ;

 private :
     wxEnumMemberData *m_members;
 private :
     wxEnumMemberData *m_members;

-       int m_count ;
+    int m_count ;

 };
 
 #define WX_BEGIN_ENUM( e ) \
 };
 
 #define WX_BEGIN_ENUM( e ) \

-       wxEnumMemberData s_enumDataMembers##e[] = {
+    wxEnumMemberData s_enumDataMembers##e[] = {

 
 #define WX_ENUM_MEMBER( v ) { #v, v } ,
 
 #define WX_END_ENUM( e ) { NULL , 0 } } ; \
 
 #define WX_ENUM_MEMBER( v ) { #v, v } ,
 
 #define WX_END_ENUM( e ) { NULL , 0 } } ; \

-       wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \
-       wxEnumData *wxGetEnumData(e) { return &s_enumData##e ; } \
-       template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxEnumTypeInfo s_typeInfo(wxT_ENUM , &s_enumData##e) ; return &s_typeInfo ; } \
-       template<> void wxStringReadValue(const wxString& s , e &data ) \
-       { \
-               data = (e) s_enumData##e.GetEnumMemberValue(s) ; \
-       } \
-       template<> void wxStringWriteValue(wxString &s , const e &data ) \
-       { \
-               s =  s_enumData##e.GetEnumMemberName((int)data) ; \
-       }
+    wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \
+    wxEnumData *wxGetEnumData(e) { return &s_enumData##e ; } \
+    template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxEnumTypeInfo s_typeInfo(wxT_ENUM , &s_enumData##e) ; return &s_typeInfo ; } \
+    template<> void wxStringReadValue(const wxString& s , e &data ) \
+    { \
+        data = (e) s_enumData##e.GetEnumMemberValue(s) ; \
+    } \
+    template<> void wxStringWriteValue(wxString &s , const e &data ) \
+    { \
+        s =  s_enumData##e.GetEnumMemberName((int)data) ; \
+    } \
+    template<> const wxTypeInfo* wxGetTypeInfo( e ** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; assert(0) ; return &s_typeInfo ; } \
+    template<> void wxStringReadValue(const wxString&  , e* & ) \
+    { \
+        assert(0) ; \
+    } \
+    template<> void wxStringWriteValue(wxString &s , e* const & ) \
+    { \
+        assert(0) ; \
+    }

 
 // ----------------------------------------------------------------------------
 // Set Support
 
 // ----------------------------------------------------------------------------
 // Set Support

-// 
+//

 // in the header :
 // in the header :

-// 
+//

 // enum wxFlavor
 // enum wxFlavor

-// {  
-//     Vanilla,
-//     Chocolate,
-//     Strawberry,
+// {
+//  Vanilla,
+//  Chocolate,
+//  Strawberry,

 // };
 // };

-// 
+//

 // typedef wxSet<wxFlavor> wxCoupe ;
 // typedef wxSet<wxFlavor> wxCoupe ;

-// 
+//

 // in the implementation file :
 // in the implementation file :

-// 
+//

 // WX_BEGIN_ENUM( wxFlavor )
 // WX_BEGIN_ENUM( wxFlavor )

-//     WX_ENUM_MEMBER( Vanilla )
-//     WX_ENUM_MEMBER( Chocolate )
-//     WX_ENUM_MEMBER( Strawberry )
+//  WX_ENUM_MEMBER( Vanilla )
+//  WX_ENUM_MEMBER( Chocolate )
+//  WX_ENUM_MEMBER( Strawberry )

 // WX_END_ENUM( wxFlavor )
 // WX_END_ENUM( wxFlavor )

-// 
-// WX_IMPLEMENT_SET_STREAMING( wxCoupe , wxFlavor ) 

 //
 //

-// implementation note : no partial specialization for streaming, but a delegation to a 
+// WX_IMPLEMENT_SET_STREAMING( wxCoupe , wxFlavor )
+//
+// implementation note : no partial specialization for streaming, but a delegation to a

 // different class
 //
 // ----------------------------------------------------------------------------
 // different class
 //
 // ----------------------------------------------------------------------------


@@ -151,62 +174,69 @@ private :
 void wxSetStringToArray( const wxString &s , wxArrayString &array ) ;
 
 template<typename e>
 void wxSetStringToArray( const wxString &s , wxArrayString &array ) ;
 
 template<typename e>

-void wxSetFromString(const wxString &s , wxSet<e> &data )  
+void wxSetFromString(const wxString &s , wxSet<e> &data )

 {
 {

-       wxEnumData* edata = wxGetEnumData((e) 0) ;
-       data.Clear() ;
+    wxEnumData* edata = wxGetEnumData((e) 0) ;
+    data.Clear() ;

 
 

-       wxArrayString array ;
-       wxSetStringToArray( s , array ) ;
+    wxArrayString array ;
+    wxSetStringToArray( s , array ) ;

     wxString flag;
     for ( int i = 0 ; i < array.Count() ; ++i )
     {
         flag = array[i] ;
     wxString flag;
     for ( int i = 0 ; i < array.Count() ; ++i )
     {
         flag = array[i] ;

-               int ivalue ;
-               if ( edata->HasEnumMemberValue( flag , &ivalue ) )
-               {
-                       data.Set( (e) ivalue ) ;
-               }
+        int ivalue ;
+        if ( edata->HasEnumMemberValue( flag , &ivalue ) )
+        {
+            data.Set( (e) ivalue ) ;
+        }

     }
 }
 
 template<typename e>
 void wxSetToString( wxString &s , const wxSet<e> &data )
 {
     }
 }
 
 template<typename e>
 void wxSetToString( wxString &s , const wxSet<e> &data )
 {

-       wxEnumData* edata = wxGetEnumData((e) 0) ;
-       int count = edata->GetEnumCount() ;
-       int i ;
-       s.Clear() ;
-       for ( i = 0 ; i < count ; i++ )
-       {
-               e value = (e) edata->GetEnumMemberValueByIndex(i) ;
-               if ( data.Contains( value ) )
-               {
-                       // this could also be done by the templated calls
-                       if ( !s.IsEmpty() )
-                               s +="|" ;
-                       s += edata->GetEnumMemberNameByIndex(i) ;
-               }
-       }
+    wxEnumData* edata = wxGetEnumData((e) 0) ;
+    int count = edata->GetEnumCount() ;
+    int i ;
+    s.Clear() ;
+    for ( i = 0 ; i < count ; i++ )
+    {
+        e value = (e) edata->GetEnumMemberValueByIndex(i) ;
+        if ( data.Contains( value ) )
+        {
+            // this could also be done by the templated calls
+            if ( !s.IsEmpty() )
+                s +="|" ;
+            s += edata->GetEnumMemberNameByIndex(i) ;
+        }
+    }

 }
 
 //  if the wxSet specialization above does not work for all compilers, add this to the WX_IMPLEMENT_SET_STREAMING macro
 }
 
 //  if the wxSet specialization above does not work for all compilers, add this to the WX_IMPLEMENT_SET_STREAMING macro

-//     template<> const wxTypeInfo* wxGetTypeInfo( SetName * ){ static wxEnumTypeInfo s_typeInfo(wxT_SET , &s_enumData##e) ; return &s_typeInfo ; }\
+//  template<> const wxTypeInfo* wxGetTypeInfo( SetName * ){ static wxEnumTypeInfo s_typeInfo(wxT_SET , &s_enumData##e) ; return &s_typeInfo ; }

 
 #define WX_IMPLEMENT_SET_STREAMING(SetName,e) \
 
 #define WX_IMPLEMENT_SET_STREAMING(SetName,e) \

-       template<> void wxStringReadValue(const wxString &s , wxSet<e> &data ) \
-       { \
-               wxSetFromString( s , data ) ; \
-       } \
-       template<> void wxStringWriteValue( wxString &s , const wxSet<e> &data ) \
-       { \
-               wxSetToString( s , data ) ; \
-       } \
+    template<> void wxStringReadValue(const wxString &s , wxSet<e> &data ) \
+    { \
+        wxSetFromString( s , data ) ; \
+    } \
+    template<> void wxStringWriteValue( wxString &s , const wxSet<e> &data ) \
+    { \
+        wxSetToString( s , data ) ; \
+    } \

 
 
 // ----------------------------------------------------------------------------
 // Type Information
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Type Information
 // ----------------------------------------------------------------------------

+//
+//
+//  All data exposed by the RTTI is characterized using the following classes.
+//  The first characterization is done by wxTypeKind. All enums up to and including
+//  wxT_CUSTOM represent so called simple types. These cannot be divided any further.
+//  They can be converted to and from wxStrings, that's all.
+

 
 enum wxTypeKind
 {
 
 enum wxTypeKind
 {


@@ -223,10 +253,17 @@ enum wxTypeKind
     wxT_STRING, // must be wxString
     wxT_SET, // must be wxSet<> template
     wxT_ENUM,
     wxT_STRING, // must be wxString
     wxT_SET, // must be wxSet<> template
     wxT_ENUM,

-    wxT_OBJECT, // must be a component (pointer !!!)

     wxT_CUSTOM, // user defined type (e.g. wxPoint)
     wxT_CUSTOM, // user defined type (e.g. wxPoint)

-       wxT_DELEGATE , // for connecting against an event source
-    wxT_LAST_TYPE_KIND // sentinel for bad data, asserts, debugging
+    
+    wxT_LAST_SIMPLE_TYPE_KIND = wxT_CUSTOM ,
+
+    wxT_OBJECT_PTR, // object reference
+       wxT_OBJECT , // embedded object
+    wxT_COLLECTION , // collection
+
+    wxT_DELEGATE , // for connecting against an event source
+    
+    wxT_LAST_TYPE_KIND = wxT_DELEGATE // sentinel for bad data, asserts, debugging

 };
 
 class WXDLLIMPEXP_BASE wxTypeInfo
 };
 
 class WXDLLIMPEXP_BASE wxTypeInfo


@@ -235,6 +272,9 @@ public :
        wxTypeInfo() : m_kind( wxT_VOID) {}
        virtual ~wxTypeInfo() {}
        wxTypeKind GetKind() const { return m_kind ; }
        wxTypeInfo() : m_kind( wxT_VOID) {}
        virtual ~wxTypeInfo() {}
        wxTypeKind GetKind() const { return m_kind ; }

+       bool IsDelegateType() const { return m_kind == wxT_DELEGATE ; }
+       bool IsCustomType() const { return m_kind == wxT_CUSTOM ; }
+       bool IsObjectType() const { return m_kind == wxT_OBJECT || m_kind == wxT_OBJECT_PTR ; }

 protected :
        wxTypeKind m_kind ;
 };
 protected :
        wxTypeKind m_kind ;
 };


@@ -242,102 +282,92 @@ protected :
 class WXDLLIMPEXP_BASE wxBuiltInTypeInfo : public wxTypeInfo
 {
 public :
 class WXDLLIMPEXP_BASE wxBuiltInTypeInfo : public wxTypeInfo
 {
 public :

-       wxBuiltInTypeInfo( wxTypeKind kind ) { assert( kind < wxT_SET ) ; m_kind = kind ;}
+    wxBuiltInTypeInfo( wxTypeKind kind ) { wxASSERT_MSG( kind < wxT_SET , wxT("Illegal Kind for Base Type") ) ; m_kind = kind ;}

 } ;
 
 class WXDLLIMPEXP_BASE wxCustomTypeInfo : public wxTypeInfo
 {
 public :
 } ;
 
 class WXDLLIMPEXP_BASE wxCustomTypeInfo : public wxTypeInfo
 {
 public :

-       wxCustomTypeInfo( const wxChar *typeName ) 
-       { m_kind = wxT_CUSTOM ; m_typeName = typeName ;}
-       const wxChar *GetTypeName() const { assert( m_kind == wxT_CUSTOM ) ; return m_typeName ; }
+    wxCustomTypeInfo( const wxChar *typeName )
+    { m_kind = wxT_CUSTOM ; m_typeName = typeName ;}
+    const wxChar *GetTypeName() const { return m_typeName ; }

 private :
 private :

-       const wxChar *m_typeName; // Kind == wxT_CUSTOM
+    const wxChar *m_typeName; // Kind == wxT_CUSTOM

 } ;
 
 class WXDLLIMPEXP_BASE wxEnumTypeInfo : public wxTypeInfo
 {
 public :
 } ;
 
 class WXDLLIMPEXP_BASE wxEnumTypeInfo : public wxTypeInfo
 {
 public :

-       wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo ) 
-       { assert( kind == wxT_ENUM || kind == wxT_SET ) ; m_kind = kind ; m_enumInfo = enumInfo ;}
-       const wxEnumData* GetEnumData() const { assert( m_kind == wxT_ENUM || m_kind == wxT_SET ) ; return m_enumInfo ; }
+    wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo )
+    { wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET , wxT("Illegal Kind for Enum Type")) ; m_kind = kind ; m_enumInfo = enumInfo ;}
+    const wxEnumData* GetEnumData() const { return m_enumInfo ; }

 private :
 private :

-       wxEnumData *m_enumInfo; // Kind == wxT_ENUM or Kind == wxT_SET
+    wxEnumData *m_enumInfo; // Kind == wxT_ENUM or Kind == wxT_SET

 } ;
 
 class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo
 {
 public :
 } ;
 
 class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo
 {
 public :

-       wxClassTypeInfo( wxClassInfo* classInfo ) 
-       { m_kind = wxT_OBJECT ; m_classInfo = classInfo ;}
-       const wxClassInfo *GetClassInfo() const { assert( m_kind == wxT_OBJECT ) ; return m_classInfo ; }
+       wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo )
+       { wxASSERT_MSG( kind == wxT_OBJECT_PTR || kind == wxT_OBJECT , wxT("Illegal Kind for Enum Type")) ; m_kind = kind ; m_classInfo = classInfo ;}
+       const wxClassInfo *GetClassInfo() const { return m_classInfo ; }
+private :
+    wxClassInfo *m_classInfo; // Kind == wxT_OBJECT - could be NULL
+} ;
+
+class WXDLLIMPEXP_BASE wxCollectionTypeInfo : public wxTypeInfo
+{
+public :
+    wxCollectionTypeInfo( wxTypeInfo *elementType )
+    { m_kind = wxT_COLLECTION , m_elementType = elementType ; }
+
+    const wxTypeInfo* GetElementType() const { return m_elementType ; }

 private :
 private :

-       wxClassInfo *m_classInfo; // Kind == wxT_OBJECT - could be NULL
+    wxTypeInfo * m_elementType ;

 } ;
 
 } ;
 

-// a delegate is an exposed event source 
+// a delegate is an exposed event source

 
 class WXDLLIMPEXP_BASE wxDelegateTypeInfo : public wxTypeInfo
 {
 public :
 
 class WXDLLIMPEXP_BASE wxDelegateTypeInfo : public wxTypeInfo
 {
 public :

-       wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass ) 
-       { m_kind = wxT_DELEGATE ; m_eventClass = eventClass ; m_eventType = eventType ;}
-       const wxClassInfo *GetEventClass() const { assert( m_kind == wxT_DELEGATE ) ; return m_eventClass ; }
-       int GetEventType() const { assert( m_kind == wxT_DELEGATE ) ; return m_eventType ; }
+    wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass )
+    { m_kind = wxT_DELEGATE ; m_eventClass = eventClass ; m_eventType = eventType ;}
+    const wxClassInfo *GetEventClass() const { assert( m_kind == wxT_DELEGATE ) ; return m_eventClass ; }
+    int GetEventType() const { return m_eventType ; }

 private :
 private :

-       const wxClassInfo *m_eventClass; // (extended will merge into classinfo)
-       int m_eventType ;
+    const wxClassInfo *m_eventClass; // (extended will merge into classinfo)
+    int m_eventType ;

 } ;
 
 template<typename T> const wxTypeInfo* wxGetTypeInfo( T * ) ;
 
 } ;
 
 template<typename T> const wxTypeInfo* wxGetTypeInfo( T * ) ;
 

-template<typename T> const wxTypeInfo* wxGetTypeInfo( wxSet<T> * ) 
+template<typename T> const wxTypeInfo* wxGetTypeInfo( wxSet<T> * )

 {
 {

-       static wxEnumTypeInfo s_typeInfo(wxT_SET , wxGetEnumData((T) 0) ) ; return &s_typeInfo ; 
+    static wxEnumTypeInfo s_typeInfo(wxT_SET , wxGetEnumData((T) 0) ) ; return &s_typeInfo ;

 }
 
 // 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 ) \
 }
 
 // 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 ) \

-       template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxCustomTypeInfo s_typeInfo(#e) ; return &s_typeInfo ; } \
-
-// ----------------------------------------------------------------------------
-// value streaming 
-//
-// streaming is defined for xml constructs right now, the aim is to make this
-// pluggable in the future
-// ----------------------------------------------------------------------------
-
-// convenience function (avoids including xml headers in users code)
-
-class wxXmlNode ;
-void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data ) ;
-wxString wxXmlGetContentFromNode( wxXmlNode *node ) ;
+    template<> const wxTypeInfo* wxGetTypeInfo( e ** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID) ; assert(0) ; return &s_typeInfo ; } \
+    template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxCustomTypeInfo s_typeInfo(#e) ; return &s_typeInfo ; }

 
 // templated streaming, every type must have their specialization for these methods
 
 template<typename T>
 
 // templated streaming, every type must have their specialization for these methods
 
 template<typename T>

-void wxStringReadValue( const wxString &s , T &data ) ;
+void wxStringReadValue( const wxString &s , T &data );

 
 template<typename T>
 
 template<typename T>

-void wxStringWriteValue( wxString &s , const T &data) ;
+void wxStringWriteValue( wxString &s , const T &data);

 
 

-// for simple types this default implementation is ok, composited structures will have to
-// loop through their properties 
+// sometimes a compiler invents specializations that are nowhere called, use this macro to satisfy the refs

 
 

-template<typename T>
-void wxXmlReadValue( wxXmlNode *node , T &data ) 
-{
-       wxStringReadValue<T>( wxXmlGetContentFromNode( node ) , data ) ;
-}
-
-template<typename T>
-void wxXmlWriteValue( wxXmlNode *node , const T &data) 
-{
-       wxString s ;
-       wxStringWriteValue<T>( s, data ) ;
-       wxXmlAddContentToNode( node ,s ) ;
-}
+#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) ; }

 
 // ----------------------------------------------------------------------------
 // wxxVariant as typesafe data holder
 
 // ----------------------------------------------------------------------------
 // wxxVariant as typesafe data holder


@@ -346,56 +376,47 @@ void wxXmlWriteValue( wxXmlNode *node , const T &data)
 class WXDLLIMPEXP_BASE wxxVariantData
 {
 public:
 class WXDLLIMPEXP_BASE wxxVariantData
 {
 public:

-       virtual ~wxxVariantData() {}
-
-       // return a heap allocated duplicate
-       virtual wxxVariantData* Clone() const = 0 ;
+    virtual ~wxxVariantData() {}

 
 

-       // returns the type info of the contentc
-       virtual const wxTypeInfo* GetTypeInfo() const = 0 ;
+    // return a heap allocated duplicate
+    virtual wxxVariantData* Clone() const = 0 ;

 
 

-       // write the value into an xml node
-       virtual void Write( wxXmlNode* node ) const = 0 ;
+    // returns the type info of the contentc
+    virtual const wxTypeInfo* GetTypeInfo() const = 0 ;

 
 

-       // read the value from the xml node
-       virtual void Read( wxXmlNode* node ) = 0 ;
+    // write the value into a string
+    virtual void Write( wxString &s ) const = 0 ;

 
 

-       // write the value into a string
-       virtual void Write( wxString &s ) const = 0 ;
-
-       // read the value from a string
-       virtual void Read( const wxString &s) = 0 ;
+    // read the value from a string
+    virtual void Read( const wxString &s) = 0 ;

 } ;
 
 template<typename T> class WXDLLIMPEXP_BASE wxxVariantDataT : public wxxVariantData
 {
 public:
 } ;
 
 template<typename T> class WXDLLIMPEXP_BASE wxxVariantDataT : public wxxVariantData
 {
 public:

-    wxxVariantDataT(T d) : m_data(d) {}
+    wxxVariantDataT(const T& d) : m_data(d) {}

        virtual ~wxxVariantDataT() {}
 
        virtual ~wxxVariantDataT() {}
 

-       // get a copy of the stored data
-    T Get() const { return m_data; }
+       // get a ref to the stored data
+    T & Get() { return m_data; }

 
 

-       // set the data
-    void Set(T d) { m_data =  d; }
+       // get a const ref to the stored data
+    const T & Get() const { return m_data; }

 
 

-       // return a heap allocated duplicate
-       virtual wxxVariantData* Clone() const { return new wxxVariantDataT<T>( Get() ) ; }
+       // set the data
+    void Set(const T& d) { m_data =  d; }

 
 

-       // returns the type info of the contentc
-       virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( (T*) NULL ) ; }
+    // return a heap allocated duplicate
+    virtual wxxVariantData* Clone() const { return new wxxVariantDataT<T>( Get() ) ; }

 
 

-       // write the value into an xml node
-       virtual void Write( wxXmlNode* node ) const { wxXmlWriteValue( node , m_data ) ; }
+    // returns the type info of the contentc
+    virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( (T*) NULL ) ; }

 
 

-       // read the value from the xml node
-       virtual void Read( wxXmlNode* node ) { wxXmlReadValue( node , m_data ) ; }
+    // write the value into a string
+    virtual void Write( wxString &s ) const { wxStringWriteValue( s , m_data ) ; }

 
 

-       // write the value into a string
-       virtual void Write( wxString &s ) const { wxStringWriteValue( s , m_data ) ; }
-
-       // read the value from a string
-       virtual void Read( const wxString &s) { wxStringReadValue( s , m_data ) ; }
+    // read the value from a string
+    virtual void Read( const wxString &s) { wxStringReadValue( s , m_data ) ; }

 
 private:
     T m_data;
 
 private:
     T m_data;


@@ -408,20 +429,28 @@ public :
        wxxVariant( wxxVariantData* data , const wxString& name = wxT("") ) : 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 ; }
 
        wxxVariant( wxxVariantData* data , const wxString& name = wxT("") ) : 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( T data , const wxString& name = wxT("") ) : 
+       template<typename T> wxxVariant( T data , const wxString& name = wxT("") ) :

                m_data(new wxxVariantDataT<T>(data) ), m_name(name) {}
        ~wxxVariant() { delete m_data ; }
 
                m_data(new wxxVariantDataT<T>(data) ), m_name(name) {}
        ~wxxVariant() { delete m_data ; }
 

-       // get a copy of the stored data
-       template<typename T> T Get() const
+       // get a ref to the stored data
+       template<typename T> T& Get()

        {
                wxxVariantDataT<T> *dataptr = dynamic_cast<wxxVariantDataT<T>*> (m_data) ;
        {
                wxxVariantDataT<T> *dataptr = dynamic_cast<wxxVariantDataT<T>*> (m_data) ;

-               assert( dataptr ) ;
+               wxASSERT_MSG( dataptr , "Cast not possible" ) ;
+               return dataptr->Get() ;
+       }
+
+       // get a ref to the stored data
+       template<typename T> const T& Get() const
+       {
+               const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;
+               wxASSERT_MSG( dataptr , "Cast not possible" ) ;

                return dataptr->Get() ;
        }
                return dataptr->Get() ;
        }

-       
+

        // stores the data
        // stores the data

-       template<typename T> Set(T data) const
+       template<typename T> void Set(const T& data) const

        {
                delete m_data ;
                m_data = new wxxVariantDataT<T>(data) ;
        {
                delete m_data ;
                m_data = new wxxVariantDataT<T>(data) ;


@@ -429,21 +458,18 @@ public :
 
        wxxVariant& operator=(const wxxVariant &d)
        {
 
        wxxVariant& operator=(const wxxVariant &d)
        {

-               m_data = d.m_data->Clone() ; 
+               m_data = d.m_data->Clone() ;

                m_name = d.m_name ;
                return *this ;
        }
                m_name = d.m_name ;
                return *this ;
        }

-       
-       // gets the stored data casted to a wxObject* , returning NULL if cast is not possible
-       wxObject* GetAsObject() const ;

 
 

-       // write the value into an xml node
-       void Write( wxXmlNode* node ) const { m_data->Write( node ) ; }
+       // gets the stored data casted to a wxObject* , returning NULL if cast is not possible
+       wxObject* GetAsObject() ;

 
 

-       // read the value from the xml node
-       void Read( wxXmlNode* node ) { m_data->Read( node ) ; }
+       // get the typeinfo of the stored object
+       const wxTypeInfo* GetTypeInfo() const { return m_data->GetTypeInfo() ; }

 
 

-       // write the value into a string
+       // write the value into a string

        void Write( wxString &s ) const { m_data->Write( s ) ; }
 
        // read the value from a string
        void Write( wxString &s ) const { m_data->Write( s ) ; }
 
        // read the value from a string


@@ -462,10 +488,14 @@ public :
                Read( s ) ;
        }
 private :
                Read( s ) ;
        }
 private :

-       wxxVariantData* m_data ;
-       wxString m_name ;
+    wxxVariantData* m_data ;
+    wxString m_name ;

 } ;
 
 } ;
 

+#include <wx/dynarray.h>
+
+WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE);
+

 // ----------------------------------------------------------------------------
 // Property Support
 //
 // ----------------------------------------------------------------------------
 // Property Support
 //


@@ -477,145 +507,285 @@ private :
 class WXDLLIMPEXP_BASE wxPropertyAccessor
 {
 public :
 class WXDLLIMPEXP_BASE wxPropertyAccessor
 {
 public :

+#if WX_XTI_TEMPLATE_FIX
+    class SetByRef ;
+       class SetByRefRetBool ;
+       class SetRetBool ;
+    class SetAndGetByRef ;
+    class SetAndGetByRefRetBool ;
+    class GetByRef ;
+#endif
+    wxPropertyAccessor() { m_setterName = NULL ; m_getterName = NULL ; m_adderName = NULL ;}
+    virtual ~wxPropertyAccessor() {}
+    
+    // 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 ;

-    virtual wxxVariant GetProperty(wxObject *object) const = 0 ;
+
+    // Getting a simple property (non-collection)
+    virtual wxxVariant GetProperty(const wxObject *object) const = 0 ;
+
+    // Adding an element to a collection property
+    virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const 
+    { wxASSERT_MSG(0,wxT("Collection Operation called on non Collection Property")) ; }
+
+    // Getting a collection property
+    virtual wxxVariantArray GetPropertyCollection( const wxObject *obj) const 
+    { wxASSERT_MSG(0,wxT("Collection Operation called on non Collection Property")) ; return wxxVariantArray() ; }
+

     virtual bool HasSetter() const = 0 ;
     virtual bool HasGetter() const = 0 ;
     virtual bool HasSetter() const = 0 ;
     virtual bool HasGetter() const = 0 ;

-       const wxChar * GetGetterName() const { return m_setterName ; }
-       const wxChar * GetSetterName() const { return m_getterName ; }
-       virtual wxxVariant ReadValue( wxXmlNode* node ) const = 0 ;
-       virtual void WriteValue( wxXmlNode* node , wxObject *o ) const = 0 ;
-       virtual wxxVariant ReadValue( const wxString &value ) const = 0 ;
-       virtual void WriteValue( wxString& value , wxObject *o ) const = 0 ;
+    virtual bool HasAdder() const = 0 ;
+
+    const wxChar * GetGetterName() const { return m_setterName ; }
+    const wxChar * GetSetterName() const { return m_getterName ; }
+    const wxChar * GetAdderName() const { return m_adderName ; }
+
+    virtual wxxVariant ReadValue( const wxString &value ) const = 0 ;
+    virtual void WriteValue( wxString& value , const wxObject *o ) const = 0 ;

 protected :
 protected :

-       const wxChar *m_setterName ;
-       const wxChar *m_getterName ;
+    const wxChar *m_setterName ;
+    const wxChar *m_getterName ;
+    const wxChar *m_adderName ;

 };
 
 };
 

-template<typename T>
-void wxXmlReadValue( wxXmlNode *node , T &data ) ;
+class WXDLLIMPEXP_BASE wxGenericPropertyAccessor : public wxPropertyAccessor
+{
+public :
+    wxGenericPropertyAccessor( const wxChar* propertyName ) ;
+    ~wxGenericPropertyAccessor() ; 
+    virtual void SetProperty(wxObject *object, const wxxVariant &value) const ;
+    virtual wxxVariant GetProperty(const wxObject *object) const ;

 
 

-template<typename T>
-void wxXmlWriteValue( wxXmlNode *node , const T &data) ;
+    virtual bool HasSetter() const { return true ; }
+    virtual bool HasGetter() const { return true ; }
+    virtual bool HasAdder() const { return false ; }
+
+    virtual wxxVariant ReadValue( const wxString &value ) const ;
+    virtual void WriteValue( wxString& value , const wxObject *o ) const ;
+private :
+    struct wxGenericPropertyAccessorInternal ;
+    wxGenericPropertyAccessorInternal* m_data ;
+} ;

 
 template<class Klass, typename T>
 class WXDLLIMPEXP_BASE wxPropertyAccessorT : public wxPropertyAccessor
 {
 public:
 
 template<class Klass, typename T>
 class WXDLLIMPEXP_BASE wxPropertyAccessorT : public wxPropertyAccessor
 {
 public:

+

     typedef void (Klass::*setter_t)(T value);
     typedef void (Klass::*setter_t)(T value);

+    typedef bool (Klass::*setter_bool_t)(T value);

     typedef void (Klass::*setter_ref_t)(const T& value);
     typedef void (Klass::*setter_ref_t)(const T& value);

+    typedef bool (Klass::*setter_ref_bool_t)(const T& value);

     typedef T (Klass::*getter_t)() const;
     typedef const T& (Klass::*getter_ref_t)() const;
 
     typedef T (Klass::*getter_t)() const;
     typedef const T& (Klass::*getter_ref_t)() const;
 

-    wxPropertyAccessorT(setter_t setter, getter_t getter, const wxChar *g, const wxChar *s)
-        : m_setter(setter), m_setter_ref(NULL), m_getter(getter) ,m_getter_ref(NULL) {m_setterName = s;m_getterName=g ;}
-    wxPropertyAccessorT(int WXUNUSED(zero), getter_t getter, const wxChar *g, const wxChar *s)
-        : m_setter(NULL), m_setter_ref(NULL), m_getter(getter) ,m_getter_ref(NULL) {m_setterName = s;m_getterName=g ;}
-    wxPropertyAccessorT(setter_ref_t setter, getter_t getter, const wxChar *g, const wxChar *s)
-        : m_setter(NULL), m_setter_ref(setter), m_getter(getter) , m_getter_ref(NULL){m_setterName = s;m_getterName=g ;}
-    wxPropertyAccessorT(setter_ref_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s)
-        : m_setter(NULL), m_setter_ref(setter), m_getter(NULL) , m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
-    wxPropertyAccessorT(setter_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s)
-        : m_setter(NULL), m_setter(setter), m_getter(NULL) ,  m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
-    wxPropertyAccessorT(int WXUNUSED(zero), getter_ref_t getter, const wxChar *g, const wxChar *s)
-        : m_setter(NULL), m_setter(NULL), m_getter(NULL) ,  m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
-
-       // returns true if this accessor has a setter
-       bool HasSetter() const { return m_setter != NULL || m_setter_ref != NULL ; }
-
-       // return true if this accessor has a getter
-       bool HasGetter() const { return m_getter != NULL || m_getter_ref != NULL ; }
-
-       // set the property this accessor is responsible for in an object
-       void SetProperty(wxObject *o, const wxxVariant &v) const
+    wxPropertyAccessorT(setter_t setter, getter_t getter, const wxChar *s, const wxChar *g)
+        : m_setter_bool( NULL ) , m_setter_ref_bool( NULL ) , m_setter(setter), m_setter_ref(NULL), m_getter(getter) ,m_getter_ref(NULL) {m_setterName = s;m_getterName=g ;}
+
+    wxPropertyAccessorT( getter_t getter, const wxChar *g)
+        : m_setter_bool( NULL ) , m_setter_ref_bool( NULL ) , m_setter(NULL), m_setter_ref(NULL), m_getter(getter) ,m_getter_ref(NULL) {m_setterName = "";m_getterName=g ;}
+
+    wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetRetBool*,) setter_bool_t setter, getter_t getter, const wxChar *s, const wxChar *g)
+       : m_setter_bool( setter ) , m_setter_ref_bool( NULL ) , m_setter(NULL), m_setter_ref(NULL), m_getter(getter) , m_getter_ref(NULL){m_setterName = s;m_getterName=g ;}
+
+    wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetByRef*,) setter_ref_t setter, getter_t getter, const wxChar *s, const wxChar *g)
+       : m_setter_bool( NULL ) , m_setter_ref_bool( NULL ) , m_setter(NULL), m_setter_ref(setter), m_getter(getter) , m_getter_ref(NULL){m_setterName = s;m_getterName=g ;}
+
+    wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetByRefRetBool*,) setter_ref_bool_t setter, getter_t getter, const wxChar *s, const wxChar *g)
+       : m_setter_bool( NULL ) , m_setter_ref_bool( setter ) , m_setter(NULL), m_setter_ref(NULL), m_getter(getter) , m_getter_ref(NULL){m_setterName = s;m_getterName=g ;}
+
+    wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetAndGetByRef*,) setter_ref_t setter, getter_ref_t getter, const wxChar *s, const wxChar *g)
+       : m_setter_bool( NULL ) , m_setter_ref_bool( NULL ) , m_setter(NULL), m_setter_ref(setter), m_getter(NULL) , m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
+
+    wxPropertyAccessorT(WX_XTI_PARAM_FIX(SetAndGetByRefRetBool*,) setter_ref_bool_t setter, getter_ref_t getter, const wxChar *s, const wxChar *g)
+       : m_setter_bool( NULL ) , m_setter_ref_bool( setter ) , m_setter(NULL), m_setter_ref(NULL), m_getter(NULL) , m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
+
+    wxPropertyAccessorT(WX_XTI_PARAM_FIX(GetByRef*,) setter_t setter, getter_ref_t getter, const wxChar *s, const wxChar *g)
+       : m_setter_bool( NULL ) , m_setter_ref_bool( NULL ) , m_setter(NULL), m_setter(setter), m_getter(NULL) ,  m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
+
+    // returns true if this accessor has a setter
+    bool HasSetter() const { return m_setter != NULL || m_setter_ref != NULL || m_setter_ref_bool != NULL || m_setter_bool ; }
+
+    // return true if this accessor has a getter
+    bool HasGetter() const { return m_getter != NULL || m_getter_ref != NULL ; }
+
+    bool HasAdder() const { return true ; }
+    // set the property this accessor is responsible for in an object
+    void SetProperty(wxObject *o, const wxxVariant &v) const

     {
         Klass *obj = dynamic_cast<Klass*>(o);
     {
         Klass *obj = dynamic_cast<Klass*>(o);

-        T value = v.Get<T>();
+               T value ;
+
+               if ( wxGetTypeInfo((T*)NULL)->GetKind() == wxT_OBJECT && v.GetTypeInfo()->GetKind() == wxT_OBJECT_PTR )
+                       value = *v.Get<T*>();
+               else
+                       value = v.Get<T>();

         if (m_setter)
             (obj->*(m_setter))(value);
         if (m_setter)
             (obj->*(m_setter))(value);

-        else
-            (obj->*(m_setter_ref))(value);
-    }
+        else if ( m_setter_ref )
+                       (obj->*(m_setter_ref))(value);
+               else if ( m_setter_ref_bool )
+                       (obj->*(m_setter_ref_bool))(value);
+               else if ( m_setter_bool )
+                       (obj->*(m_setter_bool))(value);
+               else
+               {
+                       wxASSERT_MSG(0 , wxT("SetPropertyCalled without a valid Setter") ) ;
+               }
+   }

 
 

-       // gets the property this accessor is responsible for from an object
-    wxxVariant GetProperty(wxObject *o) const
+    // gets the property this accessor is responsible for from an object
+    wxxVariant GetProperty(const wxObject *o) const

     {
     {

-               return wxxVariant( (wxxVariantData* ) DoGetProperty( o ) ) ;
+        return wxxVariant( (wxxVariantData* ) DoGetProperty( o ) ) ;

      }
 
      }
 

-       // write the property this accessor is responsible for from an object into
-       // a xml node
-       void WriteValue( wxXmlNode* node , wxObject *o ) const
-       {
-               DoGetProperty( o )->Write( node ) ;
-       }
+    // write the property this accessor is responsible for from an object into
+    // a string
+    void WriteValue( wxString& s , const wxObject *o ) const
+    {
+        DoGetProperty( o )->Write( s ) ;
+    }

 
 

-       // write the property this accessor is responsible for from an object into
-       // a string
-       void WriteValue( wxString& s , wxObject *o ) const
-       {
-               DoGetProperty( o )->Write( s ) ;
-       }
+    // read a wxxVariant having the correct type for the property this accessor
+    // is responsible for from a string
+    wxxVariant ReadValue( const wxString &value ) const
+    {
+        T data ;
+        wxStringReadValue( value , data ) ;
+        return wxxVariant( data ) ;
+    }

 
 

-       // read a wxxVariant having the correct type for the property this accessor
-       // is responsible for from an xml node
-       wxxVariant ReadValue( wxXmlNode* node ) const
-       {
-               T data ;
-               wxXmlReadValue( node , data ) ;
-               return wxxVariant( data ) ;
-       }
+private :
+    wxxVariantDataT<T>* DoGetProperty(const wxObject *o) const
+    {
+        const Klass *obj = dynamic_cast<const Klass*>(o);
+        if ( m_getter )
+            return new wxxVariantDataT<T>( (obj->*(m_getter))() ) ;
+        else
+            return new wxxVariantDataT<T>( (obj->*(m_getter_ref))() ) ;
+    }

 
 

-       // read a wxxVariant having the correct type for the property this accessor
-       // is responsible for from a string
-       wxxVariant ReadValue( const wxString &value ) const
-       {
-               T data ;
-               wxStringReadValue( value , data ) ;
-               return wxxVariant( data ) ;
-       }
+    setter_t m_setter;
+    setter_ref_t m_setter_ref;
+       setter_ref_bool_t m_setter_ref_bool ;
+       setter_bool_t m_setter_bool ;
+    getter_t m_getter;
+    getter_ref_t m_getter_ref ;
+};

 
 

-private :
-    wxxVariantDataT<T>* DoGetProperty(wxObject *o) const
+template<class Klass, typename CollectionType , typename AddedElementType>
+class WXDLLIMPEXP_BASE wxPropertyCollectionAccessorT : public wxPropertyAccessor
+{
+public:
+
+    typedef void (Klass::*adder_t)(AddedElementType value);
+    typedef const CollectionType& (Klass::*getter_t)() const ;
+
+    wxPropertyCollectionAccessorT(adder_t adder, getter_t getter, const wxChar *a, const wxChar *g)
+        : m_getter(getter), m_adder(adder) { m_adderName = a;m_getterName=g ;}
+
+    ~wxPropertyCollectionAccessorT() {}
+
+    // returns true if this accessor has a setter
+    bool HasSetter() const { return false ;}
+
+    // return true if this accessor has a getter
+    bool HasGetter() const { return m_getter != NULL ;}
+
+    // return true if this accessor has a getter
+    bool HasAdder() const { return m_adder != NULL ;}
+
+    // set the property this accessor is responsible for in an object
+    void AddToPropertyCollection(wxObject *o, const wxxVariant &v) const

     {
         Klass *obj = dynamic_cast<Klass*>(o);
     {
         Klass *obj = dynamic_cast<Klass*>(o);

-               if ( m_getter )
-                       return new wxxVariantDataT<T>( (obj->*(m_getter))() ) ;
+               AddedElementType value ;
+
+               if ( wxGetTypeInfo((AddedElementType*)NULL)->GetKind() == wxT_OBJECT && v.GetTypeInfo()->GetKind() == wxT_OBJECT_PTR )
+                       value = *v.Get<AddedElementType*>();
+               else
+                       value = v.Get<AddedElementType>();
+
+        if (m_adder)
+            (obj->*(m_adder))(value);

                else
                else

-                       return new wxxVariantDataT<T>( (obj->*(m_getter_ref))() ) ;
+               {
+                       wxASSERT_MSG(0 , wxT("SetPropertyCalled without a valid Setter") ) ;
+               }
+   }
+
+    // gets the property this accessor is responsible for from an object
+    wxxVariantArray GetPropertyCollection(const wxObject *o) const 
+    {
+        const Klass *obj = dynamic_cast<const Klass*>(o);
+
+        wxxVariantArray result ;
+        CollectionType::compatibility_iterator current = (obj->*(m_getter))().GetFirst();
+        while (current)
+        {
+            result.Add( new wxxVariant(current->GetData()) ) ;
+            current = current->GetNext();
+        }
+        return result ;

     }
 
     }
 

-    setter_t m_setter;
-    setter_ref_t m_setter_ref;
+
+    // set the property this accessor is responsible for in an object
+    void SetProperty(wxObject *WXUNUSED(o), const wxxVariant &WXUNUSED(v)) const
+    {
+        wxASSERT_MSG(0,wxT("SetProperty called on Collection Property")) ;
+    }
+
+    // gets the property this accessor is responsible for from an object
+    wxxVariant GetProperty(const wxObject *WXUNUSED(o)) const
+    {
+        wxASSERT_MSG(0,wxT("GetProperty called on Collection Property")) ;
+        return wxxVariant() ;
+    }
+
+    // write the property this accessor is responsible for from an object into
+    // a string
+    void WriteValue( wxString& s , const wxObject *o ) const
+    {
+        wxASSERT_MSG(0,wxT("WriteValue called on Collection Property")) ;
+    }
+
+    // read a wxxVariant having the correct type for the property this accessor
+    // is responsible for from a string
+    wxxVariant ReadValue( const wxString &value ) const
+    {
+        wxASSERT_MSG(0,wxT("ReadValue called on Collection Property")) ;
+        return wxxVariant() ;
+    }
+
+private :

     getter_t m_getter;
     getter_t m_getter;

-       getter_ref_t m_getter_ref ;
+    adder_t m_adder;

 };
 
 class WXDLLIMPEXP_BASE wxPropertyInfo
 {
 public :
 };
 
 class WXDLLIMPEXP_BASE wxPropertyInfo
 {
 public :

-       wxPropertyInfo( wxPropertyInfo* &iter , const wxChar *name , const wxChar *typeName , const wxTypeInfo* typeInfo , wxPropertyAccessor *accessor , wxxVariant dv ) :
-          m_name( name ) , m_typeName(typeName) , m_typeInfo( typeInfo ) , m_accessor( accessor ) , m_defaultValue( dv )
+       wxPropertyInfo( wxPropertyInfo* &iter , const wxChar *name , const wxTypeInfo* typeInfo , wxPropertyAccessor *accessor , wxxVariant dv ) :
+          m_name( name ) , m_typeInfo( typeInfo ) , m_accessor( accessor ) , m_defaultValue( dv ) , m_collectionElementTypeInfo(NULL)

        {
        {

-               m_next = NULL ;
-               if ( iter == NULL )
-                       iter = this ;
-               else
-               {
-                       wxPropertyInfo* i = iter ;
-                       while( i->m_next )
-                               i = i->m_next ;
+        Insert(iter) ;
+       }

 
 

-                       i->m_next = this ;
-               }
+       wxPropertyInfo( wxPropertyInfo* &iter , const wxChar *name , const wxTypeInfo* collTypeInfo , const wxTypeInfo* elemTypeInfo , wxPropertyAccessor *accessor ) :
+          m_name( name ) , m_typeInfo( collTypeInfo ) , m_accessor( accessor ) , m_collectionElementTypeInfo(elemTypeInfo)
+       {
+        Insert(iter) ;

        }
        }

+

        // return the name of this property
        const wxChar *          GetName() const { return m_name ; }
 
        // return the name of this property
        const wxChar *          GetName() const { return m_name ; }
 

-       // return the typename of this property
-       const wxChar *          GetTypeName() const { return m_typeName ; }
+       // return the element type info of this property (for collections, otherwise NULL)
+       const wxTypeInfo *      GetCollectionElementTypeInfo() const { return m_collectionElementTypeInfo ; }

 
 

-       // return the type info of this property
+    // return the type info of this property

        const wxTypeInfo *      GetTypeInfo() const { return m_typeInfo ; }
 
        // return the accessor for this property
        const wxTypeInfo *      GetTypeInfo() const { return m_typeInfo ; }
 
        // return the accessor for this property


@@ -626,34 +796,101 @@ public :
 
        // returns the default value of this property, its kind may be wxT_VOID if it is not valid
        wxxVariant                      GetDefaultValue() const { return m_defaultValue ; }
 
        // returns the default value of this property, its kind may be wxT_VOID if it is not valid
        wxxVariant                      GetDefaultValue() const { return m_defaultValue ; }

-private : 
-       const wxChar *          m_name;
-       const wxChar *          m_typeName ;
-       const wxTypeInfo*       m_typeInfo ;
-       wxPropertyAccessor* m_accessor ;
-    wxxVariant m_defaultValue; 
-       // string representation of the default value
-       //  to be assigned by the designer to the property
-       //  when the component is dropped on the container.
-       wxPropertyInfo*         m_next ;
+private :
+    void Insert(wxPropertyInfo* &iter)
+    {
+               m_next = NULL ;
+               if ( iter == NULL )
+                       iter = this ;
+               else
+               {
+                       wxPropertyInfo* i = iter ;
+                       while( i->m_next )
+                               i = i->m_next ;
+
+                       i->m_next = this ;
+               }
+    }
+
+    const wxChar *      m_name;
+    const wxChar *      m_typeName ;
+    const wxTypeInfo*   m_typeInfo ;
+    const wxTypeInfo*   m_collectionElementTypeInfo ;
+    wxPropertyAccessor* m_accessor ;
+    wxxVariant m_defaultValue;
+    // string representation of the default value
+    //  to be assigned by the designer to the property
+    //  when the component is dropped on the container.
+    wxPropertyInfo*     m_next ;

 };
 
 #define WX_BEGIN_PROPERTIES_TABLE(theClass) \
 };
 
 #define WX_BEGIN_PROPERTIES_TABLE(theClass) \

-    const wxPropertyInfo *theClass::GetPropertiesStatic()  \
+    wxPropertyInfo *theClass::GetPropertiesStatic()  \

     {  \
         typedef theClass class_t; \
     {  \
         typedef theClass class_t; \

-               static wxPropertyInfo* first = NULL ;
+        static wxPropertyInfo* first = NULL ;

 
 #define WX_END_PROPERTIES_TABLE() \
 
 #define WX_END_PROPERTIES_TABLE() \

-               return first ; } 
+        return first ; }
+
+
+#if WX_XTI_TEMPLATE_FIX 
+
+#define WX_PROPERTY( name , type , setter , getter ,defaultValue ) \
+       static wxPropertyAccessorT<class_t , type> _accessor##name( &setter , &getter , #setter , #getter ) ; \
+       static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#define WX_PROPERTY_COLLECTION( name , colltype , addelemtype , 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 ) ;
+
+#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 wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#define WX_PROPERTY_SET_BY_REF( name , type , setter , getter ,defaultValue ) \
+        static wxPropertyAccessorT<class_t , type> _accessor##name( (wxPropertyAccessor::SetByRef*)NULL, &setter , &getter , #setter , #getter ) ; \
+        static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#define WX_PROPERTY_SET_BY_REF_RET_BOOL( name , type , setter , getter ,defaultValue ) \
+        static wxPropertyAccessorT<class_t , type> _accessor##name( (wxPropertyAccessor::SetByRefRetBool*)NULL, &setter , &getter , #setter , #getter ) ; \
+        static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#define WX_PROPERTY_SET_AND_GET_BY_REF_RET_BOOL( name , type , setter , getter ,defaultValue ) \
+        static wxPropertyAccessorT<class_t , type> _accessor##name( (wxPropertyAccessor::SetAndGetByRefRetBool*)NULL, &setter , &getter , #setter , #getter ) ; \
+        static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#else

 
 #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 wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+       static wxPropertyAccessorT<class_t , type> _accessor##name( &setter , &getter , #setter , #getter ) ; \
+       static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#define WX_PROPERTY_COLLECTION( name , colltype , addelemtype , 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 ) ;
+
+#define WX_PROPERTY_SET_RET_BOOL( name , type , setter , getter ,defaultValue ) \
+    WX_PROPERTY( name , type , setter , getter , defaultValue )
+
+#define WX_PROPERTY_SET_BY_REF( name , type , setter , getter ,defaultValue ) \
+    WX_PROPERTY( name , type , setter , getter , defaultValue )
+
+#define WX_PROPERTY_SET_BY_REF_RET_BOOL( name , type , setter , getter ,defaultValue ) \
+    WX_PROPERTY( name , type , setter , getter , defaultValue )
+
+#define WX_PROPERTY_SET_AND_GET_BY_REF_RET_BOOL( name , type , setter , getter ,defaultValue ) \
+    WX_PROPERTY( name , type , setter , getter , defaultValue )
+
+#endif
+
+#define WX_READONLY_PROPERTY( name , type , getter ,defaultValue ) \
+    static wxPropertyAccessorT<class_t , type> _accessor##name( &getter , #getter ) ; \
+    static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;

 
 #define WX_DELEGATE( name , eventType , eventClass ) \
 
 #define WX_DELEGATE( name , eventType , eventClass ) \

-       static wxDelegateTypeInfo _typeInfo##name( eventType , CLASSINFO( eventClass ) ) ; \
-       static wxPropertyInfo _propertyInfo##name( first , #name , NULL , &_typeInfo##name , NULL , wxxVariant() ) ; \
+    static wxDelegateTypeInfo _typeInfo##name( eventType , CLASSINFO( eventClass ) ) ; \
+    static wxPropertyInfo _propertyInfo##name( first , #name , &_typeInfo##name , NULL , wxxVariant() ) ; \

 
 // ----------------------------------------------------------------------------
 // Handler Info
 
 // ----------------------------------------------------------------------------
 // Handler Info


@@ -665,7 +902,7 @@ class wxHandlerInfo
 {
 public :
        wxHandlerInfo( wxHandlerInfo* &iter , const wxChar *name , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) :
 {
 public :
        wxHandlerInfo( wxHandlerInfo* &iter , const wxChar *name , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) :

-          m_name( name ) , m_eventClassInfo( eventClassInfo ) , m_eventFunction( address )  
+          m_name( name ) , m_eventClassInfo( eventClassInfo ) , m_eventFunction( address )

        {
                m_next = NULL ;
                if ( iter == NULL )
        {
                m_next = NULL ;
                if ( iter == NULL )


@@ -691,24 +928,24 @@ public :
 
        // returns NULL if this is the last handler of this class
        wxHandlerInfo*     GetNext() const { return m_next ; }
 
        // returns NULL if this is the last handler of this class
        wxHandlerInfo*     GetNext() const { return m_next ; }

-private : 
-       wxObjectEventFunction m_eventFunction ;
-       const wxChar *          m_name;
-       const wxClassInfo*      m_eventClassInfo ;
-       wxHandlerInfo*          m_next ;
+private :
+    wxObjectEventFunction m_eventFunction ;
+    const wxChar *      m_name;
+    const wxClassInfo*  m_eventClassInfo ;
+    wxHandlerInfo*      m_next ;

 };
 
 #define WX_HANDLER(name,eventClassType) \
 };
 
 #define WX_HANDLER(name,eventClassType) \

-       static wxHandlerInfo _handlerInfo##name( first , #name , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ;
+    static wxHandlerInfo _handlerInfo##name( first , #name , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ;

 
 #define WX_BEGIN_HANDLERS_TABLE(theClass) \
 
 #define WX_BEGIN_HANDLERS_TABLE(theClass) \

-    const wxHandlerInfo *theClass::GetHandlersStatic()  \
+    wxHandlerInfo *theClass::GetHandlersStatic()  \

     {  \
         typedef theClass class_t; \
     {  \
         typedef theClass class_t; \

-               static wxHandlerInfo* first = NULL ;
+        static wxHandlerInfo* first = NULL ;

 
 #define WX_END_HANDLERS_TABLE() \
 
 #define WX_END_HANDLERS_TABLE() \

-               return first ; } 
+        return first ; }

 
 // ----------------------------------------------------------------------------
 // Constructor Bridges
 
 // ----------------------------------------------------------------------------
 // Constructor Bridges


@@ -744,16 +981,16 @@ struct wxConstructorBridge_Dummy : public wxConstructorBridge
 } ;
 
 #define WX_CONSTRUCTOR_0(klass) \
 } ;
 
 #define WX_CONSTRUCTOR_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_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 ;

 
 #define WX_CONSTRUCTOR_DUMMY(klass) \
 
 #define WX_CONSTRUCTOR_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_Dummy constructor##klass ; \
+    wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
+    const wxChar *klass::sm_constructorProperties##klass[] = { NULL } ; \
+    const int klass::sm_constructorPropertiesCount##klass = 0 ;

 
 // 1 param
 
 
 // 1 param
 


@@ -770,10 +1007,10 @@ struct wxConstructorBridge_1 : public wxConstructorBridge
 };
 
 #define WX_CONSTRUCTOR_1(klass,t0,v0) \
 };
 
 #define WX_CONSTRUCTOR_1(klass,t0,v0) \

-       wxConstructorBridge_1<klass,t0> constructor##klass ; \
-       wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
-       const wxChar *klass::sm_constructorProperties##klass[] = { #v0 } ; \
-       const int klass::sm_constructorPropertiesCount##klass = 1 ;
+    wxConstructorBridge_1<klass,t0> constructor##klass ; \
+    wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
+    const wxChar *klass::sm_constructorProperties##klass[] = { #v0 } ; \
+    const int klass::sm_constructorPropertiesCount##klass = 1 ;

 
 // 2 params
 
 
 // 2 params
 


@@ -786,16 +1023,16 @@ struct wxConstructorBridge_2 : public wxConstructorBridge
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(
                     args[0].Get<T0>() ,
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(
                     args[0].Get<T0>() ,

-                    args[1].Get<T1>() 
+                    args[1].Get<T1>()

                    );
     }
 };
 
 #define WX_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
                    );
     }
 };
 
 #define WX_CONSTRUCTOR_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[] = { #v0 , #v1 } ; \
-       const int klass::sm_constructorPropertiesCount##klass = 2;
+    wxConstructorBridge_2<klass,t0,t1> constructor##klass ; \
+    wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
+    const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 } ; \
+    const int klass::sm_constructorPropertiesCount##klass = 2;

 
 // 3 params
 
 
 // 3 params
 


@@ -809,16 +1046,16 @@ struct wxConstructorBridge_3 : public wxConstructorBridge
         obj->Create(
                     args[0].Get<T0>() ,
                     args[1].Get<T1>() ,
         obj->Create(
                     args[0].Get<T0>() ,
                     args[1].Get<T1>() ,

-                    args[2].Get<T2>() 
+                    args[2].Get<T2>()

                    );
     }
 };
 
 #define WX_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
                    );
     }
 };
 
 #define WX_CONSTRUCTOR_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[] = { #v0 , #v1 , #v2 } ; \
-       const int klass::sm_constructorPropertiesCount##klass = 3 ;
+    wxConstructorBridge_3<klass,t0,t1,t2> constructor##klass ; \
+    wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
+    const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 } ; \
+    const int klass::sm_constructorPropertiesCount##klass = 3 ;

 
 // 4 params
 
 
 // 4 params
 


@@ -833,16 +1070,16 @@ struct wxConstructorBridge_4 : public wxConstructorBridge
                     args[0].Get<T0>() ,
                     args[1].Get<T1>() ,
                     args[2].Get<T2>() ,
                     args[0].Get<T0>() ,
                     args[1].Get<T1>() ,
                     args[2].Get<T2>() ,

-                    args[3].Get<T3>() 
+                    args[3].Get<T3>()

                    );
     }
 };
 
 #define WX_CONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \
                    );
     }
 };
 
 #define WX_CONSTRUCTOR_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[] = { #v0 , #v1 , #v2 , #v3 } ; \
-       const int klass::sm_constructorPropertiesCount##klass = 4 ;
+    wxConstructorBridge_4<klass,t0,t1,t2,t3> constructor##klass ; \
+    wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
+    const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 } ; \
+    const int klass::sm_constructorPropertiesCount##klass = 4 ;

 
 // 5 params
 
 
 // 5 params
 


@@ -858,7 +1095,7 @@ struct wxConstructorBridge_5 : public wxConstructorBridge
                     args[1].Get<T1>() ,
                     args[2].Get<T2>() ,
                     args[3].Get<T3>() ,
                     args[1].Get<T1>() ,
                     args[2].Get<T2>() ,
                     args[3].Get<T3>() ,

-                    args[4].Get<T4>() 
+                    args[4].Get<T4>()

                    );
     }
 };
                    );
     }
 };


@@ -869,41 +1106,83 @@ struct wxConstructorBridge_5 : public wxConstructorBridge
        const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 } ; \
        const int klass::sm_constructorPropertiesCount##klass = 5;
 
        const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 } ; \
        const int klass::sm_constructorPropertiesCount##klass = 5;
 

+// 6 params
+
+template<typename Class,
+         typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
+struct wxConstructorBridge_6 : public wxConstructorBridge
+{
+    void Create(wxObject *o, wxxVariant *args)
+    {
+        Class *obj = dynamic_cast<Class*>(o);
+        obj->Create(
+                    args[0].Get<T0>() ,
+                    args[1].Get<T1>() ,
+                    args[2].Get<T2>() ,
+                    args[3].Get<T3>() ,
+                    args[4].Get<T4>() ,
+                    args[5].Get<T5>()
+                  );
+    }
+};
+
+#define WX_CONSTRUCTOR_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[] = { #v0 , #v1 , #v2 , #v3 , #v4 , #v5 } ; \
+       const int klass::sm_constructorPropertiesCount##klass = 6;
+
+

 // ----------------------------------------------------------------------------
 // wxClassInfo
 // ----------------------------------------------------------------------------
 
 typedef wxObject *(*wxObjectConstructorFn)(void);
 // ----------------------------------------------------------------------------
 // wxClassInfo
 // ----------------------------------------------------------------------------
 
 typedef wxObject *(*wxObjectConstructorFn)(void);

-typedef wxObject* (*wxVariantToObjectConverter)( const wxxVariant &data ) ;
+typedef wxObject* (*wxVariantToObjectConverter)( wxxVariant &data ) ;

 typedef wxxVariant (*wxObjectToVariantConverter)( wxObject* ) ;
 
 class WXDLLIMPEXP_BASE wxClassInfo
 {
 public:
     wxClassInfo(const wxClassInfo **_Parents,
 typedef wxxVariant (*wxObjectToVariantConverter)( wxObject* ) ;
 
 class WXDLLIMPEXP_BASE wxClassInfo
 {
 public:
     wxClassInfo(const wxClassInfo **_Parents,

-                       const wxChar *_UnitName,
-                       const wxChar *_ClassName,
+            const wxChar *_UnitName,
+            const wxChar *_ClassName,

             int size,
             wxObjectConstructorFn ctor ,
             int size,
             wxObjectConstructorFn ctor ,

-                       const wxPropertyInfo *_Props ,
-                       const wxHandlerInfo *_Handlers ,
+                       wxPropertyInfo *_Props ,
+                       wxHandlerInfo *_Handlers ,

                        wxConstructorBridge* _Constructor ,
                        wxConstructorBridge* _Constructor ,

-                       const wxChar ** _ConstructorProperties , 
+                       const wxChar ** _ConstructorProperties ,

                        const int _ConstructorPropertiesCount ,
                        const int _ConstructorPropertiesCount ,

-                       wxVariantToObjectConverter _Converter1 ,
-                       wxObjectToVariantConverter _Converter2 
+                       wxVariantToObjectConverter _PtrConverter1 ,
+                       wxVariantToObjectConverter _Converter2 ,
+                       wxObjectToVariantConverter _Converter3

                        ) : m_parents(_Parents) , m_unitName(_UnitName) ,m_className(_ClassName),
                        m_objectSize(size), m_objectConstructor(ctor) , m_firstProperty(_Props ) , m_firstHandler(_Handlers ) , m_constructor( _Constructor ) ,
                        m_constructorProperties(_ConstructorProperties) , m_constructorPropertiesCount(_ConstructorPropertiesCount),
                        ) : m_parents(_Parents) , m_unitName(_UnitName) ,m_className(_ClassName),
                        m_objectSize(size), m_objectConstructor(ctor) , m_firstProperty(_Props ) , m_firstHandler(_Handlers ) , m_constructor( _Constructor ) ,
                        m_constructorProperties(_ConstructorProperties) , m_constructorPropertiesCount(_ConstructorPropertiesCount),

-                       m_variantToObjectConverter( _Converter1 ) , m_objectToVariantConverter( _Converter2 ) , m_next(sm_first)
+                       m_variantOfPtrToObjectConverter( _PtrConverter1 ) , m_variantToObjectConverter( _Converter2 ) , m_objectToVariantConverter( _Converter3 ) , m_next(sm_first)
+       {
+               sm_first = this;
+               Register() ;
+       }
+
+   wxClassInfo(const wxChar *_UnitName, const wxChar *_ClassName, const wxClassInfo **_Parents) : m_parents(_Parents) , m_unitName(_UnitName) ,m_className(_ClassName),
+                       m_objectSize(0), m_objectConstructor(NULL) , m_firstProperty(NULL ) , m_firstHandler(NULL ) , m_constructor( NULL ) ,
+                       m_constructorProperties(NULL) , m_constructorPropertiesCount(NULL),
+                       m_variantOfPtrToObjectConverter( NULL ) , m_variantToObjectConverter( NULL ) , m_objectToVariantConverter( NULL ) , m_next(sm_first)

        {
        {

-               sm_first = this; 
-               Register( m_className , this ) ;
+               sm_first = this;
+               Register() ;

        }
 
        }
 

-    ~wxClassInfo() ;
+    virtual ~wxClassInfo() ;

 
 

-    wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
+    // allocates an instance of this class, this object does not have to be initialized or fully constructed
+    // as this call will be followed by a call to Create
+    virtual wxObject *AllocateObject() const { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
+
+    // 'old naming' for AllocateObject staying here for backward compatibility
+    wxObject *CreateObject() const { return AllocateObject() ; }

 
     const wxChar       *GetClassName() const { return m_className; }
     const wxClassInfo **GetParents() const { return m_parents; }
 
     const wxChar       *GetClassName() const { return m_className; }
     const wxClassInfo **GetParents() const { return m_parents; }


@@ -919,63 +1198,77 @@ public:
 
     bool IsKindOf(const wxClassInfo *info) const
     {
 
     bool IsKindOf(const wxClassInfo *info) const
     {

-               if ( info != 0 )
-               {
-                       if ( info == this )
-                               return true ;
-
-                       for ( int i = 0 ; m_parents[i] ; ++ i )
-                       {
-                               if ( m_parents[i]->IsKindOf( info ) )
-                                       return true ;
-                       }
-               }
-               return false ;
+        if ( info != 0 )
+        {
+            if ( info == this )
+                return true ;
+
+            for ( int i = 0 ; m_parents[i] ; ++ i )
+            {
+                if ( m_parents[i]->IsKindOf( info ) )
+                    return true ;
+            }
+        }
+        return false ;

     }
 
     }
 

+#ifdef WXWIN_COMPATIBILITY_2_4

     // Initializes parent pointers and hash table for fast searching.
     // Initializes parent pointers and hash table for fast searching.

-       // this is going to be removed by Register/Unregister calls
-       // in Constructor / Destructor together with making the hash map private
-
-    static void     InitializeClasses();
-
+    wxDEPRECATED( static void     InitializeClasses() );

     // Cleans up hash table used for fast searching.
     // Cleans up hash table used for fast searching.

+    wxDEPRECATED( static void     CleanUpClasses() );
+#endif
+    static void     CleanUp();
+ 
+    // returns the first property
+    const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; }

 
 

-    static void     CleanUpClasses();
-
-       // returns the first property
-       const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; } 
-
-       // returns the first handler 
-       const wxHandlerInfo* GetFirstHandler() const { return m_firstHandler ; } 
+    // returns the first handler
+    const wxHandlerInfo* GetFirstHandler() const { return m_firstHandler ; }

 
 

-    // Call the Create method for a class
-    virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params) 
+    // Call the Create upon an instance of the class, in the end the object is fully
+    // initialized
+    virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params) const

        {
        {

-               wxASSERT( ParamCount == m_constructorPropertiesCount ) ;
+               wxASSERT_MSG( ParamCount == m_constructorPropertiesCount , wxT("Illegal Parameter Count for Create Method")) ;

                m_constructor->Create( object , Params ) ;
        }
 
                m_constructor->Create( object , Params ) ;
        }
 

-       // get number of parameters for constructor
-       virtual int GetCreateParamCount() const { return m_constructorPropertiesCount; }
+    // get number of parameters for constructor
+    virtual int GetCreateParamCount() const { return m_constructorPropertiesCount; }

 
 

-       // get i-th constructor parameter
-       virtual const wxChar* GetCreateParamName(int i) const { return m_constructorProperties[i] ; }
+    // get n-th constructor parameter
+    virtual const wxChar* GetCreateParamName(int n) const { return m_constructorProperties[n] ; }

 
 

-   // Runtime access to objects by property name, and variant data
-    virtual void SetProperty (wxObject *object, const wxChar *PropertyName, const wxxVariant &Value);
-    virtual wxxVariant GetProperty (wxObject *object, const wxChar *PropertyName);
+    // Runtime access to objects for simple properties (get/set) by property name, and variant data
+    virtual void SetProperty (wxObject *object, const wxChar *propertyName, const wxxVariant &value) const ;
+    virtual wxxVariant GetProperty (wxObject *object, const wxChar *propertyName) const;
+
+    // Runtime access to objects for collection properties by property name
+    virtual wxxVariantArray GetPropertyCollection(wxObject *object, const wxChar *propertyName) const ;
+    virtual void AddPropertyCollection(wxObject *object, const wxChar *propertyName , const wxxVariant& value) const ;

 
        // we must be able to cast variants to wxObject pointers, templates seem not to be suitable
 
        // we must be able to cast variants to wxObject pointers, templates seem not to be suitable

-       wxObject* VariantToInstance( const wxxVariant &data ) const { return m_variantToObjectConverter( data ) ; }
+       wxObject* VariantToInstance( wxxVariant &data ) const
+       {       if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT )
+                       return m_variantToObjectConverter( data ) ;
+               else
+                       return m_variantOfPtrToObjectConverter( data ) ;
+       }
+

        wxxVariant InstanceToVariant( wxObject *object ) const { return m_objectToVariantConverter( object ) ; }
        wxxVariant InstanceToVariant( wxObject *object ) const { return m_objectToVariantConverter( object ) ; }

-    
-       // find property by name
+
+    // find property by name

     virtual const wxPropertyInfo *FindPropertyInfo (const wxChar *PropertyName) const ;
 
     virtual const wxPropertyInfo *FindPropertyInfo (const wxChar *PropertyName) const ;
 

-       // find handler by name
+    // find handler by name

     virtual const wxHandlerInfo *FindHandlerInfo (const wxChar *PropertyName) const ;
 
     virtual const wxHandlerInfo *FindHandlerInfo (const wxChar *PropertyName) const ;
 

+    // find property by name
+    virtual const wxPropertyInfo *FindPropertyInfoInThisClass (const wxChar *PropertyName) const ;
+
+    // find handler by name
+    virtual const wxHandlerInfo *FindHandlerInfoInThisClass (const wxChar *PropertyName) const ;

 public:
     const wxChar            *m_className;
     int                      m_objectSize;
 public:
     const wxChar            *m_className;
     int                      m_objectSize;


@@ -987,37 +1280,73 @@ public:
     static wxClassInfo      *sm_first;
     wxClassInfo             *m_next;
 
     static wxClassInfo      *sm_first;
     wxClassInfo             *m_next;
 

-       // FIXME: this should be private (currently used directly by way too
+    // FIXME: this should be private (currently used directly by way too

     //        many clients)
     static wxHashTable      *sm_classTable;
 
     //        many clients)
     static wxHashTable      *sm_classTable;
 

+protected :
+       wxPropertyInfo *            m_firstProperty ;
+       wxHandlerInfo *         m_firstHandler ;

 private:
        const wxClassInfo**             m_parents ;
 private:
        const wxClassInfo**             m_parents ;

-       const wxPropertyInfo *  m_firstProperty ;
-       const wxHandlerInfo *   m_firstHandler ;

     const wxChar*                      m_unitName;
 
        wxConstructorBridge*    m_constructor ;
     const wxChar*                      m_unitName;
 
        wxConstructorBridge*    m_constructor ;

-       const wxChar **                 m_constructorProperties ; 
+       const wxChar **                 m_constructorProperties ;

        const int                               m_constructorPropertiesCount ;
        const int                               m_constructorPropertiesCount ;

-       wxVariantToObjectConverter m_variantToObjectConverter ; 
+       wxVariantToObjectConverter m_variantOfPtrToObjectConverter ;
+       wxVariantToObjectConverter m_variantToObjectConverter ;

        wxObjectToVariantConverter m_objectToVariantConverter ;
 
        wxObjectToVariantConverter m_objectToVariantConverter ;
 

-    const wxPropertyAccessor *FindAccessor (const wxChar *propertyName);
+    const wxPropertyAccessor *FindAccessor (const wxChar *propertyName) const ;

 
 

-       // registers the class
-       static void Register(const wxChar *name, wxClassInfo *info);
-       
-       static void Unregister(const wxChar *name);

 
 

-       // InitializeClasses() helper
-    static wxClassInfo *GetBaseByName(const wxChar *name);
+    // InitializeClasses() helper
+    static wxClassInfo *GetBaseByName(const wxChar *name) ;
+    
+protected:
+    // registers the class
+    void Register();
+    void Unregister();

 
     DECLARE_NO_COPY_CLASS(wxClassInfo)
 };
 
 
     DECLARE_NO_COPY_CLASS(wxClassInfo)
 };
 

+

 WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 
 WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 

+// ----------------------------------------------------------------------------
+// wxDynamicObject
+// ----------------------------------------------------------------------------
+//
+// this object leads to having a pure runtime-instantiation
+
+class wxDynamicClassInfo : public wxClassInfo
+{
+public :
+    wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName , const wxClassInfo* superClass ) ;
+    virtual ~wxDynamicClassInfo() ;
+
+    // constructs a wxDynamicObject with an instance
+    virtual wxObject *AllocateObject() const ;
+
+    // Call the Create method for a class
+    virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params) const ;
+
+    // get number of parameters for constructor
+    virtual int GetCreateParamCount() const ;
+
+    // get i-th constructor parameter
+    virtual const wxChar* GetCreateParamName(int i) const ;
+
+    // Runtime access to objects by property name, and variant data
+    virtual void SetProperty (wxObject *object, const wxChar *PropertyName, const wxxVariant &Value) const ;
+    virtual wxxVariant GetProperty (wxObject *object, const wxChar *PropertyName) const ;
+
+    void AddProperty( const wxChar *propertyName , const wxTypeInfo* typeInfo ) ;
+    void AddHandler( const wxChar *handlerName , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) ;
+} ;
+

 // ----------------------------------------------------------------------------
 // Dynamic class macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Dynamic class macros
 // ----------------------------------------------------------------------------


@@ -1026,16 +1355,16 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
  public:                                      \
   static wxClassInfo sm_class##name;          \
   static const wxClassInfo* sm_classParents##name[] ; \
  public:                                      \
   static wxClassInfo sm_class##name;          \
   static const wxClassInfo* sm_classParents##name[] ; \

-  static const wxPropertyInfo* GetPropertiesStatic() ; \
-  static const wxHandlerInfo* GetHandlersStatic() ; \
+  static wxPropertyInfo* GetPropertiesStatic() ; \
+  static wxHandlerInfo* GetHandlersStatic() ; \

   virtual wxClassInfo *GetClassInfo() const   \
    { return &name::sm_class##name; }
 
 #define DECLARE_DYNAMIC_CLASS(name)           \
   virtual wxClassInfo *GetClassInfo() const   \
    { return &name::sm_class##name; }
 
 #define DECLARE_DYNAMIC_CLASS(name)           \

-       _DECLARE_DYNAMIC_CLASS(name) \
-       static wxConstructorBridge* sm_constructor##name ; \
-       static const wxChar * sm_constructorProperties##name[] ; \
-       static const int sm_constructorPropertiesCount##name ;
+static wxConstructorBridge* sm_constructor##name ; \
+static const wxChar * sm_constructorProperties##name[] ; \
+static const int sm_constructorPropertiesCount##name ; \
+    _DECLARE_DYNAMIC_CLASS(name)

 
 #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \
     DECLARE_NO_ASSIGN_CLASS(name)               \
 
 #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \
     DECLARE_NO_ASSIGN_CLASS(name)               \


@@ -1058,38 +1387,79 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
  wxObject* wxConstructorFor##name()                             \
   { return new name; }                                          \
  const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,NULL } ; \
  wxObject* wxConstructorFor##name()                             \
   { return new name; }                                          \
  const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,NULL } ; \

- wxObject* wxVariantToObjectConverter##name ( const wxxVariant &data ) { return data.Get<name*>() ; } \
- wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
+ wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.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),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) wxConstructorFor##name   ,   \
                        name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name ,     \
  wxClassInfo name::sm_class##name(sm_classParents##name , 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);    \
- template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\
- template<> void wxStringWriteValue(wxString & , name* const & ){assert(0) ;}\
- template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
+                       name::sm_constructorPropertiesCount##name , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name);    \
+ template<> void wxStringReadValue(const wxString & , name & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") ) ;}\
+ template<> void wxStringWriteValue(wxString & , name const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringReadValue(const wxString & , name * & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") ) ;}\
+ template<> void wxStringWriteValue(wxString & , name* const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringReadValue(const wxString & , name ** & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringWriteValue(wxString & , name** const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> const wxTypeInfo* wxGetTypeInfo( name *** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; wxASSERT_MSG(0 , wxT("illegal specialization called") ) ; return &s_typeInfo ; } \
+ template<> const wxTypeInfo* wxGetTypeInfo( name * ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &name::sm_class##name) ; return &s_typeInfo ; } \
+ template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &name::sm_class##name) ; return &s_typeInfo ; }
+
+#define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit)                 \
+ 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*>() ; } \
+wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
+ wxClassInfo name::sm_class##name(sm_classParents##name , 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);    \
+ template<> void wxStringReadValue(const wxString & , name & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") ) ;}\
+ template<> void wxStringWriteValue(wxString & , name const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringReadValue(const wxString & , name * & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") ) ;}\
+ template<> void wxStringWriteValue(wxString & , name* const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringReadValue(const wxString & , name ** & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringWriteValue(wxString & , name** const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> const wxTypeInfo* wxGetTypeInfo( name *** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; wxASSERT_MSG(0 , wxT("illegal specialization called") ) ; return &s_typeInfo ; } \
+ template<> const wxTypeInfo* wxGetTypeInfo( name * ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &name::sm_class##name) ; return &s_typeInfo ; } \
+ template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &name::sm_class##name) ; return &s_typeInfo ; }
+
+#define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename ) \
+_IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , "" ) \
+const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
+const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
+WX_CONSTRUCTOR_DUMMY( name )

 
 #define IMPLEMENT_DYNAMIC_CLASS( name , basename ) \
 _IMPLEMENT_DYNAMIC_CLASS( name , basename , "" ) \
 
 #define IMPLEMENT_DYNAMIC_CLASS( name , basename ) \
 _IMPLEMENT_DYNAMIC_CLASS( name , basename , "" ) \

-const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
-const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
+wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
+wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \

 WX_CONSTRUCTOR_DUMMY( name )
 
 #define IMPLEMENT_DYNAMIC_CLASS_XTI( name , basename , unit ) \
 _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit )
 
 WX_CONSTRUCTOR_DUMMY( name )
 
 #define IMPLEMENT_DYNAMIC_CLASS_XTI( name , basename , unit ) \
 _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit )
 

-// this is for classes that do not derive from wxobject, there are no creators for these 
+#define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name , basename , unit ) \
+_IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit )
+
+// 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),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) 0   ,   \
 
 #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),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) 0   ,   \

-                       name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
-                       0 , 0 , 0 );    \
- template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\
- template<> void wxStringWriteValue(wxString & , name* const & ){assert(0) ;}\
- template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
+            name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
+            0 , 0 , 0 );    \
+ template<> void wxStringReadValue(const wxString & , name * & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringWriteValue(wxString & , name* const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringReadValue(const wxString & , name ** & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringWriteValue(wxString & , name** const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> const wxTypeInfo* wxGetTypeInfo( name *** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; wxASSERT_MSG(0 , wxT("illegal specialization called") ) ; return &s_typeInfo ; } \
+ template<> const wxTypeInfo* wxGetTypeInfo( name * ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &name::sm_class##name) ; return &s_typeInfo ; } \
+ template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &name::sm_class##name) ; return &s_typeInfo ; }

 
 // this is for subclasses that still do not derive from wxobject
 
 
 // this is for subclasses that still do not derive from wxobject
 


@@ -1098,11 +1468,16 @@ _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit )
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) 0   ,   \
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) 0   ,   \

-                       name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
-                       0 , 0 , 0 );    \
- template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\
- template<> void wxStringWriteValue(wxString & , name* const & ){assert(0) ;}\
- template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
+            name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
+            0 , 0 , 0 );    \
+ template<> void wxStringReadValue(const wxString & , name * & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringWriteValue(wxString & , name* const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringReadValue(const wxString & , name ** & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringWriteValue(wxString & , name** const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> const wxTypeInfo* wxGetTypeInfo( name *** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; wxASSERT_MSG(0 , wxT("illegal specialization called") ) ; return &s_typeInfo ; } \
+ template<> const wxTypeInfo* wxGetTypeInfo( name * ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &name::sm_class##name) ; return &s_typeInfo ; } \
+ template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &name::sm_class##name) ; return &s_typeInfo ; }
+

 
     // Multiple inheritance with two base classes
 
 
     // Multiple inheritance with two base classes
 


@@ -1110,25 +1485,29 @@ _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit )
  wxObject* wxConstructorFor##name()                             \
   { return new name; }                                          \
   const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,&basename2::sm_class##basename2 , NULL } ; \
  wxObject* wxConstructorFor##name()                             \
   { return new name; }                                          \
   const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,&basename2::sm_class##basename2 , NULL } ; \

- wxObject* wxVariantToObjectConverter##name ( const wxxVariant &data ) { return data.Get<name*>() ; } \
+ wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.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),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) wxConstructorFor##name   ,   \
  wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
  wxClassInfo name::sm_class##name(sm_classParents##name , 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);    \
- template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\
- template<> void wxStringWriteValue(wxString & , name* const & ){assert(0) ;}\
- template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
+            name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name ,     \
+            name::sm_constructorPropertiesCount##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \
+ template<> void wxStringReadValue(const wxString & , name * & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringWriteValue(wxString & , name* const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringReadValue(const wxString & , name ** & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringWriteValue(wxString & , name** const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> const wxTypeInfo* wxGetTypeInfo( name *** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID ) ; wxASSERT_MSG(0 , wxT("illegal specialization called") ) ; return &s_typeInfo ; } \
+ template<> const wxTypeInfo* wxGetTypeInfo( name * ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &name::sm_class##name) ; return &s_typeInfo ; } \
+ template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &name::sm_class##name) ; return &s_typeInfo ; }

 
 #define IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2) \
 _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "") \
 
 #define IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2) \
 _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "") \

-const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
-const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
+wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
+wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \

 WX_CONSTRUCTOR_DUMMY( name )
 
 #define IMPLEMENT_DYNAMIC_CLASS2_XTI( name , basename , basename2, unit) \
 WX_CONSTRUCTOR_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)

 
 // -----------------------------------
 // for abstract classes
 
 // -----------------------------------
 // for abstract classes


@@ -1138,21 +1517,26 @@ WX_CONSTRUCTOR_DUMMY( name )
 
 #define _IMPLEMENT_ABSTRACT_CLASS(name, basename)                \
  const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,NULL } ; \
 
 #define _IMPLEMENT_ABSTRACT_CLASS(name, basename)                \
  const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,NULL } ; \

- wxObject* wxVariantToObjectConverter##name ( const wxxVariant &data ) { return data.Get<name*>() ; } \
- wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
+ wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \
+ wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \
+wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \

  wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) 0   ,   \
                        name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) 0   ,   \
                        name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \

-                       0 , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \
- template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\
- template<> void wxStringWriteValue(wxString & , name* const & ){assert(0) ;}\
- template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
+                       0 , wxVariantOfPtrToObjectConverter##name ,wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \
+ template<> void wxStringReadValue(const wxString & , name * & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringWriteValue(wxString & , name* const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringReadValue(const wxString & , name ** & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> void wxStringWriteValue(wxString & , name** const & ){wxASSERT_MSG( 0 , wxT("Illegal Spezialication Called") );}\
+ template<> const wxTypeInfo* wxGetTypeInfo( name * ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &name::sm_class##name) ; return &s_typeInfo ; } \
+ template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &name::sm_class##name) ; return &s_typeInfo ; } \
+ template<> const wxTypeInfo* wxGetTypeInfo( name *** ){ static wxBuiltInTypeInfo s_typeInfo(wxT_VOID) ; assert(0) ; return &s_typeInfo ; }

 
 #define IMPLEMENT_ABSTRACT_CLASS( name , basename ) \
 _IMPLEMENT_ABSTRACT_CLASS( name , basename ) \
 
 #define IMPLEMENT_ABSTRACT_CLASS( name , basename ) \
 _IMPLEMENT_ABSTRACT_CLASS( name , basename ) \

-const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
-const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } 
+wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
+wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; }

 
     // Multiple inheritance with two base classes
 
 
     // Multiple inheritance with two base classes
 


@@ -1164,4 +1548,4 @@ const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NUL
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 

-#endif
\ No newline at end of file
+#endif