Applied SetForegorund colour patch for GTK2.

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

diff --git a/include/wx/xti.h b/include/wx/xti.h
index 8020d7b014550a90deb21c3449a77a834b2ab071..72484ba5c40da285b3bda24132bea65e354f06cc 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -38,12 +38,42 @@
 
 #include "wx/defs.h"
 #include "wx/memory.h"
 
 #include "wx/defs.h"
 #include "wx/memory.h"

-#include "wx/set.h"
+#include "wx/flags.h"

 #include "wx/string.h"
 #include "wx/arrstr.h"
 #include "wx/string.h"
 #include "wx/arrstr.h"

+#include "wx/hashmap.h"
+#include "wx/log.h"
+#include  "wx/intl.h"
+
+#include <typeinfo>
+
+// we will move this later to defs.h
+
+#if !wxCHECK_GCC_VERSION( 3 , 4 )
+#  define wxUSE_MEMBER_TEMPLATES 0
+#endif
+
+#ifdef _MSC_VER
+#  if _MSC_VER <= 1200
+#    define wxUSE_MEMBER_TEMPLATES 0
+#  endif
+#endif
+
+#ifndef wxUSE_MEMBER_TEMPLATES
+#define wxUSE_MEMBER_TEMPLATES 1
+#endif
+
+#if wxUSE_MEMBER_TEMPLATES
+#define wxTEMPLATED_MEMBER_CALL( method , type ) method<type>()
+#define wxTEMPLATED_MEMBER_FIX( type )
+#else
+#define wxTEMPLATED_MEMBER_CALL( method , type ) method((type*)NULL)
+#define wxTEMPLATED_MEMBER_FIX( type ) type* =NULL
+#endif

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

+class WXDLLIMPEXP_BASE wxDynamicClassInfo;

 class WXDLLIMPEXP_BASE wxHashTable;
 class WXDLLIMPEXP_BASE wxObjectRefData;
 class WXDLLIMPEXP_BASE wxEvent;
 class WXDLLIMPEXP_BASE wxHashTable;
 class WXDLLIMPEXP_BASE wxObjectRefData;
 class WXDLLIMPEXP_BASE wxEvent;


@@ -57,11 +87,11 @@ typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
 // implementation, an enum would have
 // to be enumerated eg :
 //
 // implementation, an enum would have
 // to be enumerated eg :
 //

-// WX_BEGIN_ENUM( wxFlavor )
-//   WX_ENUM_MEMBER( Vanilla )
-//   WX_ENUM_MEMBER( Chocolate )
-//   WX_ENUM_MEMBER( Strawberry )
-// WX_END_ENUM( wxFlavor )
+// wxBEGIN_ENUM( wxFlavor )
+//   wxENUM_MEMBER( Vanilla )
+//   wxENUM_MEMBER( Chocolate )
+//   wxENUM_MEMBER( Strawberry )
+// wxEND_ENUM( wxFlavor )

 // ----------------------------------------------------------------------------
 
 struct WXDLLIMPEXP_BASE wxEnumMemberData
 // ----------------------------------------------------------------------------
 
 struct WXDLLIMPEXP_BASE wxEnumMemberData


@@ -78,55 +108,48 @@ public :
     // 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
     // returns true if the member has been found and sets the int value
     // pointed to accordingly (if ptr != null )
     // if not found returns false, value left unchanged

-    bool HasEnumMemberValue( const wxChar *name , int *value = NULL ) ;
+    bool HasEnumMemberValue( const wxChar *name , int *value = NULL ) const ;

 
     // returns the value of the member, if not found in debug mode an
     // assert is issued, in release 0 is returned
 
     // returns the value of the member, if not found in debug mode an
     // assert is issued, in release 0 is returned

-    int GetEnumMemberValue(const wxChar *name );
+    int GetEnumMemberValue(const wxChar *name ) const ;

 
     // returns the name of the enum member having the passed in value
     // returns an emtpy string if not found
 
     // returns the name of the enum member having the passed in value
     // returns an emtpy string if not found

-    const wxChar *GetEnumMemberName(int value);
+    const wxChar *GetEnumMemberName(int value) const ;

 
     // returns the number of members in this enum
 
     // returns the number of members in this enum

-    int GetEnumCount() { return m_count ; }
+    int GetEnumCount() const { return m_count ; }

 
     // returns the value of the nth member
 
     // returns the value of the nth member

-    int GetEnumMemberValueByIndex( int n ) ;
+    int GetEnumMemberValueByIndex( int n ) const ;

 
     // returns the value of the nth member
 
     // returns the value of the nth member

-    const wxChar *GetEnumMemberNameByIndex( int n ) ;
+    const wxChar *GetEnumMemberNameByIndex( int n ) const ;

 private :
     wxEnumMemberData *m_members;
     int m_count ;
 };
 
 private :
     wxEnumMemberData *m_members;
     int m_count ;
 };
 

-#define WX_BEGIN_ENUM( e ) \
+#define wxBEGIN_ENUM( e ) \

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

-#define WX_ENUM_MEMBER( v ) { #v, v } ,
+#define wxENUM_MEMBER( v ) { wxT(#v), v } ,

 
 

-#define WX_END_ENUM( e ) { NULL , 0 } } ; \
+#define wxEND_ENUM( e ) { NULL , 0 } } ; \

     wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \
     wxEnumData *wxGetEnumData(e) { return &s_enumData##e ; } \
     wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \
     wxEnumData *wxGetEnumData(e) { return &s_enumData##e ; } \

-    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 wxEnumTypeInfo s_typeInfo(wxT_ENUM , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e>) ; return &s_typeInfo ; } \
-    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) ; \
-    }
+    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) ; \
+} \
+    void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant((e)data) ;} \
+    void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , e) ;} \
+    wxEnumTypeInfo s_typeInfo##e(wxT_ENUM , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &ToLong##e , &FromLong##e , typeid(e).name() ) ;

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


@@ -140,17 +163,17 @@ private :
 //  Strawberry,
 // };
 //
 //  Strawberry,
 // };
 //

-// typedef wxSet<wxFlavor> wxCoupe ;
+// typedef wxBitset<wxFlavor> wxCoupe ;

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

-// WX_BEGIN_ENUM( wxFlavor )
-//  WX_ENUM_MEMBER( Vanilla )
-//  WX_ENUM_MEMBER( Chocolate )
-//  WX_ENUM_MEMBER( Strawberry )
-// WX_END_ENUM( wxFlavor )
+// wxBEGIN_ENUM( wxFlavor )
+//  wxENUM_MEMBER( Vanilla )
+//  wxENUM_MEMBER( Chocolate )
+//  wxENUM_MEMBER( Strawberry )
+// wxEND_ENUM( wxFlavor )

 //
 //

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

 //
 // implementation note : no partial specialization for streaming, but a delegation to a
 // different class
 //
 // implementation note : no partial specialization for streaming, but a delegation to a
 // different class


@@ -161,10 +184,10 @@ 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 , wxBitset<e> &data )

 {
     wxEnumData* edata = wxGetEnumData((e) 0) ;
 {
     wxEnumData* edata = wxGetEnumData((e) 0) ;

-    data.Clear() ;
+    data.reset() ;

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


@@ -175,13 +198,13 @@ void wxSetFromString(const wxString &s , wxSet<e> &data )
         int ivalue ;
         if ( edata->HasEnumMemberValue( flag , &ivalue ) )
         {
         int ivalue ;
         if ( edata->HasEnumMemberValue( flag , &ivalue ) )
         {

-            data.Set( (e) ivalue ) ;
+            data.set( (e) ivalue ) ;

         }
     }
 }
 
 template<typename e>
         }
     }
 }
 
 template<typename e>

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

 {
     wxEnumData* edata = wxGetEnumData((e) 0) ;
     int count = edata->GetEnumCount() ;
 {
     wxEnumData* edata = wxGetEnumData((e) 0) ;
     int count = edata->GetEnumCount() ;


@@ -190,30 +213,93 @@ void wxSetToString( wxString &s , const wxSet<e> &data )
     for ( i = 0 ; i < count ; i++ )
     {
         e value = (e) edata->GetEnumMemberValueByIndex(i) ;
     for ( i = 0 ; i < count ; i++ )
     {
         e value = (e) edata->GetEnumMemberValueByIndex(i) ;

-        if ( data.Contains( value ) )
+        if ( data.test( value ) )

         {
             // this could also be done by the templated calls
             if ( !s.IsEmpty() )
         {
             // this could also be done by the templated calls
             if ( !s.IsEmpty() )

-                s +="|" ;
+                s +=wxT("|") ;

             s += edata->GetEnumMemberNameByIndex(i) ;
         }
     }
 }
 
             s += edata->GetEnumMemberNameByIndex(i) ;
         }
     }
 }
 

-//  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 ; }
-
-#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 ) ; \
+#define wxIMPLEMENT_SET_STREAMING(SetName,e) \
+    template<>  void wxStringReadValue(const wxString &s , wxBitset<e> &data ) \
+{ \
+    wxSetFromString( s , data ) ; \
+} \
+    template<>  void wxStringWriteValue( wxString &s , const wxBitset<e> &data ) \
+{ \
+    wxSetToString( s , data ) ; \
+} \
+    void FromLong##SetName( long data , wxxVariant& result ) { result = wxxVariant(SetName((unsigned long)data)) ;} \
+    void ToLong##SetName( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , SetName).to_ulong() ;} \
+    wxEnumTypeInfo s_typeInfo##SetName(wxT_SET , &s_enumData##e , &wxToStringConverter<SetName> , &wxFromStringConverter<SetName> , &ToLong##SetName , &FromLong##SetName, typeid(SetName).name() ) ;  \
+}
+
+template<typename e>
+void wxFlagsFromString(const wxString &s , e &data )
+{
+    wxEnumData* edata = wxGetEnumData((e*) 0) ;
+    data.m_data = 0 ;
+
+    wxArrayString array ;
+    wxSetStringToArray( s , array ) ;
+    wxString flag;
+    for ( size_t i = 0 ; i < array.Count() ; ++i )
+    {
+        flag = array[i] ;
+        int ivalue ;
+        if ( edata->HasEnumMemberValue( flag , &ivalue ) )
+        {
+            data.m_data |= ivalue ;
+        }

     }
     }

+}

 
 

+template<typename e>
+void wxFlagsToString( wxString &s , const e& data )
+{
+    wxEnumData* edata = wxGetEnumData((e*) 0) ;
+    int count = edata->GetEnumCount() ;
+    int i ;
+    s.Clear() ;
+    long dataValue = data.m_data ;
+    for ( i = 0 ; i < count ; i++ )
+    {
+        int value = edata->GetEnumMemberValueByIndex(i) ;
+        // make this to allow for multi-bit constants to work
+        if ( value && ( dataValue & value ) == value )
+        {
+            // clear the flags we just set
+            dataValue &= ~value ;
+            // this could also be done by the templated calls
+            if ( !s.IsEmpty() )
+                s +=wxT("|") ;
+            s += edata->GetEnumMemberNameByIndex(i) ;
+        }
+    }
+}
+
+#define wxBEGIN_FLAGS( e ) \
+    wxEnumMemberData s_enumDataMembers##e[] = {
+
+#define wxFLAGS_MEMBER( v ) { wxT(#v), v } ,

 
 

+#define wxEND_FLAGS( e ) { NULL , 0 } } ; \
+    wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \
+    wxEnumData *wxGetEnumData(e*) { return &s_enumData##e ; } \
+    template<>  void wxStringReadValue(const wxString &s , e &data ) \
+{ \
+    wxFlagsFromString<e>( s , data ) ; \
+} \
+    template<>  void wxStringWriteValue( wxString &s , const e& data ) \
+{ \
+    wxFlagsToString<e>( s , data ) ; \
+} \
+    void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant(e(data)) ;} \
+    void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , e).m_data ;} \
+    wxEnumTypeInfo s_typeInfo##e(wxT_SET , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &ToLong##e , &FromLong##e, typeid(e).name()  ) ;

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


@@ -238,14 +324,14 @@ enum wxTypeKind
     wxT_FLOAT,
     wxT_DOUBLE,
     wxT_STRING, // must be wxString
     wxT_FLOAT,
     wxT_DOUBLE,
     wxT_STRING, // must be wxString

-    wxT_SET, // must be wxSet<> template
+    wxT_SET, // must be wxBitset<> template

     wxT_ENUM,
     wxT_CUSTOM, // user defined type (e.g. wxPoint)
 
     wxT_LAST_SIMPLE_TYPE_KIND = wxT_CUSTOM ,
 
     wxT_OBJECT_PTR, // object reference
     wxT_ENUM,
     wxT_CUSTOM, // user defined type (e.g. wxPoint)
 
     wxT_LAST_SIMPLE_TYPE_KIND = wxT_CUSTOM ,
 
     wxT_OBJECT_PTR, // object reference

-       wxT_OBJECT , // embedded object
+    wxT_OBJECT , // embedded object

     wxT_COLLECTION , // collection
 
     wxT_DELEGATE , // for connecting against an event source
     wxT_COLLECTION , // collection
 
     wxT_DELEGATE , // for connecting against an event source


@@ -253,66 +339,154 @@ enum wxTypeKind
     wxT_LAST_TYPE_KIND = wxT_DELEGATE // sentinel for bad data, asserts, debugging
 };
 
     wxT_LAST_TYPE_KIND = wxT_DELEGATE // sentinel for bad data, asserts, debugging
 };
 

-class wxxVariant ;
+class WXDLLIMPEXP_BASE wxxVariant ;
+class WXDLLIMPEXP_BASE wxTypeInfo ;
+
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxTypeInfo* , wxTypeInfoMap , class WXDLLIMPEXP_BASE ) ;

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

-       wxTypeInfo() : m_kind( wxT_VOID) , m_toString(NULL) , m_fromString(NULL) {}
-       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 ; }
+    typedef void (*converterToString_t)( const wxxVariant& data , wxString &result ) ;
+    typedef void (*converterFromString_t)( const wxString& data , wxxVariant &result ) ;
+
+    wxTypeInfo(wxTypeKind kind,
+               converterToString_t to = NULL, converterFromString_t from = NULL,
+               const wxString &name = wxEmptyString):
+            m_toString(to), m_fromString(from), m_kind(kind), m_name(name)
+    {
+        Register();
+    }
+#if wxUSE_UNICODE
+    wxTypeInfo(wxTypeKind kind,
+               converterToString_t to = NULL, converterFromString_t from = NULL,
+               const char *name = ""):
+            m_toString(to), m_fromString(from), m_kind(kind), m_name(wxString::FromAscii(name))
+    {
+        Register();
+    }
+#endif
+
+    virtual ~wxTypeInfo()
+    {
+        Unregister() ;
+    }
+
+    // return the kind of this type (wxT_... constants)
+    wxTypeKind GetKind() const { return m_kind ; }
+
+    // returns the unique name of this type
+    const wxString& GetTypeName() const { return m_name ; }
+
+    // is this type a delegate type
+    bool IsDelegateType() const { return m_kind == wxT_DELEGATE ; }
+
+    // is this type a custom type
+    bool IsCustomType() const { return m_kind == wxT_CUSTOM ; }
+
+    // is this type an object type
+    bool IsObjectType() const { return m_kind == wxT_OBJECT || m_kind == wxT_OBJECT_PTR ; }
+
+    // can the content of this type be converted to and from strings ?

     bool HasStringConverters() const { return m_toString != NULL && m_fromString != NULL ; }
     bool HasStringConverters() const { return m_toString != NULL && m_fromString != NULL ; }

+
+    // convert a wxxVariant holding data of this type into a string

     void ConvertToString( const wxxVariant& data , wxString &result ) const
     void ConvertToString( const wxxVariant& data , wxString &result ) const

-    { wxASSERT_MSG( m_toString , wxT("String conversions not supported") ) ; (*m_toString)( data , result ) ; }
+
+    { if ( m_toString ) (*m_toString)( data , result ) ; else wxLogError( _("String conversions not supported") ) ; }
+
+    // convert a string into a wxxVariant holding the corresponding data in this type

     void ConvertFromString( const wxString& data , wxxVariant &result ) const
     void ConvertFromString( const wxString& data , wxxVariant &result ) const

-    { wxASSERT_MSG( m_fromString , wxT("String conversions not supported") ) ; (*m_fromString)( data , result ) ; }
+    { if( m_fromString ) (*m_fromString)( data , result ) ; else wxLogError( _("String conversions not supported") ) ; }

 
 

-protected :
-    typedef void (*converterToString_t)( const wxxVariant& data , wxString &result ) ;
-    typedef void (*converterFromString_t)( const wxString& data , wxxVariant &result ) ;
+#if wxUSE_UNICODE
+    static wxTypeInfo        *FindType(const char *typeName) { return FindType( wxString::FromAscii(typeName) ) ; }
+#endif
+    static wxTypeInfo        *FindType(const wxChar *typeName);
+
+private :
+
+    void Register();
+    void Unregister();

 
     converterToString_t m_toString ;
     converterFromString_t m_fromString ;
 
 
     converterToString_t m_toString ;
     converterFromString_t m_fromString ;
 

-    wxTypeKind m_kind ;
+    static wxTypeInfoMap*      ms_typeTable ;
+
+    wxTypeKind m_kind;
+    wxString m_name;

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

-    wxBuiltInTypeInfo( wxTypeKind kind , converterToString_t to = NULL , converterFromString_t from= NULL )
-    { wxASSERT_MSG( kind < wxT_SET , wxT("Illegal Kind for Base Type") ) ; m_kind = kind ; m_toString = to ; m_fromString = from ;}
+    wxBuiltInTypeInfo( wxTypeKind kind , converterToString_t to = NULL , converterFromString_t from = NULL , const wxString &name = wxEmptyString ) :
+       wxTypeInfo( kind , to , from , name )
+       { wxASSERT_MSG( GetKind() < wxT_SET , wxT("Illegal Kind for Base Type") ) ; }
+#if wxUSE_UNICODE
+    wxBuiltInTypeInfo( wxTypeKind kind , converterToString_t to  , converterFromString_t from  , const char *name  ) :
+       wxTypeInfo( kind , to , from , name )
+       { wxASSERT_MSG( GetKind() < wxT_SET , wxT("Illegal Kind for Base Type") ) ; }
+#endif

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

-    wxCustomTypeInfo( const wxChar *typeName , converterToString_t to= NULL  , converterFromString_t from= NULL )
-    { m_kind = wxT_CUSTOM ; m_typeName = typeName ;m_toString = to ; m_fromString = from ;}
-    const wxChar *GetTypeName() const { return m_typeName ; }
-private :
-    const wxChar *m_typeName; // Kind == wxT_CUSTOM
+    wxCustomTypeInfo( const wxString &name , converterToString_t to , converterFromString_t from ) :
+       wxTypeInfo( wxT_CUSTOM , to , from , name )
+       {}
+#if wxUSE_UNICODE
+    wxCustomTypeInfo( const char *name  , converterToString_t to , converterFromString_t from ) :
+       wxTypeInfo( wxT_CUSTOM , to , from , name )
+       {}
+#endif

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

-    wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo , converterToString_t to = NULL , converterFromString_t from= NULL  )
-    { wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET , wxT("Illegal Kind for Enum Type")) ; m_kind = kind ; m_enumInfo = enumInfo ;m_toString = to ; m_fromString = from ;}
+    typedef void (*converterToLong_t)( const wxxVariant& data , long &result ) ;
+    typedef void (*converterFromLong_t)( long data , wxxVariant &result ) ;
+
+    wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo , converterToString_t to , converterFromString_t from ,
+        converterToLong_t toLong , converterFromLong_t fromLong , const wxString &name  ) :
+    wxTypeInfo( kind , to , from , name ) , m_toLong( toLong ) , m_fromLong( fromLong )
+    { wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET , wxT("Illegal Kind for Enum Type")) ; m_enumInfo = enumInfo ;}
+
+#if wxUSE_UNICODE
+    wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo , converterToString_t to , converterFromString_t from ,
+        converterToLong_t toLong , converterFromLong_t fromLong , const char * name   ) :
+    wxTypeInfo( kind , to , from , name ) , m_toLong( toLong ) , m_fromLong( fromLong )
+    { wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET , wxT("Illegal Kind for Enum Type")) ; m_enumInfo = enumInfo ;}
+#endif

     const wxEnumData* GetEnumData() const { return m_enumInfo ; }
     const wxEnumData* GetEnumData() const { return m_enumInfo ; }

+
+    // convert a wxxVariant holding data of this type into a long
+    void ConvertToLong( const wxxVariant& data , long &result ) const
+
+    { if( m_toLong ) (*m_toLong)( data , result ) ; else wxLogError( _("Long Conversions not supported") ) ; }
+
+    // convert a long into a wxxVariant holding the corresponding data in this type
+    void ConvertFromLong( long data , wxxVariant &result ) const
+    { if( m_fromLong ) (*m_fromLong)( data , result ) ; else wxLogError( _("Long Conversions not supported") ) ;}
+

 private :
 private :

+    converterToLong_t m_toLong ;
+    converterFromLong_t m_fromLong ;
+

     wxEnumData *m_enumInfo; // Kind == wxT_ENUM or Kind == wxT_SET
 } ;
 
 class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo
 {
 public :
     wxEnumData *m_enumInfo; // Kind == wxT_ENUM or Kind == wxT_SET
 } ;
 
 class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo
 {
 public :

-       wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to = NULL  , converterFromString_t from = NULL )
-       { 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 ; }
+    wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to = NULL , converterFromString_t from = NULL , const wxString &name = wxEmptyString) ;
+#if wxUSE_UNICODE
+    wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to  , converterFromString_t from  , const char *name ) ;
+#endif
+    const wxClassInfo *GetClassInfo() const { return m_classInfo ; }

 private :
     wxClassInfo *m_classInfo; // Kind == wxT_OBJECT - could be NULL
 } ;
 private :
     wxClassInfo *m_classInfo; // Kind == wxT_OBJECT - could be NULL
 } ;


@@ -320,12 +494,22 @@ private :
 class WXDLLIMPEXP_BASE wxCollectionTypeInfo : public wxTypeInfo
 {
 public :
 class WXDLLIMPEXP_BASE wxCollectionTypeInfo : public wxTypeInfo
 {
 public :

-    wxCollectionTypeInfo( wxTypeInfo *elementType , converterToString_t to = NULL  , converterFromString_t from = NULL )
-    { m_kind = wxT_COLLECTION , m_elementType = elementType ; m_toString = to ; m_fromString = from ;}
-
-    const wxTypeInfo* GetElementType() const { return m_elementType ; }
+    wxCollectionTypeInfo( const wxString &elementName , converterToString_t to , converterFromString_t from  , const wxString &name) :
+       wxTypeInfo( wxT_COLLECTION , to , from , name )
+       { m_elementTypeName = elementName ; m_elementType = NULL ;}
+#if wxUSE_UNICODE
+    wxCollectionTypeInfo( const char *elementName , converterToString_t to , converterFromString_t from  , const char *name ) :
+       wxTypeInfo( wxT_COLLECTION , to , from , name )
+       { m_elementTypeName = wxString::FromAscii( elementName ) ; m_elementType = NULL ;}
+#endif
+       const wxTypeInfo* GetElementType() const 
+       { 
+           if ( m_elementType == NULL )
+               m_elementType = wxTypeInfo::FindType( m_elementTypeName ) ;
+           return m_elementType ; }

 private :
 private :

-    wxTypeInfo * m_elementType ;
+    mutable wxTypeInfo * m_elementType ;
+    wxString    m_elementTypeName ;

 } ;
 
 // a delegate is an exposed event source
 } ;
 
 // a delegate is an exposed event source


@@ -333,49 +517,31 @@ private :
 class WXDLLIMPEXP_BASE wxDelegateTypeInfo : public wxTypeInfo
 {
 public :
 class WXDLLIMPEXP_BASE wxDelegateTypeInfo : public wxTypeInfo
 {
 public :

-    wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass , converterToString_t to = NULL  , converterFromString_t from = NULL )
-    { m_kind = wxT_DELEGATE ; m_eventClass = eventClass ; m_eventType = eventType ;m_toString = to ; m_fromString = from ;}
-    const wxClassInfo *GetEventClass() const { assert( m_kind == wxT_DELEGATE ) ; return m_eventClass ; }
+    wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass , converterToString_t to = NULL , converterFromString_t from = NULL ) ;
+    wxDelegateTypeInfo( int eventType , int lastEventType, wxClassInfo* eventClass , converterToString_t to = NULL , converterFromString_t from = NULL ) ;

     int GetEventType() const { return m_eventType ; }
     int GetEventType() const { return m_eventType ; }

+    int GetLastEventType() const { return m_lastEventType ; }
+    const wxClassInfo* GetEventClass() const { return m_eventClass ; }

 private :
     const wxClassInfo *m_eventClass; // (extended will merge into classinfo)
     int m_eventType ;
 private :
     const wxClassInfo *m_eventClass; // (extended will merge into classinfo)
     int m_eventType ;

+    int m_lastEventType ;

 } ;
 
 } ;
 

-template<typename T> const wxTypeInfo* wxGetTypeInfo( T * ) ;
-
-template<typename T> const wxTypeInfo* wxGetTypeInfo( wxSet<T> * )
-{
-    static wxEnumTypeInfo s_typeInfo(wxT_SET , wxGetEnumData((T) 0) ) ; return &s_typeInfo ;
-}
+template<typename T> const wxTypeInfo* wxGetTypeInfo( T * ) { return wxTypeInfo::FindType(typeid(T).name()) ; }

 
 // this macro is for usage with custom, non-object derived classes and structs, wxPoint is such a custom type
 
 
 // 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 wxBuiltInTypeInfo s_typeInfo(wxT_VOID) ; assert(0) ; return &s_typeInfo ; } \
-    template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxCustomTypeInfo s_typeInfo(#e, &wxToStringConverter<e> , &wxFromStringConverter<e>) ; return &s_typeInfo ; }
+#define wxCUSTOM_TYPE_INFO( e , toString , fromString ) \
+    wxCustomTypeInfo s_typeInfo##e(typeid(e).name() , &toString , &fromString) ;

 
 

-// templated streaming, every type must have their specialization for these methods
+#define wxCOLLECTION_TYPE_INFO( element , collection ) \
+    wxCollectionTypeInfo s_typeInfo##collection( typeid(element).name() , NULL , NULL , typeid(collection).name() ) ;

 
 

-template<typename T>
-void wxStringReadValue( const wxString &s , T &data );
-
-template<typename T>
-void wxStringWriteValue( wxString &s , const T &data);
+// sometimes a compiler invents specializations that are nowhere called, use this macro to satisfy the refs, currently
+// we don't have to play tricks, but if we will have to according to the compiler, we will use that macro for that

 
 

-template<typename T>
-void wxToStringConverter( const wxxVariant &v, wxString &s) { wxStringWriteValue( s , v.Get<T>() ) ; }
-
-template<typename T>
-void wxFromStringConverter( const wxString &s, wxxVariant &v) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; } \
-
-// sometimes a compiler invents specializations that are nowhere called, use this macro to satisfy the refs
-
-#define WX_ILLEGAL_TYPE_SPECIALIZATION( a ) \
-template<> const wxTypeInfo* wxGetTypeInfo( a * ) { assert(0) ; \
-    static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ; return &s_typeInfo ; } \
-template<> void wxStringReadValue(const wxString & , a & ) { assert(0) ; }\
-template<> void wxStringWriteValue(wxString & , a const & ) { assert(0) ; }
+#define wxILLEGAL_TYPE_SPECIALIZATION( a )

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


@@ -393,19 +559,19 @@ public:
     virtual const wxTypeInfo* GetTypeInfo() const = 0 ;
 } ;
 
     virtual const wxTypeInfo* GetTypeInfo() const = 0 ;
 } ;
 

-template<typename T> class WXDLLIMPEXP_BASE wxxVariantDataT : public wxxVariantData
+template<typename T> class wxxVariantDataT : public wxxVariantData

 {
 public:
     wxxVariantDataT(const T& d) : m_data(d) {}
 {
 public:
     wxxVariantDataT(const T& d) : m_data(d) {}

-       virtual ~wxxVariantDataT() {}
+    virtual ~wxxVariantDataT() {}

 
 

-       // get a ref to the stored data
+    // get a ref to the stored data

     T & Get() { return m_data; }
 
     T & Get() { return m_data; }
 

-       // get a const ref to the stored data
+    // get a const ref to the stored data

     const T & Get() const { return m_data; }
 
     const T & Get() const { return m_data; }
 

-       // set the data
+    // set the data

     void Set(const T& d) { m_data =  d; }
 
     // return a heap allocated duplicate
     void Set(const T& d) { m_data =  d; }
 
     // return a heap allocated duplicate


@@ -413,6 +579,7 @@ public:
 
     // returns the type info of the contentc
     virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( (T*) NULL ) ; }
 
     // returns the type info of the contentc
     virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( (T*) NULL ) ; }

+

 private:
     T m_data;
 };
 private:
     T m_data;
 };


@@ -420,64 +587,66 @@ private:
 class WXDLLIMPEXP_BASE wxxVariant
 {
 public :
 class WXDLLIMPEXP_BASE wxxVariant
 {
 public :

-       wxxVariant() { m_data = NULL ; }
-       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( const T& data , const wxString& name = wxT("") ) :
-               m_data(new wxxVariantDataT<T>(data) ), m_name(name) {}
-
-       ~wxxVariant() { delete m_data ; }
-
-       // get a ref to the stored data
-       template<typename T> T& Get()
-       {
-               wxxVariantDataT<T> *dataptr = dynamic_cast<wxxVariantDataT<T>*> (m_data) ;
-               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() ;
-       }
+    wxxVariant() { m_data = NULL ; }
+    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( const T& data , const wxString& name = wxT("") ) :
+    m_data(new wxxVariantDataT<T>(data) ), m_name(name) {}
+
+    ~wxxVariant() { delete m_data ; }
+
+    // get a ref to the stored data
+    template<typename T> T& Get(wxTEMPLATED_MEMBER_FIX(T))
+    {
+        wxxVariantDataT<T> *dataptr = dynamic_cast<wxxVariantDataT<T>*> (m_data) ;
+        wxASSERT_MSG( dataptr , wxT("Cast not possible") ) ;
+        return dataptr->Get() ;
+    }
+
+    // get a ref to the stored data
+    template<typename T> const T& Get(wxTEMPLATED_MEMBER_FIX(T)) const
+    {
+        const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;
+        wxASSERT_MSG( dataptr , wxT("Cast not possible") ) ;
+        return dataptr->Get() ;
+    }
+
+    bool IsEmpty() const { return m_data == NULL ; }

 
     template<typename T> bool HasData() const
     {
 
     template<typename T> bool HasData() const
     {

-               const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;
+        const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;

         return dataptr != NULL ;
     }
 
         return dataptr != NULL ;
     }
 

-       // stores the data
-       template<typename T> void Set(const T& data) const
-       {
-               delete m_data ;
-               m_data = new wxxVariantDataT<T>(data) ;
-       }
-
-       wxxVariant& operator=(const wxxVariant &d)
-       {
-               m_data = d.m_data->Clone() ;
-               m_name = d.m_name ;
-               return *this ;
-       }
-
-       // gets the stored data casted to a wxObject* , returning NULL if cast is not possible
-       wxObject* GetAsObject() ;
-
-       // get the typeinfo of the stored object
-       const wxTypeInfo* GetTypeInfo() const { return m_data->GetTypeInfo() ; }
-
-       // returns this value as string
-       wxString GetAsString() const
-       {
-               wxString s ;
+    // stores the data
+    template<typename T> void Set(const T& data) const
+    {
+        delete m_data ;
+        m_data = new wxxVariantDataT<T>(data) ;
+    }
+
+    wxxVariant& operator=(const wxxVariant &d)
+    {
+        m_data = d.m_data->Clone() ;
+        m_name = d.m_name ;
+        return *this ;
+    }
+
+    // gets the stored data casted to a wxObject* , returning NULL if cast is not possible
+    wxObject* GetAsObject() ;
+
+    // get the typeinfo of the stored object
+    const wxTypeInfo* GetTypeInfo() const { return m_data->GetTypeInfo() ; }
+
+    // returns this value as string
+    wxString GetAsString() const
+    {
+        wxString s ;

         GetTypeInfo()->ConvertToString( *this , s ) ;
         GetTypeInfo()->ConvertToString( *this , s ) ;

-               return s ;
-       }
+        return s ;
+    }

     const wxString& GetName() const { return m_name ; }
 private :
     wxxVariantData* m_data ;
     const wxString& GetName() const { return m_name ; }
 private :
     wxxVariantData* m_data ;


@@ -488,6 +657,20 @@ private :
 
 WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE);
 
 
 WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE);
 

+// templated streaming, every type must have their specialization for these methods
+
+template<typename T>
+void wxStringReadValue( const wxString &s , T &data );
+
+template<typename T>
+void wxStringWriteValue( wxString &s , const T &data);
+
+template<typename T>
+void wxToStringConverter( const wxxVariant &v, wxString &s) { wxStringWriteValue( s , v.wxTEMPLATED_MEMBER_CALL(Get , T) ) ; }
+
+template<typename T>
+void wxFromStringConverter( const wxString &s, wxxVariant &v) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; } \
+

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


@@ -496,30 +679,33 @@ WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BAS
 // want access, look at wxPropertyAccessor.
 // ----------------------------------------------------------------------------
 
 // want access, look at wxPropertyAccessor.
 // ----------------------------------------------------------------------------
 

-class wxSetter
+class WXDLLIMPEXP_BASE wxSetter

 {
 {

-public :
+public:

     wxSetter( const wxString name ) { m_name = name ; }
     wxSetter( const wxString name ) { m_name = name ; }

+    virtual ~wxSetter() {}

     virtual void Set( wxObject *object, const wxxVariant &variantValue ) const = 0;
     const wxString& GetName() const { return m_name ; }
     virtual void Set( wxObject *object, const wxxVariant &variantValue ) const = 0;
     const wxString& GetName() const { return m_name ; }

-private :
-    wxString m_name ;
-} ;
+private:
+    wxString m_name;
+};

 
 

-class wxGetter
+class WXDLLIMPEXP_BASE wxGetter

 {
 {

-public :
+public:

     wxGetter( const wxString name ) { m_name = name ; }
     wxGetter( const wxString name ) { m_name = name ; }

+    virtual ~wxGetter() {}

     virtual void Get( const wxObject *object , wxxVariant& result) const = 0;
     const wxString& GetName() const { return m_name ; }
     virtual void Get( const wxObject *object , wxxVariant& result) const = 0;
     const wxString& GetName() const { return m_name ; }

-private :
-    wxString m_name ;
-} ;
+private:
+    wxString m_name;
+};

 
 

-class wxCollectionGetter
+class WXDLLIMPEXP_BASE wxCollectionGetter

 {
 public :
     wxCollectionGetter( const wxString name ) { m_name = name ; }
 {
 public :
     wxCollectionGetter( const wxString name ) { m_name = name ; }

+    virtual ~wxCollectionGetter() {}

     virtual void Get( const wxObject *object , wxxVariantArray& result) const = 0;
     const wxString& GetName() const { return m_name ; }
 private :
     virtual void Get( const wxObject *object , wxxVariantArray& result) const = 0;
     const wxString& GetName() const { return m_name ; }
 private :


@@ -528,10 +714,11 @@ private :
 
 template<typename coll_t> void wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ;
 
 
 template<typename coll_t> void wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ;
 

-class wxAdder
+class WXDLLIMPEXP_BASE wxAdder

 {
 public :
     wxAdder( const wxString name ) { m_name = name ; }
 {
 public :
     wxAdder( const wxString name ) { m_name = name ; }

+    virtual ~wxAdder() {}

     virtual void Add( wxObject *object, const wxxVariant &variantValue ) const= 0;
     const wxString& GetName() const { return m_name ; }
 private :
     virtual void Add( wxObject *object, const wxxVariant &variantValue ) const= 0;
     const wxString& GetName() const { return m_name ; }
 private :


@@ -540,59 +727,63 @@ private :
 
 
 
 
 
 

-#define WX_SETTER( property, Klass, valueType, setterMethod ) \
-    class wxSetter##property : public wxSetter \
-    { \
-    public: \
-        wxSetter##property() : wxSetter( #setterMethod ) {} \
-        void Set( wxObject *object, const wxxVariant &variantValue ) const \
-        { \
-            Klass *obj = dynamic_cast<Klass*>(object) ;  \
-            if ( variantValue.HasData<valueType>() ) \
-                obj->setterMethod(variantValue.Get<valueType>()) ; \
+#define wxSETTER( property, Klass, valueType, setterMethod ) \
+class wxSetter##property : public wxSetter \
+{ \
+public: \
+    wxSetter##property() : wxSetter( wxT(#setterMethod) ) {} \
+    ~wxSetter##property() {} \
+    void Set( wxObject *object, const wxxVariant &variantValue ) const \
+{ \
+    Klass *obj = dynamic_cast<Klass*>(object) ;  \
+    if ( variantValue.HasData<valueType>() ) \
+    obj->setterMethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \

             else \
             else \

-                obj->setterMethod(*variantValue.Get<valueType*>()) ; \
-        } \
-    } ;
-
-#define WX_GETTER( property, Klass, valueType , gettermethod ) \
-    class wxGetter##property : public wxGetter \
-    { \
-    public : \
-        wxGetter##property() : wxGetter( #gettermethod ) {} \
-        void Get( const wxObject *object , wxxVariant &result) const \
-        { \
-            const Klass *obj = dynamic_cast<const Klass*>(object) ;  \
-            result = wxxVariant( obj->gettermethod() ) ; \
-        } \
-    } ;
-
-#define WX_ADDER( property, Klass, valueType , addermethod ) \
-    class wxAdder##property : public wxAdder \
-    { \
-    public: \
-        wxAdder##property() : wxAdder( #addermethod ) {} \
-        void Add( wxObject *object, const wxxVariant &variantValue ) const \
-        { \
-            Klass *obj = dynamic_cast<Klass*>(object) ;  \
-            if ( variantValue.HasData<valueType>() ) \
-                obj->addermethod(variantValue.Get<valueType>()) ; \
+            obj->setterMethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \
+} \
+} ;
+
+#define wxGETTER( property, Klass, valueType , gettermethod ) \
+class wxGetter##property : public wxGetter \
+{ \
+public : \
+    wxGetter##property() : wxGetter( wxT(#gettermethod) ) {} \
+    ~wxGetter##property() {} \
+    void Get( const wxObject *object , wxxVariant &result) const \
+{ \
+    const Klass *obj = dynamic_cast<const Klass*>(object) ;  \
+    result = wxxVariant( obj->gettermethod() ) ; \
+} \
+} ;
+
+#define wxADDER( property, Klass, valueType , addermethod ) \
+class wxAdder##property : public wxAdder \
+{ \
+public: \
+    wxAdder##property() : wxAdder( wxT(#addermethod) ) {} \
+    ~wxAdder##property() {} \
+    void Add( wxObject *object, const wxxVariant &variantValue ) const \
+{ \
+    Klass *obj = dynamic_cast<Klass*>(object) ;  \
+    if ( variantValue.HasData<valueType>() ) \
+    obj->addermethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \

             else \
             else \

-                obj->addermethod(*variantValue.Get<valueType*>()) ; \
-        } \
-    } ;
-
-#define WX_COLLECTION_GETTER( property, Klass, valueType , gettermethod ) \
-    class wxCollectionGetter##property : public wxCollectionGetter \
-    { \
-    public : \
-        wxCollectionGetter##property() : wxCollectionGetter( #gettermethod ) {} \
-        void Get( const wxObject *object , wxxVariantArray &result) const \
-        { \
-            const Klass *obj = dynamic_cast<const Klass*>(object) ;  \
-            wxCollectionToVariantArray( obj->gettermethod() , result ) ; \
-        } \
-    } ;
+            obj->addermethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \
+} \
+} ;
+
+#define wxCOLLECTION_GETTER( property, Klass, valueType , gettermethod ) \
+class wxCollectionGetter##property : public wxCollectionGetter \
+{ \
+public : \
+    wxCollectionGetter##property() : wxCollectionGetter( wxT(#gettermethod) ) {} \
+    ~wxCollectionGetter##property() {} \
+    void Get( const wxObject *object , wxxVariantArray &result) const \
+{ \
+    const Klass *obj = dynamic_cast<const Klass*>(object) ;  \
+    wxCollectionToVariantArray( obj->gettermethod() , result ) ; \
+} \
+} ;

 
 class WXDLLIMPEXP_BASE wxPropertyAccessor
 {
 
 class WXDLLIMPEXP_BASE wxPropertyAccessor
 {


@@ -604,19 +795,19 @@ public :
 
     // Setting a simple property (non-collection)
     virtual void SetProperty(wxObject *object, const wxxVariant &value) const
 
     // Setting a simple property (non-collection)
     virtual void SetProperty(wxObject *object, const wxxVariant &value) const

-    { wxASSERT_MSG(m_setter,wxT("SetProperty called w/o valid setter") ) ; m_setter->Set( object , value ) ;}
+    { if ( m_setter ) m_setter->Set( object , value ) ; else wxLogError( _("SetProperty called w/o valid setter") ) ;}

 
     // Getting a simple property (non-collection)
     virtual void GetProperty(const wxObject *object, wxxVariant &result) const
 
     // Getting a simple property (non-collection)
     virtual void GetProperty(const wxObject *object, wxxVariant &result) const

-    { wxASSERT_MSG(m_getter,wxT("GetProperty called w/o valid getter") ) ; return m_getter->Get( object , result ) ;}
+    { if ( m_getter ) m_getter->Get( object , result ) ; else wxLogError( _("GetProperty called w/o valid getter") ) ;}

 
     // Adding an element to a collection property
     virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const
 
     // Adding an element to a collection property
     virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const

-    { wxASSERT_MSG(m_adder,wxT("AddToPropertyCollection called w/o valid adder") ) ; m_adder->Add( object , value ) ;}
+    { if ( m_adder ) m_adder->Add( object , value ) ; else wxLogError( _("AddToPropertyCollection called w/o valid adder") ) ;}

 
     // Getting a collection property
     virtual void GetPropertyCollection( const wxObject *obj, wxxVariantArray &result) const
 
     // Getting a collection property
     virtual void GetPropertyCollection( const wxObject *obj, wxxVariantArray &result) const

-    { wxASSERT_MSG(m_collectionGetter,wxT("GetPropertyCollection called w/o valid collection getter") ) ; return m_collectionGetter->Get( obj , result) ;}
+    { if ( m_collectionGetter ) m_collectionGetter->Get( obj , result) ; else wxLogError( _("GetPropertyCollection called w/o valid collection getter") ) ;}

 
     virtual bool HasSetter() const { return m_setter != NULL ; }
     virtual bool HasCollectionGetter() const { return m_collectionGetter != NULL ; }
 
     virtual bool HasSetter() const { return m_setter != NULL ; }
     virtual bool HasCollectionGetter() const { return m_collectionGetter != NULL ; }


@@ -631,10 +822,7 @@ public :
     { return m_setter->GetName() ; }
     virtual const wxString& GetAdderName() const
     { return m_adder->GetName() ; }
     { return m_setter->GetName() ; }
     virtual const wxString& GetAdderName() const
     { return m_adder->GetName() ; }

-    /*
-    virtual wxxVariant ReadValue( const wxString &value ) const ;
-    virtual void WriteValue( wxString& value , const wxObject *o ) const ;
-    */
+

 protected :
     wxSetter *m_setter ;
     wxAdder *m_adder ;
 protected :
     wxSetter *m_setter ;
     wxAdder *m_adder ;


@@ -642,153 +830,323 @@ protected :
     wxCollectionGetter* m_collectionGetter ;
 };
 
     wxCollectionGetter* m_collectionGetter ;
 };
 

- class WXDLLIMPEXP_BASE wxGenericPropertyAccessor : public wxPropertyAccessor
- {
- public :
-     wxGenericPropertyAccessor( const wxString &propName ) ;
-     ~wxGenericPropertyAccessor() ;
+class WXDLLIMPEXP_BASE wxGenericPropertyAccessor : public wxPropertyAccessor
+{
+public :
+    wxGenericPropertyAccessor( const wxString &propName ) ;
+    ~wxGenericPropertyAccessor() ;

 
 

-     virtual bool HasSetter() const { return true ; }
-     virtual bool HasGetter() const { return true ; }
-     virtual bool HasAdder() const { return false ; }
-     virtual bool HasCollectionGetter() const { return false ; }
+    void RenameProperty( const wxString &oldName , const wxString &newName )
+    {
+        wxASSERT( oldName == m_propertyName ) ; m_propertyName = newName ;
+    }
+    virtual bool HasSetter() const { return true ; }
+    virtual bool HasGetter() const { return true ; }
+    virtual bool HasAdder() const { return false ; }
+    virtual bool HasCollectionGetter() const { return false ; }

 
 

-     virtual const wxString&  GetGetterName() const
+    virtual const wxString&  GetGetterName() const

     { return m_getterName ; }
     virtual const wxString& GetSetterName() const
     { return m_setterName ; }
 
     virtual void SetProperty(wxObject *object, const wxxVariant &value) const ;
     { return m_getterName ; }
     virtual const wxString& GetSetterName() const
     { return m_setterName ; }
 
     virtual void SetProperty(wxObject *object, const wxxVariant &value) const ;

-     virtual void GetProperty(const wxObject *object, wxxVariant &value) const ;
-
-     // Adding an element to a collection property
-     virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const
-     { wxASSERT_MSG(0,wxT("AddToPropertyCollection called on a generic accessor") ) ;}
-
-     // Getting a collection property
-     virtual void GetPropertyCollection( const wxObject *obj, wxxVariantArray &result) const
-    { wxASSERT_MSG(0,wxT("GetPropertyCollection called on a generic accessor") ) ;}
- private :
-     struct wxGenericPropertyAccessorInternal ;
-     wxGenericPropertyAccessorInternal* m_data ;
-     wxString m_propertyName ;
-     wxString m_setterName ;
-     wxString m_getterName ;
+    virtual void GetProperty(const wxObject *object, wxxVariant &value) const ;
+
+    // Adding an element to a collection property
+    virtual void AddToPropertyCollection(wxObject *WXUNUSED(object), const wxxVariant &WXUNUSED(value)) const
+    { wxLogError( _("AddToPropertyCollection called on a generic accessor") ) ;}
+
+    // Getting a collection property
+    virtual void GetPropertyCollection( const wxObject *WXUNUSED(obj), wxxVariantArray &WXUNUSED(result)) const
+    { wxLogError ( _("GetPropertyCollection called on a generic accessor") ) ;}
+private :
+    struct wxGenericPropertyAccessorInternal ;
+    wxGenericPropertyAccessorInternal* m_data ;
+    wxString m_propertyName ;
+    wxString m_setterName ;
+    wxString m_getterName ;

 } ;
 
 } ;
 

+typedef long wxPropertyInfoFlags ;
+enum {
+    // will be removed in future releases
+    wxPROP_DEPRECATED       = 0x00000001 ,
+    // object graph property, will be streamed with priority (after constructor properties)
+    wxPROP_OBJECT_GRAPH     = 0x00000002 ,
+    // this will only be streamed out and in as enum/set, the internal representation is still a long
+    wxPROP_ENUM_STORE_LONG  = 0x00000004 ,
+    // don't stream out this property, needed eg to avoid streaming out children that are always created by their parents
+    wxPROP_DONT_STREAM = 0x00000008 ,
+}  ;
+

 class WXDLLIMPEXP_BASE wxPropertyInfo
 {
 class WXDLLIMPEXP_BASE wxPropertyInfo
 {

+    friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ;

 public :
 public :

-       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)
-       {
-        Insert(iter) ;
-       }
+    wxPropertyInfo(wxPropertyInfo* &iter,
+                   wxClassInfo* itsClass,
+                   const wxString& name,
+                   const wxString& typeName,
+                   wxPropertyAccessor *accessor,
+                   wxxVariant dv,
+                   wxPropertyInfoFlags flags = 0,
+                   const wxString& helpString = wxEmptyString,
+                   const wxString& groupString = wxEmptyString) :
+                   m_itsClass(itsClass),
+           m_name(name),
+           m_typeInfo(NULL),
+           m_typeName(typeName) ,
+           m_collectionElementTypeInfo(NULL),
+           m_accessor(accessor),
+           m_defaultValue(dv),
+           m_flags(flags),
+           m_helpString(helpString),
+           m_groupString(groupString)
+       {
+           Insert(iter);
+       }
+
+#if wxUSE_UNICODE
+    wxPropertyInfo(wxPropertyInfo* &iter,
+                   wxClassInfo* itsClass,
+                   const wxString& name,
+                   const char* typeName,
+                   wxPropertyAccessor *accessor,
+                   wxxVariant dv,
+                   wxPropertyInfoFlags flags = 0,
+                   const wxString& helpString = wxEmptyString,
+                   const wxString& groupString = wxEmptyString) :
+                   m_itsClass(itsClass),
+           m_name(name),
+           m_typeInfo(NULL),
+           m_typeName(wxString::FromAscii(typeName)) ,
+           m_collectionElementTypeInfo(NULL),
+           m_accessor(accessor),
+           m_defaultValue(dv),
+           m_flags(flags),
+           m_helpString(helpString),
+           m_groupString(groupString)
+       {
+           Insert(iter);
+       }
+#endif
+    wxPropertyInfo(wxPropertyInfo* &iter,
+                   wxClassInfo* itsClass,
+                   const wxString& name,
+                   wxDelegateTypeInfo* type,
+                   wxPropertyAccessor *accessor,
+                   wxxVariant dv,
+                   wxPropertyInfoFlags flags = 0,
+                   const wxString& helpString = wxEmptyString,
+                   const wxString& groupString = wxEmptyString) :
+           m_itsClass(itsClass),
+           m_name(name),
+           m_typeInfo(type),
+           m_collectionElementTypeInfo(NULL),
+           m_accessor(accessor),
+           m_defaultValue(dv),
+           m_flags(flags),
+           m_helpString(helpString),
+           m_groupString(groupString)
+       {
+           Insert(iter);
+       }
+
+       wxPropertyInfo(wxPropertyInfo* &iter,
+                      wxClassInfo* itsClass, const wxString& name,
+                      const wxString& collectionTypeName,
+                      const wxString& elementTypeName,
+                      wxPropertyAccessor *accessor,
+                      wxPropertyInfoFlags flags = 0,
+                      const wxString& helpString = wxEmptyString,
+                      const wxString& groupString = wxEmptyString) :
+           m_itsClass(itsClass),
+           m_name(name),
+           m_typeInfo(NULL),
+           m_typeName(collectionTypeName) ,
+           m_collectionElementTypeInfo(NULL),
+           m_collectionElementTypeName(elementTypeName),
+           m_accessor(accessor) ,
+           m_flags(flags),
+           m_helpString(helpString),
+           m_groupString(groupString)
+       {
+           Insert(iter);
+       }
+
+#if wxUSE_UNICODE
+              wxPropertyInfo(wxPropertyInfo* &iter,
+                      wxClassInfo* itsClass, const wxString& name,
+                      const char* collectionTypeName,
+                      const char* elementTypeName,
+                      wxPropertyAccessor *accessor,
+                      wxPropertyInfoFlags flags = 0,
+                      const wxString& helpString = wxEmptyString,
+                      const wxString& groupString = wxEmptyString) :
+           m_itsClass(itsClass),
+           m_name(name),
+           m_typeInfo(NULL),
+           m_typeName(wxString::FromAscii(collectionTypeName)) ,
+           m_collectionElementTypeInfo(NULL),
+           m_collectionElementTypeName(wxString::FromAscii(elementTypeName)),
+           m_accessor(accessor) ,
+           m_flags(flags),
+           m_helpString(helpString),
+           m_groupString(groupString)
+       {
+           Insert(iter);
+       }
+#endif
+       ~wxPropertyInfo() ;
+
+       // return the class this property is declared in
+       const wxClassInfo*   GetDeclaringClass() const { return m_itsClass ; }
+
+       // return the name of this property
+       const wxString&         GetName() const { return m_name ; }

 
 

-       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) ;
-       }
+       // returns the flags of this property
+       wxPropertyInfoFlags  GetFlags() const { return m_flags ;}

 
 

-       // return the name of this property
-       const wxChar *          GetName() const { return m_name ; }
+       // returns the short help string of this property
+       const wxString&     GetHelpString() const { return m_helpString ; }

 
 

-       // return the element type info of this property (for collections, otherwise NULL)
-       const wxTypeInfo *      GetCollectionElementTypeInfo() const { return m_collectionElementTypeInfo ; }
+       // returns the group string of this property
+       const wxString&     GetGroupString() const { return m_groupString ; }

 
 

-    // return the type info of this property
-       const wxTypeInfo *      GetTypeInfo() const { return m_typeInfo ; }
+       // return the element type info of this property (for collections, otherwise NULL)
+       const wxTypeInfo *      GetCollectionElementTypeInfo() const
+       {
+           if ( m_collectionElementTypeInfo == NULL )
+               m_collectionElementTypeInfo = wxTypeInfo::FindType(m_collectionElementTypeName) ;
+           return m_collectionElementTypeInfo ;
+       }

 
 

-       // return the accessor for this property
-       wxPropertyAccessor* GetAccessor() const { return m_accessor ; }
+       // return the type info of this property
+       const wxTypeInfo *      GetTypeInfo() const
+       {
+           if ( m_typeInfo == NULL )
+               m_typeInfo = wxTypeInfo::FindType(m_typeName) ;
+           return m_typeInfo ;
+       }

 
 

-       // returns NULL if this is the last property of this class
-       wxPropertyInfo*     GetNext() const { return m_next ; }
+       // return the accessor for this property
+       wxPropertyAccessor* GetAccessor() const { return m_accessor ; }

 
 

-       // 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 NULL if this is the last property of this class
+       wxPropertyInfo*     GetNext() const { return m_next ; }
+
+       // returns the default value of this property, its kind may be wxT_VOID if it is not valid
+       wxxVariant                      GetDefaultValue() const { return m_defaultValue ; }

 private :
     void Insert(wxPropertyInfo* &iter)
     {
 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 ;
-               }
+        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 ;
+    wxClassInfo*        m_itsClass ;
+    wxString            m_name ;
+    mutable wxTypeInfo*         m_typeInfo ;
+    wxString            m_typeName ;
+    mutable wxTypeInfo*         m_collectionElementTypeInfo ;
+    wxString            m_collectionElementTypeName ;

     wxPropertyAccessor* m_accessor ;
     wxPropertyAccessor* m_accessor ;

-    wxxVariant m_defaultValue;
+    wxxVariant                 m_defaultValue;
+    wxPropertyInfoFlags m_flags ;
+    wxString            m_helpString ;
+    wxString            m_groupString ;

     // 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 ;
 };
 
     // 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) \
-    wxPropertyInfo *theClass::GetPropertiesStatic()  \
-    {  \
-        typedef theClass class_t; \
-        static wxPropertyInfo* first = NULL ;
-
-#define WX_END_PROPERTIES_TABLE() \
-        return first ; }
-
-
-
-#define WX_PROPERTY( name , type , setter , getter ,defaultValue ) \
-    WX_SETTER( name , class_t , type , setter ) \
-    static wxSetter##name _setter##name ; \
-    WX_GETTER( name , class_t , type , getter ) \
-    static wxGetter##name _getter##name ; \
-       static wxPropertyAccessor _accessor##name( &_setter##name , &_getter##name , NULL , NULL ) ; \
-       static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
-
-#define WX_READONLY_PROPERTY( name , type , getter ,defaultValue ) \
-    WX_GETTER( name , class_t , type , getter ) \
-    static wxGetter##name _getter##name ; \
-       static wxPropertyAccessor _accessor##name( NULL , &_getter##name , NULL , NULL ) ; \
-       static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
-
-#define WX_PROPERTY_COLLECTION( name , colltype , addelemtype , adder , getter ) \
-    WX_ADDER( name , class_t , addelemtype , adder ) \
-    static wxAdder##name _adder##name ; \
-    WX_COLLECTION_GETTER( name , class_t , colltype , getter ) \
-    static wxCollectionGetter##name _collectionGetter##name ; \
-       static wxPropertyAccessor _accessor##name( NULL , NULL ,&_adder##name , &_collectionGetter##name ) ; \
-       static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name  ) ;
-
-#define WX_READONLY_PROPERTY_COLLECTION( name , colltype , addelemtype , getter ) \
-    WX_COLLECTION_GETTER( name , class_t , colltype , getter ) \
-    static wxCollectionGetter##name _collectionGetter##name ; \
-       static wxPropertyAccessor _accessor##name( NULL , NULL , NULL , &_collectionGetter##name ) ; \
-       static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name  ) ;
-/*
-#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 ) ;
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo* , wxPropertyInfoMap , class WXDLLIMPEXP_BASE ) ;

 
 

-#define WX_READONLY_PROPERTY_COLLECTION( name , colltype , addelemtype , getter ) \
-    static wxPropertyCollectionAccessorT<class_t , colltype , addelemtype > _accessor##name( &getter , #getter ) ; \
-    static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ;
-*/
+#define wxBEGIN_PROPERTIES_TABLE(theClass) \
+    wxPropertyInfo *theClass::GetPropertiesStatic()  \
+{  \
+    typedef theClass class_t; \
+    static wxPropertyInfo* first = NULL ;
+
+#define wxEND_PROPERTIES_TABLE() \
+    return first ; }
+
+#define wxHIDE_PROPERTY( pname ) \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(void).name() ,NULL , wxxVariant() , wxPROP_DONT_STREAM , wxEmptyString , wxEmptyString ) ;
+
+#define wxPROPERTY( pname , type , setter , getter ,defaultValue , flags , help , group) \
+    wxSETTER( pname , class_t , type , setter ) \
+    static wxSetter##pname _setter##pname ; \
+    wxGETTER( pname , class_t , type , getter ) \
+    static wxGetter##pname _getter##pname ; \
+    static wxPropertyAccessor _accessor##pname( &_setter##pname , &_getter##pname , NULL , NULL ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(type).name() ,&_accessor##pname , wxxVariant(defaultValue) , flags , group , help ) ;
+
+#define wxPROPERTY_FLAGS( pname , flags , type , setter , getter ,defaultValue , pflags , help , group) \
+    wxSETTER( pname , class_t , type , setter ) \
+    static wxSetter##pname _setter##pname ; \
+    wxGETTER( pname , class_t , type , getter ) \
+    static wxGetter##pname _getter##pname ; \
+    static wxPropertyAccessor _accessor##pname( &_setter##pname , &_getter##pname , NULL , NULL ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(flags).name() ,&_accessor##pname , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ;
+
+#define wxREADONLY_PROPERTY( pname , type , getter ,defaultValue , flags , help , group) \
+    wxGETTER( pname , class_t , type , getter ) \
+    static wxGetter##pname _getter##pname ; \
+    static wxPropertyAccessor _accessor##pname( NULL , &_getter##pname , NULL , NULL ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(type).name() ,&_accessor##pname , wxxVariant(defaultValue), flags , help , group ) ;
+
+#define wxREADONLY_PROPERTY_FLAGS( pname , flags , type , getter ,defaultValue , pflags , help , group) \
+    wxGETTER( pname , class_t , type , getter ) \
+    static wxGetter##pname _getter##pname ; \
+    static wxPropertyAccessor _accessor##pname( NULL , &_getter##pname , NULL , NULL ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(flags).name() ,&_accessor##pname , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ;
+
+#define wxPROPERTY_COLLECTION( pname , colltype , addelemtype , adder , getter , flags , help , group ) \
+    wxADDER( pname , class_t , addelemtype , adder ) \
+    static wxAdder##pname _adder##pname ; \
+    wxCOLLECTION_GETTER( pname , class_t , colltype , getter ) \
+    static wxCollectionGetter##pname _collectionGetter##pname ; \
+    static wxPropertyAccessor _accessor##pname( NULL , NULL ,&_adder##pname , &_collectionGetter##pname ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(colltype).name() ,typeid(addelemtype).name() ,&_accessor##pname , flags , help , group ) ;
+
+#define wxREADONLY_PROPERTY_COLLECTION( pname , colltype , addelemtype , getter , flags , help , group) \
+    wxCOLLECTION_GETTER( pname , class_t , colltype , getter ) \
+    static wxCollectionGetter##pname _collectionGetter##pname ; \
+    static wxPropertyAccessor _accessor##pname( NULL , NULL , NULL , &_collectionGetter##pname ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first ,class_t::GetClassInfoStatic() ,  wxT(#pname) , typeid(colltype).name() ,typeid(addelemtype).name() ,&_accessor##pname , flags , help , group  ) ;
+
+
+#define wxEVENT_PROPERTY( name , eventType , eventClass ) \
+    static wxDelegateTypeInfo _typeInfo##name( eventType , CLASSINFO( eventClass ) ) ; \
+    static wxPropertyInfo _propertyInfo##name( first ,class_t::GetClassInfoStatic() , wxT(#name) , &_typeInfo##name , NULL , wxxVariant() ) ; \

 
 

+#define wxEVENT_RANGE_PROPERTY( name , eventType , lastEventType , eventClass ) \
+    static wxDelegateTypeInfo _typeInfo##name( eventType , lastEventType , CLASSINFO( eventClass ) ) ; \
+    static wxPropertyInfo _propertyInfo##name( first , class_t::GetClassInfoStatic() , wxT(#name) , &_typeInfo##name , NULL , wxxVariant() ) ; \

 
 

+// ----------------------------------------------------------------------------
+// Implementation Helper for Simple Properties
+// ----------------------------------------------------------------------------

 
 

-#define WX_DELEGATE( name , eventType , eventClass ) \
-    static wxDelegateTypeInfo _typeInfo##name( eventType , CLASSINFO( eventClass ) ) ; \
-    static wxPropertyInfo _propertyInfo##name( first , #name , &_typeInfo##name , NULL , wxxVariant() ) ; \
+#define wxIMPLEMENT_PROPERTY(name, type) \
+private:\
+    type m_##name; \
+public: \
+  void  Set##name( type const & p) { m_##name = p; } \
+  type const & Get##name() const  { return m_##name; }

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


@@ -796,54 +1154,69 @@ private :
 // this is describing an event sink
 // ----------------------------------------------------------------------------
 
 // this is describing an event sink
 // ----------------------------------------------------------------------------
 

-class wxHandlerInfo
+class WXDLLIMPEXP_BASE wxHandlerInfo

 {
 {

+    friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ;

 public :
 public :

-       wxHandlerInfo( wxHandlerInfo* &iter , const wxChar *name , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) :
-          m_name( name ) , m_eventClassInfo( eventClassInfo ) , m_eventFunction( address )
-       {
-               m_next = NULL ;
-               if ( iter == NULL )
-                       iter = this ;
-               else
-               {
-                       wxHandlerInfo* i = iter ;
-                       while( i->m_next )
-                               i = i->m_next ;
-
-                       i->m_next = this ;
-               }
-       }
-
-       // get the name of the handler method
-       const wxChar *          GetName() const { return m_name ; }
-
-       // return the class info of the event
-       const wxClassInfo *     GetEventClassInfo() const { return m_eventClassInfo ; }
-
-       // get the handler function pointer
-       wxObjectEventFunction   GetEventFunction() const { return m_eventFunction ; }
-
-       // returns NULL if this is the last handler of this class
-       wxHandlerInfo*     GetNext() const { return m_next ; }
+    wxHandlerInfo(wxHandlerInfo* &iter,
+                   wxClassInfo* itsClass,
+                  const wxString& name,
+                  wxObjectEventFunction address,
+                  const wxClassInfo* eventClassInfo) :
+            m_eventFunction(address),
+            m_name(name),
+            m_eventClassInfo(eventClassInfo) ,
+            m_itsClass(itsClass)
+       {
+           m_next = NULL ;
+           if ( iter == NULL )
+               iter = this ;
+           else
+           {
+               wxHandlerInfo* i = iter ;
+               while( i->m_next )
+                   i = i->m_next ;
+
+               i->m_next = this ;
+           }
+       }
+
+       ~wxHandlerInfo() ;
+
+       // return the name of this handler
+       const wxString&         GetName() const { return m_name ; }
+
+       // return the class info of the event
+       const wxClassInfo *     GetEventClassInfo() const { return m_eventClassInfo ; }
+
+       // get the handler function pointer
+       wxObjectEventFunction   GetEventFunction() const { return m_eventFunction ; }
+
+       // returns NULL if this is the last handler of this class
+       wxHandlerInfo*     GetNext() const { return m_next ; }
+
+       // return the class this property is declared in
+       const wxClassInfo*   GetDeclaringClass() const { return m_itsClass ; }
+

 private :
     wxObjectEventFunction m_eventFunction ;
 private :
     wxObjectEventFunction m_eventFunction ;

-    const wxChar *      m_name;
+    wxString            m_name;

     const wxClassInfo*  m_eventClassInfo ;
     wxHandlerInfo*      m_next ;
     const wxClassInfo*  m_eventClassInfo ;
     wxHandlerInfo*      m_next ;

+    wxClassInfo*        m_itsClass ;

 };
 
 };
 

-#define WX_HANDLER(name,eventClassType) \
-    static wxHandlerInfo _handlerInfo##name( first , #name , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ;
+#define wxHANDLER(name,eventClassType) \
+    static wxHandlerInfo _handlerInfo##name( first , class_t::GetClassInfoStatic() , wxT(#name) , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ;

 
 

-#define WX_BEGIN_HANDLERS_TABLE(theClass) \
+#define wxBEGIN_HANDLERS_TABLE(theClass) \

     wxHandlerInfo *theClass::GetHandlersStatic()  \
     wxHandlerInfo *theClass::GetHandlersStatic()  \

-    {  \
-        typedef theClass class_t; \
-        static wxHandlerInfo* first = NULL ;
+{  \
+    typedef theClass class_t; \
+    static wxHandlerInfo* first = NULL ;

 
 

-#define WX_END_HANDLERS_TABLE() \
-        return first ; }
+#define wxEND_HANDLERS_TABLE() \
+    return first ; }

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


@@ -854,9 +1227,18 @@ private :
 class WXDLLIMPEXP_BASE wxConstructorBridge
 {
 public :
 class WXDLLIMPEXP_BASE wxConstructorBridge
 {
 public :

-    virtual void Create(wxObject *o, wxxVariant *args) = 0;
+    virtual void Create(wxObject * &o, wxxVariant *args) = 0;

 };
 
 };
 

+// a direct constructor bridge calls the operator new for this class and
+// passes all params to the constructor. needed for classes that cannot be
+// instantiated using alloc-create semantics
+class WXDLLIMPEXP_BASE wxDirectConstructorBrigde : public wxConstructorBridge
+{
+public :
+    virtual void Create(wxObject * &o, wxxVariant *args) = 0;
+} ;
+

 // Creator Bridges for all Numbers of Params
 
 // no params
 // Creator Bridges for all Numbers of Params
 
 // no params


@@ -864,7 +1246,7 @@ public :
 template<typename Class>
 struct wxConstructorBridge_0 : public wxConstructorBridge
 {
 template<typename Class>
 struct wxConstructorBridge_0 : public wxConstructorBridge
 {

-    void Create(wxObject *o, wxxVariant *)
+    void Create(wxObject * &o, wxxVariant *)

     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create();
     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create();


@@ -873,217 +1255,264 @@ struct wxConstructorBridge_0 : public wxConstructorBridge
 
 struct wxConstructorBridge_Dummy : public wxConstructorBridge
 {
 
 struct wxConstructorBridge_Dummy : public wxConstructorBridge
 {

-    void Create(wxObject *, wxxVariant *)
+    void Create(wxObject *&, wxxVariant *)

     {
     }
 } ;
 
     {
     }
 } ;
 

-#define WX_CONSTRUCTOR_0(klass) \
+#define wxCONSTRUCTOR_0(klass) \

     wxConstructorBridge_0<klass> constructor##klass ; \
     wxConstructorBridge_0<klass> constructor##klass ; \

-    wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
-    const wxChar *klass::sm_constructorProperties##klass[] = { NULL } ; \
-    const int klass::sm_constructorPropertiesCount##klass = 0 ;
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { NULL } ; \
+    const int klass::ms_constructorPropertiesCount = 0 ;

 
 

-#define WX_CONSTRUCTOR_DUMMY(klass) \
+#define wxCONSTRUCTOR_DUMMY(klass) \

     wxConstructorBridge_Dummy constructor##klass ; \
     wxConstructorBridge_Dummy constructor##klass ; \

-    wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
-    const wxChar *klass::sm_constructorProperties##klass[] = { NULL } ; \
-    const int klass::sm_constructorPropertiesCount##klass = 0 ;
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { NULL } ; \
+    const int klass::ms_constructorPropertiesCount = 0 ;

 
 // 1 param
 
 template<typename Class, typename T0>
 struct wxConstructorBridge_1 : public wxConstructorBridge
 {
 
 // 1 param
 
 template<typename Class, typename T0>
 struct wxConstructorBridge_1 : public wxConstructorBridge
 {

-    void Create(wxObject *o, wxxVariant *args)
+    void Create(wxObject * &o, wxxVariant *args)

     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(
     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(

-                    args[0].Get<T0>()
-                   );
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0)
+            );

     }
 };
 
     }
 };
 

-#define WX_CONSTRUCTOR_1(klass,t0,v0) \
+#define wxCONSTRUCTOR_1(klass,t0,v0) \

     wxConstructorBridge_1<klass,t0> constructor##klass ; \
     wxConstructorBridge_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* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) } ; \
+    const int klass::ms_constructorPropertiesCount = 1 ;

 
 // 2 params
 
 template<typename Class,
 
 // 2 params
 
 template<typename Class,

-         typename T0, typename T1>
+typename T0, typename T1>

 struct wxConstructorBridge_2 : public wxConstructorBridge
 {
 struct wxConstructorBridge_2 : public wxConstructorBridge
 {

-    void Create(wxObject *o, wxxVariant *args)
+    void Create(wxObject * &o, wxxVariant *args)

     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(
     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(

-                    args[0].Get<T0>() ,
-                    args[1].Get<T1>()
-                   );
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1)
+            );

     }
 };
 
     }
 };
 

-#define WX_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
+#define wxCONSTRUCTOR_2(klass,t0,v0,t1,v1) \

     wxConstructorBridge_2<klass,t0,t1> constructor##klass ; \
     wxConstructorBridge_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* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  } ; \
+    const int klass::ms_constructorPropertiesCount = 2;
+
+// direct constructor version
+
+template<typename Class,
+typename T0, typename T1>
+struct wxDirectConstructorBridge_2 : public wxDirectConstructorBrigde
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        o = new Class(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1)
+            );
+    }
+};
+
+#define wxDIRECT_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
+    wxDirectConstructorBridge_2<klass,t0,t1> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  } ; \
+    const int klass::ms_constructorPropertiesCount = 2;
+

 
 // 3 params
 
 template<typename Class,
 
 // 3 params
 
 template<typename Class,

-         typename T0, typename T1, typename T2>
+typename T0, typename T1, typename T2>

 struct wxConstructorBridge_3 : public wxConstructorBridge
 {
 struct wxConstructorBridge_3 : public wxConstructorBridge
 {

-    void Create(wxObject *o, wxxVariant *args)
+    void Create(wxObject * &o, wxxVariant *args)

     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(
     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(

-                    args[0].Get<T0>() ,
-                    args[1].Get<T1>() ,
-                    args[2].Get<T2>()
-                   );
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2)
+            );

     }
 };
 
     }
 };
 

-#define WX_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
+#define wxCONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \

     wxConstructorBridge_3<klass,t0,t1,t2> constructor##klass ; \
     wxConstructorBridge_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* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  } ; \
+    const int klass::ms_constructorPropertiesCount = 3 ;

 
 // 4 params
 
 template<typename Class,
 
 // 4 params
 
 template<typename Class,

-         typename T0, typename T1, typename T2, typename T3>
+typename T0, typename T1, typename T2, typename T3>

 struct wxConstructorBridge_4 : public wxConstructorBridge
 {
 struct wxConstructorBridge_4 : public wxConstructorBridge
 {

-    void Create(wxObject *o, wxxVariant *args)
+    void Create(wxObject * &o, wxxVariant *args)

     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(
     {
         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[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
+            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3)
+            );

     }
 };
 
     }
 };
 

-#define WX_CONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \
+#define wxCONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \

     wxConstructorBridge_4<klass,t0,t1,t2,t3> constructor##klass ; \
     wxConstructorBridge_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* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  } ; \
+    const int klass::ms_constructorPropertiesCount = 4 ;

 
 // 5 params
 
 template<typename Class,
 
 // 5 params
 
 template<typename Class,

-         typename T0, typename T1, typename T2, typename T3, typename T4>
+typename T0, typename T1, typename T2, typename T3, typename T4>

 struct wxConstructorBridge_5 : public wxConstructorBridge
 {
 struct wxConstructorBridge_5 : public wxConstructorBridge
 {

-    void Create(wxObject *o, wxxVariant *args)
+    void Create(wxObject * &o, wxxVariant *args)

     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(
     {
         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[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
+            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
+            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4)
+            );

     }
 };
 
     }
 };
 

-#define WX_CONSTRUCTOR_5(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4) \
-       wxConstructorBridge_5<klass,t0,t1,t2,t3,t4> constructor##klass ; \
-       wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
-       const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 } ; \
-       const int klass::sm_constructorPropertiesCount##klass = 5;
+#define wxCONSTRUCTOR_5(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4) \
+    wxConstructorBridge_5<klass,t0,t1,t2,t3,t4> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  } ; \
+    const int klass::ms_constructorPropertiesCount = 5;

 
 // 6 params
 
 template<typename Class,
 
 // 6 params
 
 template<typename Class,

-         typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
+typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>

 struct wxConstructorBridge_6 : public wxConstructorBridge
 {
 struct wxConstructorBridge_6 : public wxConstructorBridge
 {

-    void Create(wxObject *o, wxxVariant *args)
+    void Create(wxObject * &o, wxxVariant *args)

     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(
     {
         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>()
-                  );
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
+            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
+            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ,
+            args[5].wxTEMPLATED_MEMBER_CALL(Get , T5)
+            );

     }
 };
 
     }
 };
 

-#define WX_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
-       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;
+#define wxCONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
+    wxConstructorBridge_6<klass,t0,t1,t2,t3,t4,t5> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  } ; \
+    const int klass::ms_constructorPropertiesCount = 6;
+
+// direct constructor version
+
+template<typename Class,
+typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
+struct wxDirectConstructorBridge_6 : public wxDirectConstructorBrigde
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        o = new Class(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
+            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
+            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ,
+            args[5].wxTEMPLATED_MEMBER_CALL(Get , T5)
+            );
+    }
+};
+
+#define wxDIRECT_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
+    wxDirectConstructorBridge_6<klass,t0,t1,t2,t3,t4,t5> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  } ; \
+    const int klass::ms_constructorPropertiesCount = 6;

 
 // 7 params
 
 template<typename Class,
 
 // 7 params
 
 template<typename Class,

-         typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
+typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>

 struct wxConstructorBridge_7 : public wxConstructorBridge
 {
 struct wxConstructorBridge_7 : public wxConstructorBridge
 {

-    void Create(wxObject *o, wxxVariant *args)
+    void Create(wxObject * &o, wxxVariant *args)

     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(
     {
         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>() ,
-                    args[6].Get<T6>()
-                  );
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
+            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
+            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ,
+            args[5].wxTEMPLATED_MEMBER_CALL(Get , T5) ,
+            args[6].wxTEMPLATED_MEMBER_CALL(Get , T6)
+            );

     }
 };
 
     }
 };
 

-#define WX_CONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \
-       wxConstructorBridge_7<klass,t0,t1,t2,t3,t4,t5,t6> constructor##klass ; \
-       wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
-    const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 , #v5 , #v6} ; \
-       const int klass::sm_constructorPropertiesCount##klass = 7;
+#define wxCONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \
+    wxConstructorBridge_7<klass,t0,t1,t2,t3,t4,t5,t6> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  , wxT(#v6) } ; \
+    const int klass::ms_constructorPropertiesCount = 7;

 
 // 8 params
 
 template<typename Class,
 
 // 8 params
 
 template<typename Class,

-         typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
+typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>

 struct wxConstructorBridge_8 : public wxConstructorBridge
 {
 struct wxConstructorBridge_8 : public wxConstructorBridge
 {

-    void Create(wxObject *o, wxxVariant *args)
+    void Create(wxObject * &o, wxxVariant *args)

     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(
     {
         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>() ,
-                    args[6].Get<T6>() ,
-                    args[7].Get<T7>()
-                  );
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
+            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
+            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ,
+            args[5].wxTEMPLATED_MEMBER_CALL(Get , T5) ,
+            args[6].wxTEMPLATED_MEMBER_CALL(Get , T6) ,
+            args[7].wxTEMPLATED_MEMBER_CALL(Get , T7)
+            );

     }
 };
 
     }
 };
 

-#define WX_CONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \
-       wxConstructorBridge_8<klass,t0,t1,t2,t3,t4,t5,t6,t7> constructor##klass ; \
-       wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
-    const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 , #v5 , #v6 , #v7} ; \
-       const int klass::sm_constructorPropertiesCount##klass = 8;
+#define wxCONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \
+    wxConstructorBridge_8<klass,t0,t1,t2,t3,t4,t5,t6,t7> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  , wxT(#v6) , wxT(#v7) } ; \
+    const int klass::ms_constructorPropertiesCount = 8;

 // ----------------------------------------------------------------------------
 // wxClassInfo
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxClassInfo
 // ----------------------------------------------------------------------------


@@ -1092,39 +1521,73 @@ typedef wxObject *(*wxObjectConstructorFn)(void);
 typedef wxObject* (*wxVariantToObjectConverter)( wxxVariant &data ) ;
 typedef wxxVariant (*wxObjectToVariantConverter)( wxObject* ) ;
 
 typedef wxObject* (*wxVariantToObjectConverter)( wxxVariant &data ) ;
 typedef wxxVariant (*wxObjectToVariantConverter)( wxObject* ) ;
 

+class WXDLLIMPEXP_BASE wxWriter;
+class WXDLLIMPEXP_BASE wxPersister;
+
+typedef bool (*wxObjectStreamingCallback) ( const wxObject *, wxWriter * , wxPersister * , wxxVariantArray & ) ;
+

 class WXDLLIMPEXP_BASE wxClassInfo
 {
 class WXDLLIMPEXP_BASE wxClassInfo
 {

+    friend class WXDLLIMPEXP_BASE wxPropertyInfo ;
+    friend class WXDLLIMPEXP_BASE wxHandlerInfo ;

 public:
     wxClassInfo(const wxClassInfo **_Parents,
 public:
     wxClassInfo(const wxClassInfo **_Parents,

-            const wxChar *_UnitName,
-            const wxChar *_ClassName,
-            int size,
-            wxObjectConstructorFn ctor ,
-                       wxPropertyInfo *_Props ,
-                       wxHandlerInfo *_Handlers ,
-                       wxConstructorBridge* _Constructor ,
-                       const wxChar ** _ConstructorProperties ,
-                       const int _ConstructorPropertiesCount ,
-                       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_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() ;
-       }
+        const wxChar *_UnitName,
+        const wxChar *_ClassName,
+        int size,
+        wxObjectConstructorFn ctor ,
+        wxPropertyInfo *_Props ,
+        wxHandlerInfo *_Handlers ,
+        wxConstructorBridge* _Constructor ,
+        const wxChar ** _ConstructorProperties ,
+        const int _ConstructorPropertiesCount ,
+        wxVariantToObjectConverter _PtrConverter1 ,
+        wxVariantToObjectConverter _Converter2 ,
+        wxObjectToVariantConverter _Converter3 ,
+        wxObjectStreamingCallback _streamingCallback = NULL
+        ) :
+
+            m_className(_ClassName),
+            m_objectSize(size),
+            m_objectConstructor(ctor),
+            m_next(sm_first),
+            m_firstProperty(_Props),
+            m_firstHandler(_Handlers),
+            m_parents(_Parents),
+            m_unitName(_UnitName),
+            m_constructor(_Constructor),
+            m_constructorProperties(_ConstructorProperties),
+            m_constructorPropertiesCount(_ConstructorPropertiesCount),
+            m_variantOfPtrToObjectConverter(_PtrConverter1),
+            m_variantToObjectConverter(_Converter2),
+            m_objectToVariantConverter(_Converter3),
+            m_streamingCallback(_streamingCallback)
+    {
+        sm_first = this;
+        Register() ;
+    }
+
+    wxClassInfo(const wxChar *_UnitName, const wxChar *_ClassName,
+                const wxClassInfo **_Parents) :
+            m_className(_ClassName),
+            m_objectSize(0),
+            m_objectConstructor(NULL),
+            m_next(sm_first),
+            m_firstProperty(NULL),
+            m_firstHandler(NULL),
+            m_parents(_Parents),
+            m_unitName(_UnitName),
+            m_constructor(NULL),
+            m_constructorProperties(NULL),
+            m_constructorPropertiesCount(0),
+            m_variantOfPtrToObjectConverter(NULL),
+            m_variantToObjectConverter(NULL),
+            m_objectToVariantConverter(NULL),
+            m_streamingCallback(NULL)
+    {
+        sm_first = this;
+        Register() ;
+    }

 
     virtual ~wxClassInfo() ;
 
 
     virtual ~wxClassInfo() ;
 


@@ -1135,7 +1598,27 @@ public:
     // 'old naming' for AllocateObject staying here for backward compatibility
     wxObject *CreateObject() const { return AllocateObject() ; }
 
     // 'old naming' for AllocateObject staying here for backward compatibility
     wxObject *CreateObject() const { return AllocateObject() ; }
 

+    // direct construction call for classes that cannot construct instances via alloc/create
+    wxObject *ConstructObject(int ParamCount, wxxVariant *Params) const
+    {
+        if ( ParamCount != m_constructorPropertiesCount )
+        {
+            wxLogError( _("Illegal Parameter Count for ConstructObject Method") ) ;
+            return NULL ;
+        }
+        wxObject *object = NULL ;
+        m_constructor->Create( object , Params ) ;
+        return object ;
+    }
+
+    bool NeedsDirectConstruction() const { return dynamic_cast<wxDirectConstructorBrigde*>( m_constructor) != NULL ; }
+

     const wxChar       *GetClassName() const { return m_className; }
     const wxChar       *GetClassName() const { return m_className; }

+    const wxChar       *GetBaseClassName1() const
+        { return m_parents[0] ? m_parents[0]->GetClassName() : NULL; }
+    const wxChar       *GetBaseClassName2() const
+        { return (m_parents[0] && m_parents[1]) ? m_parents[1]->GetClassName() : NULL; }
+    const wxChar       *GetIncludeName() const { return m_unitName ; }

     const wxClassInfo **GetParents() const { return m_parents; }
     int                 GetSize() const { return m_objectSize; }
 
     const wxClassInfo **GetParents() const { return m_parents; }
     int                 GetSize() const { return m_objectSize; }
 


@@ -1144,8 +1627,8 @@ public:
     const wxClassInfo         *GetNext() const { return m_next; }
     static wxClassInfo        *FindClass(const wxChar *className);
 
     const wxClassInfo         *GetNext() const { return m_next; }
     static wxClassInfo        *FindClass(const wxChar *className);
 

-        // Climb upwards through inheritance hierarchy.
-        // Dual inheritance is catered for.
+    // Climb upwards through inheritance hierarchy.
+    // Dual inheritance is catered for.

 
     bool IsKindOf(const wxClassInfo *info) const
     {
 
     bool IsKindOf(const wxClassInfo *info) const
     {


@@ -1163,13 +1646,23 @@ public:
         return false ;
     }
 
         return false ;
     }
 

-#ifdef WXWIN_COMPATIBILITY_2_4
+    // if there is a callback registered with that class it will be called
+    // before this object will be written to disk, it can veto streaming out
+    // this object by returning false, if this class has not registered a
+    // callback, the search will go up the inheritance tree if no callback has
+    // been registered true will be returned by default
+    bool BeforeWriteObject( const wxObject *obj, wxWriter *streamer , wxPersister *persister , wxxVariantArray &metadata) const  ;
+
+    // gets the streaming callback from this class or any superclass
+    wxObjectStreamingCallback GetStreamingCallback() const ;
+
+#if WXWIN_COMPATIBILITY_2_4

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

-    wxDEPRECATED( static void     InitializeClasses() );
+    wxDEPRECATED( static void InitializeClasses() );

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

-    wxDEPRECATED( static void     CleanUpClasses() );
+    wxDEPRECATED( static void CleanUpClasses() );

 #endif
 #endif

-    static void     CleanUp();
+    static void CleanUp();

 
     // returns the first property
     const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; }
 
     // returns the first property
     const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; }


@@ -1180,10 +1673,14 @@ public:
     // 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
     // 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_MSG( ParamCount == m_constructorPropertiesCount , wxT("Illegal Parameter Count for Create Method")) ;
-               m_constructor->Create( object , Params ) ;
-       }
+    {
+        if ( ParamCount != m_constructorPropertiesCount )
+        {
+            wxLogError( _("Illegal Parameter Count for Create Method") ) ;
+            return ;
+        }
+        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; }


@@ -1199,15 +1696,15 @@ public:
     virtual wxxVariantArray GetPropertyCollection(wxObject *object, const wxChar *propertyName) const ;
     virtual void AddToPropertyCollection(wxObject *object, const wxChar *propertyName , const wxxVariant& value) const ;
 
     virtual wxxVariantArray GetPropertyCollection(wxObject *object, const wxChar *propertyName) const ;
     virtual void AddToPropertyCollection(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
-       wxObject* VariantToInstance( wxxVariant &data ) const
-       {       if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT )
-                       return m_variantToObjectConverter( data ) ;
-               else
-                       return m_variantOfPtrToObjectConverter( data ) ;
-       }
+    // we must be able to cast variants to wxObject pointers, templates seem not to be suitable
+    wxObject* VariantToInstance( wxxVariant &data ) const
+    {  if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT )
+    return m_variantToObjectConverter( data ) ;
+    else
+        return m_variantOfPtrToObjectConverter( data ) ;
+    }

 
 

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

 
     // find property by name
     virtual const wxPropertyInfo *FindPropertyInfo (const wxChar *PropertyName) const ;
 
     // find property by name
     virtual const wxPropertyInfo *FindPropertyInfo (const wxChar *PropertyName) const ;


@@ -1216,10 +1713,14 @@ public:
     virtual const wxHandlerInfo *FindHandlerInfo (const wxChar *PropertyName) const ;
 
     // find property by name
     virtual const wxHandlerInfo *FindHandlerInfo (const wxChar *PropertyName) const ;
 
     // find property by name

-    virtual const wxPropertyInfo *FindPropertyInfoInThisClass (const wxChar *PropertyName) const ;
+    virtual wxPropertyInfo *FindPropertyInfoInThisClass (const wxChar *PropertyName) const ;

 
     // find handler by name
 
     // find handler by name

-    virtual const wxHandlerInfo *FindHandlerInfoInThisClass (const wxChar *PropertyName) const ;
+    virtual wxHandlerInfo *FindHandlerInfoInThisClass (const wxChar *PropertyName) const ;
+
+    // puts all the properties of this class and its superclasses in the map, as long as there is not yet
+    // an entry with the same name (overriding mechanism)
+    void GetProperties( wxPropertyInfoMap &map ) const ;

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


@@ -1236,19 +1737,19 @@ public:
     static wxHashTable      *sm_classTable;
 
 protected :
     static wxHashTable      *sm_classTable;
 
 protected :

-       wxPropertyInfo *            m_firstProperty ;
-       wxHandlerInfo *         m_firstHandler ;
+    wxPropertyInfo *       m_firstProperty ;
+    wxHandlerInfo *            m_firstHandler ;

 private:
 private:

-       const wxClassInfo**             m_parents ;
+    const wxClassInfo**                m_parents ;

     const wxChar*                      m_unitName;
 
     const wxChar*                      m_unitName;
 

-       wxConstructorBridge*    m_constructor ;
-       const wxChar **                 m_constructorProperties ;
-       const int                               m_constructorPropertiesCount ;
-       wxVariantToObjectConverter m_variantOfPtrToObjectConverter ;
-       wxVariantToObjectConverter m_variantToObjectConverter ;
-       wxObjectToVariantConverter m_objectToVariantConverter ;
-
+    wxConstructorBridge*       m_constructor ;
+    const wxChar **                    m_constructorProperties ;
+    const int                          m_constructorPropertiesCount ;
+    wxVariantToObjectConverter m_variantOfPtrToObjectConverter ;
+    wxVariantToObjectConverter m_variantToObjectConverter ;
+    wxObjectToVariantConverter m_objectToVariantConverter ;
+    wxObjectStreamingCallback m_streamingCallback ;

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


@@ -1272,8 +1773,9 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 //
 // this object leads to having a pure runtime-instantiation
 
 //
 // this object leads to having a pure runtime-instantiation
 

-class wxDynamicClassInfo : public wxClassInfo
+class WXDLLIMPEXP_BASE wxDynamicClassInfo : public wxClassInfo

 {
 {

+    friend class WXDLLIMPEXP_BASE wxDynamicObject ;

 public :
     wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName , const wxClassInfo* superClass ) ;
     virtual ~wxDynamicClassInfo() ;
 public :
     wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName , const wxClassInfo* superClass ) ;
     virtual ~wxDynamicClassInfo() ;


@@ -1294,8 +1796,26 @@ public :
     virtual void SetProperty (wxObject *object, const wxChar *PropertyName, const wxxVariant &Value) const ;
     virtual wxxVariant GetProperty (wxObject *object, const wxChar *PropertyName) const ;
 
     virtual void SetProperty (wxObject *object, const wxChar *PropertyName, const wxxVariant &Value) const ;
     virtual wxxVariant GetProperty (wxObject *object, const wxChar *PropertyName) const ;
 

+    // adds a property to this class at runtime

     void AddProperty( const wxChar *propertyName , const wxTypeInfo* typeInfo ) ;
     void AddProperty( const wxChar *propertyName , const wxTypeInfo* typeInfo ) ;

+
+    // removes an existing runtime-property
+    void RemoveProperty( const wxChar *propertyName ) ;
+
+    // renames an existing runtime-property
+    void RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) ;
+
+    // as a handler to this class at runtime

     void AddHandler( const wxChar *handlerName , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) ;
     void AddHandler( const wxChar *handlerName , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) ;

+
+    // removes an existing runtime-handler
+    void RemoveHandler( const wxChar *handlerName ) ;
+
+    // renames an existing runtime-handler
+    void RenameHandler( const wxChar *oldHandlerName , const wxChar *newHandlerName ) ;
+private :
+    struct wxDynamicClassInfoInternal ;
+    wxDynamicClassInfoInternal* m_data ;

 } ;
 
 // ----------------------------------------------------------------------------
 } ;
 
 // ----------------------------------------------------------------------------


@@ -1304,17 +1824,31 @@ public :
 
 #define _DECLARE_DYNAMIC_CLASS(name)           \
  public:                                      \
 
 #define _DECLARE_DYNAMIC_CLASS(name)           \
  public:                                      \

-  static wxClassInfo sm_class##name;          \
-  static const wxClassInfo* sm_classParents##name[] ; \
-  static wxPropertyInfo* GetPropertiesStatic() ; \
-  static wxHandlerInfo* GetHandlersStatic() ; \
-  virtual wxClassInfo *GetClassInfo() const   \
-   { return &name::sm_class##name; }
+ static wxClassInfo ms_classInfo;          \
+ static const wxClassInfo* ms_classParents[] ; \
+ static wxPropertyInfo* GetPropertiesStatic() ; \
+ static wxHandlerInfo* GetHandlersStatic() ; \
+ static wxClassInfo *GetClassInfoStatic()   \
+{ return &name::ms_classInfo; } \
+    virtual wxClassInfo *GetClassInfo() const   \
+{ return &name::ms_classInfo; }

 
 

+/*
+#define _DECLARE_DYNAMIC_CLASS(name)           \
+ public:                                      \
+ static wxClassInfo ms_class##name;          \
+ static const wxClassInfo* ms_classParents##name[] ; \
+ static wxPropertyInfo* GetPropertiesStatic() ; \
+ static wxHandlerInfo* GetHandlersStatic() ; \
+ static wxClassInfo *GetClassInfoStatic()   \
+{ return &name::ms_class##name; } \
+    virtual wxClassInfo *GetClassInfo() const   \
+{ return &name::ms_class##name; }
+*/

 #define DECLARE_DYNAMIC_CLASS(name)           \
 #define DECLARE_DYNAMIC_CLASS(name)           \

-static wxConstructorBridge* sm_constructor##name ; \
-static const wxChar * sm_constructorProperties##name[] ; \
-static const int sm_constructorPropertiesCount##name ; \
+    static wxConstructorBridge* ms_constructor ; \
+    static const wxChar * ms_constructorProperties[] ; \
+    static const int ms_constructorPropertiesCount ; \

     _DECLARE_DYNAMIC_CLASS(name)
 
 #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \
     _DECLARE_DYNAMIC_CLASS(name)
 
 #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \


@@ -1332,180 +1866,159 @@ static const int sm_constructorPropertiesCount##name ; \
 // for concrete classes
 // -----------------------------------
 
 // for concrete classes
 // -----------------------------------
 

-    // Single inheritance with one base class
-
-#define _IMPLEMENT_DYNAMIC_CLASS(name, basename, unit)                 \
- wxObject* wxConstructorFor##name()                             \
-  { return new name; }                                          \
- const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,NULL } ; \
- wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \
-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 , 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 ; }
+// Single inheritance with one base class
+
+#define _TYPEINFO_CLASSES(n , toString , fromString ) \
+    wxClassTypeInfo s_typeInfo##n(wxT_OBJECT , &n::ms_classInfo , toString , fromString , typeid(n).name()) ; \
+    wxClassTypeInfo s_typeInfoPtr##n(wxT_OBJECT_PTR , &n::ms_classInfo , toString , fromString , typeid(n*).name()) ;
+
+#define _IMPLEMENT_DYNAMIC_CLASS(name, basename, unit , callback)                 \
+    wxObject* wxConstructorFor##name()                             \
+{ return new name; }                                          \
+    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
+    wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
+    wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
+    (int) sizeof(name),                              \
+    (wxObjectConstructorFn) wxConstructorFor##name   ,   \
+    name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties ,     \
+    name::ms_constructorPropertiesCount , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name , callback);
+
+#define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit, callback )                 \
+    wxObject* wxConstructorFor##name()                             \
+{ return new name; }                                          \
+    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
+    wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return &data.wxTEMPLATED_MEMBER_CALL(Get , name) ; } \
+    wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
+    wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
+    (int) sizeof(name),                              \
+    (wxObjectConstructorFn) wxConstructorFor##name   ,   \
+    name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties,     \
+    name::ms_constructorPropertiesCount , wxVariantOfPtrToObjectConverter##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name, callback);

 
 #define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename ) \
 
 #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 )
+    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , "" , NULL ) \
+    _TYPEINFO_CLASSES(name, NULL , NULL) \
+    const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
+    const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
+    wxCONSTRUCTOR_DUMMY( name )

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

-_IMPLEMENT_DYNAMIC_CLASS( name , basename , "" ) \
-wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
-wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
-WX_CONSTRUCTOR_DUMMY( name )
+    _IMPLEMENT_DYNAMIC_CLASS( name , basename , "" , NULL ) \
+     _TYPEINFO_CLASSES(name, NULL , NULL) \
+   wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
+    wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
+    wxCONSTRUCTOR_DUMMY( name )

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

-_IMPLEMENT_DYNAMIC_CLASS( name , basename , unit )
+    _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , NULL ) \
+    _TYPEINFO_CLASSES(name, NULL , NULL)
+
+#define IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK( name , basename , unit , callback ) \
+    _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , &callback ) \
+    _TYPEINFO_CLASSES(name, NULL , NULL)

 
 #define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name , basename , unit ) \
 
 #define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name , basename , unit ) \

-_IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit )
+    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit , NULL  ) \
+    _TYPEINFO_CLASSES(name, NULL , NULL)
+
+#define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( name , basename , unit , toString , fromString ) \
+    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit , NULL  ) \
+    _TYPEINFO_CLASSES(name, toString , fromString)

 
 // 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 ) \
 
 // 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   ,   \
-            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 ; }
+    const wxClassInfo* name::ms_classParents[] = { NULL } ; \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name),   \
+    (int) sizeof(name),                              \
+    (wxObjectConstructorFn) 0   ,   \
+    name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
+    0 , 0 , 0 );    \
+    _TYPEINFO_CLASSES(name, NULL , NULL)

 
 // this is for subclasses that still do not derive from wxobject
 
 #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name , basename, unit ) \
 
 // this is for subclasses that still do not derive from wxobject
 
 #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name , basename, unit ) \

- const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,NULL } ; \
- wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name),   \
-            (int) sizeof(name),                              \
-            (wxObjectConstructorFn) 0   ,   \
-            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
+    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name),   \
+    (int) sizeof(name),                              \
+    (wxObjectConstructorFn) 0   ,   \
+    name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
+    0 , 0 , 0 );    \
+    _TYPEINFO_CLASSES(name, NULL , NULL)
+
+
+// Multiple inheritance with two base classes

 
 #define _IMPLEMENT_DYNAMIC_CLASS2(name, basename, basename2, unit)                 \
 
 #define _IMPLEMENT_DYNAMIC_CLASS2(name, basename, basename2, unit)                 \

- wxObject* wxConstructorFor##name()                             \
-  { return new name; }                                          \
-  const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,&basename2::sm_class##basename2 , NULL } ; \
- wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.Get<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 * & ){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 ; }
+    wxObject* wxConstructorFor##name()                             \
+{ return new name; }                                          \
+    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,&basename2::ms_classInfo , NULL } ; \
+    wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
+    wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
+    (int) sizeof(name),                              \
+    (wxObjectConstructorFn) wxConstructorFor##name   ,   \
+    name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties ,     \
+    name::ms_constructorPropertiesCount , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \

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

-_IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "") \
-wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
-wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
-WX_CONSTRUCTOR_DUMMY( name )
+    _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "") \
+    _TYPEINFO_CLASSES(name, NULL , NULL) \
+    wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
+    wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
+    wxCONSTRUCTOR_DUMMY( name )

 
 #define IMPLEMENT_DYNAMIC_CLASS2_XTI( name , basename , basename2, unit) \
 
 #define IMPLEMENT_DYNAMIC_CLASS2_XTI( name , basename , basename2, unit) \

-    _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , unit)
+    _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , unit) \
+    _TYPEINFO_CLASSES(name, NULL , NULL)
+

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

-    // Single inheritance with one base class
+// Single inheritance with one base class

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

- const wxClassInfo* name::sm_classParents##name[] = { &basename::sm_class##basename ,NULL } ; \
- wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \
- wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \
-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 ,     \
-                       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 ; }
+    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
+    wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
+    wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
+    wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name),   \
+    (int) sizeof(name),                              \
+    (wxObjectConstructorFn) 0   ,   \
+    name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
+    0 , wxVariantOfPtrToObjectConverter##name ,wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \
+    _TYPEINFO_CLASSES(name, NULL , NULL)

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

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

 
 

-    // Multiple inheritance with two base classes
+// Multiple inheritance with two base classes

 
 #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)   \
 
 #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)   \

- wxClassInfo name::sm_class##name(wxT(#name), wxT(#basename1),  \
-            wxT(#basename2), (int) sizeof(name),                \
-            (wxObjectConstructorFn) 0);
+    wxClassInfo name::ms_classInfo(wxT(#name), wxT(#basename1),  \
+    wxT(#basename2), (int) sizeof(name),                \
+    (wxObjectConstructorFn) 0);

 
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 
 
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 

+#define wxBEGIN_EVENT_TABLE( a , b ) BEGIN_EVENT_TABLE( a , b )
+#define wxEND_EVENT_TABLE() END_EVENT_TABLE()
+

 // --------------------------------------------------------------------------
 // Collection Support
 // --------------------------------------------------------------------------
 
 // --------------------------------------------------------------------------
 // Collection Support
 // --------------------------------------------------------------------------
 

-template<typename collection_t> void wxListCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value )
+template<typename iter , typename collection_t > void wxListCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value )

 {
 {

-    collection_t::compatibility_iterator current = coll.GetFirst() ;
+    iter current = coll.GetFirst() ;

     while (current)
     {
         value.Add( new wxxVariant(current->GetData()) ) ;
     while (current)
     {
         value.Add( new wxxVariant(current->GetData()) ) ;


@@ -1515,7 +2028,7 @@ template<typename collection_t> void wxListCollectionToVariantArray( const colle
 
 template<typename collection_t> void wxArrayCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value )
 {
 
 template<typename collection_t> void wxArrayCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value )
 {

-    for( int i = 0 ; i < coll.GetCount() ; i++ )
+    for( size_t i = 0 ; i < coll.GetCount() ; i++ )

     {
         value.Add( new wxxVariant(coll[i]) ) ;
     }
     {
         value.Add( new wxxVariant(coll[i]) ) ;
     }