Added handler for WM_PRINT to assist with offscreen drawing of widgets

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

diff --git a/include/wx/xti.h b/include/wx/xti.h
index d4ee06e0e2d0d13fdb2ea3fafd790562b3993e93..db55674802e81b9b94b02c6f3a2ebb4119c39eeb 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -43,6 +43,8 @@
 #include "wx/arrstr.h"
 #include "wx/hashmap.h"
 
 #include "wx/arrstr.h"
 #include "wx/hashmap.h"
 

+#include <typeinfo>
+

 // we will move this later to defs.h
 
 #if !wxCHECK_GCC_VERSION( 3 , 4 )
 // we will move this later to defs.h
 
 #if !wxCHECK_GCC_VERSION( 3 , 4 )


@@ -69,6 +71,7 @@
 
 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;


@@ -103,24 +106,24 @@ 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 ;


@@ -129,31 +132,22 @@ private :
 #define WX_BEGIN_ENUM( e ) \
     wxEnumMemberData s_enumDataMembers##e[] = {
 
 #define WX_BEGIN_ENUM( e ) \
     wxEnumMemberData s_enumDataMembers##e[] = {
 

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

 
 #define WX_END_ENUM( e ) { NULL , 0 } } ; \
     wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \
     wxEnumData *wxGetEnumData(e) { return &s_enumData##e ; } \
 
 #define WX_END_ENUM( e ) { NULL , 0 } } ; \
     wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \
     wxEnumData *wxGetEnumData(e) { return &s_enumData##e ; } \

-    template<> void wxStringReadValue(const wxString& s , e &data ) \
+    template<>  void wxStringReadValue(const wxString& s , e &data ) \

 { \
     data = (e) s_enumData##e.GetEnumMemberValue(s) ; \
 } \
 { \
     data = (e) s_enumData##e.GetEnumMemberValue(s) ; \
 } \

-    template<> void wxStringWriteValue(wxString &s , const e &data ) \
+    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.Get<e>() ;} \
 { \
     s =  s_enumData##e.GetEnumMemberName((int)data) ; \
 } \
     void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant((e)data) ;} \
     void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.Get<e>() ;} \

-    template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxEnumTypeInfo s_typeInfo(wxT_ENUM , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &ToLong##e , &FromLong##e , #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) ; \
-}
+    wxEnumTypeInfo s_typeInfo##e(wxT_ENUM , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &ToLong##e , &FromLong##e , typeid(e).name() ) ;

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


@@ -221,29 +215,24 @@ void wxSetToString( wxString &s , const wxBitset<e> &data )
         {
             // 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 wxBitset 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) \
 #define WX_IMPLEMENT_SET_STREAMING(SetName,e) \

-    template<> void wxStringReadValue(const wxString &s , wxBitset<e> &data ) \
+    template<>  void wxStringReadValue(const wxString &s , wxBitset<e> &data ) \

 { \
     wxSetFromString( s , data ) ; \
 } \
 { \
     wxSetFromString( s , data ) ; \
 } \

-    template<> void wxStringWriteValue( wxString &s , const wxBitset<e> &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.Get<SetName>().to_ulong() ;} \
 { \
     wxSetToString( s , data ) ; \
 } \
     void FromLong##SetName( long data , wxxVariant& result ) { result = wxxVariant(SetName((unsigned long)data)) ;} \
     void ToLong##SetName( const wxxVariant& data , long &result ) { result = (long) data.Get<SetName>().to_ulong() ;} \

-    template<> const wxTypeInfo* wxGetTypeInfo( SetName * ) \
-{ \
-    static wxEnumTypeInfo s_typeInfo(wxT_SET , &s_enumData##e , &wxToStringConverter<SetName> , &wxFromStringConverter<SetName> , &ToLong##SetName , &FromLong##SetName, #SetName ) ; return &s_typeInfo ; \
+    wxEnumTypeInfo s_typeInfo##SetName(wxT_SET , &s_enumData##e , &wxToStringConverter<SetName> , &wxFromStringConverter<SetName> , &ToLong##SetName , &FromLong##SetName, typeid(SetName).name() ) ;  \

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


@@ -255,7 +244,7 @@ void wxFlagsFromString(const wxString &s , e &data )
     wxArrayString array ;
     wxSetStringToArray( s , array ) ;
     wxString flag;
     wxArrayString array ;
     wxSetStringToArray( s , array ) ;
     wxString flag;

-    for ( int i = 0 ; i < array.Count() ; ++i )
+    for ( size_t i = 0 ; i < array.Count() ; ++i )

     {
         flag = array[i] ;
         int ivalue ;
     {
         flag = array[i] ;
         int ivalue ;


@@ -284,7 +273,7 @@ void wxFlagsToString( wxString &s , const e& data )
             dataValue &= ~value ;
             // this could also be done by the templated calls
             if ( !s.IsEmpty() )
             dataValue &= ~value ;
             // this could also be done by the templated calls
             if ( !s.IsEmpty() )

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

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


@@ -293,26 +282,22 @@ void wxFlagsToString( wxString &s , const e& data )
 #define WX_BEGIN_FLAGS( e ) \
     wxEnumMemberData s_enumDataMembers##e[] = {
 
 #define WX_BEGIN_FLAGS( e ) \
     wxEnumMemberData s_enumDataMembers##e[] = {
 

-#define WX_FLAGS_MEMBER( v ) { #v, v } ,
+#define WX_FLAGS_MEMBER( v ) { wxT(#v), v } ,

 
 #define WX_END_FLAGS( e ) { NULL , 0 } } ; \
     wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \
     wxEnumData *wxGetEnumData(e*) { return &s_enumData##e ; } \
 
 #define WX_END_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 ) \
+    template<>  void wxStringReadValue(const wxString &s , e &data ) \

 { \
     wxFlagsFromString<e>( s , data ) ; \
 } \
 { \
     wxFlagsFromString<e>( s , data ) ; \
 } \

-    template<> void wxStringWriteValue( wxString &s , const e& 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.Get<e>().m_data ;} \
 { \
     wxFlagsToString<e>( s , data ) ; \
 } \
     void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant(e(data)) ;} \
     void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.Get<e>().m_data ;} \

-    template<> const wxTypeInfo* wxGetTypeInfo( e * ) \
-{ \
-    static wxEnumTypeInfo s_typeInfo(wxT_SET , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &ToLong##e , &FromLong##e, #e ) ; return &s_typeInfo ; \
-}
-
+    wxEnumTypeInfo s_typeInfo##e(wxT_SET , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &ToLong##e , &FromLong##e, typeid(e).name()  ) ;

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


@@ -352,10 +337,10 @@ 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 wxTypeInfo ;
+class WXDLLIMPEXP_BASE wxxVariant ;
+class WXDLLIMPEXP_BASE wxTypeInfo ;

 
 

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

 
 class WXDLLIMPEXP_BASE wxTypeInfo
 {
 
 class WXDLLIMPEXP_BASE wxTypeInfo
 {


@@ -366,10 +351,19 @@ public :
     wxTypeInfo(wxTypeKind kind,
                converterToString_t to = NULL, converterFromString_t from = NULL,
                const wxString &name = wxEmptyString):
     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) 
+            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();
     }
     {
         Register();
     }

+#endif

 
     virtual ~wxTypeInfo()
     {
 
     virtual ~wxTypeInfo()
     {


@@ -403,6 +397,9 @@ public :
     void ConvertFromString( const wxString& data , wxxVariant &result ) const
     { wxASSERT_MSG( m_fromString , wxT("String conversions not supported") ) ; (*m_fromString)( data , result ) ; }
 
     void ConvertFromString( const wxString& data , wxxVariant &result ) const
     { wxASSERT_MSG( m_fromString , wxT("String conversions not supported") ) ; (*m_fromString)( data , result ) ; }
 

+#if wxUSE_UNICODE
+    static wxTypeInfo        *FindType(const char *typeName) { return FindType( wxString::FromAscii(typeName) ) ; }
+#endif

     static wxTypeInfo        *FindType(const wxChar *typeName);
 
 private :
     static wxTypeInfo        *FindType(const wxChar *typeName);
 
 private :


@@ -425,6 +422,11 @@ public :
     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") ) ; }
     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
 } ;
 
 class WXDLLIMPEXP_BASE wxCustomTypeInfo : public wxTypeInfo


@@ -433,6 +435,11 @@ public :
     wxCustomTypeInfo( const wxString &name , converterToString_t to , converterFromString_t from ) :
        wxTypeInfo( wxT_CUSTOM , to , from , name )
        {}
     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
 } ;
 
 class WXDLLIMPEXP_BASE wxEnumTypeInfo : public wxTypeInfo


@@ -445,6 +452,13 @@ public :
         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 ;}
         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 ; }
 
     // convert a wxxVariant holding data of this type into a long
     const wxEnumData* GetEnumData() const { return m_enumInfo ; }
 
     // convert a wxxVariant holding data of this type into a long


@@ -466,7 +480,10 @@ private :
 class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo
 {
 public :
 class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo
 {
 public :

-    wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to = NULL , converterFromString_t from = NULL ) ;
+    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
     const wxClassInfo *GetClassInfo() const { return m_classInfo ; }
 private :
     wxClassInfo *m_classInfo; // Kind == wxT_OBJECT - could be NULL


@@ -475,13 +492,22 @@ private :
 class WXDLLIMPEXP_BASE wxCollectionTypeInfo : public wxTypeInfo
 {
 public :
 class WXDLLIMPEXP_BASE wxCollectionTypeInfo : public wxTypeInfo
 {
 public :

-    wxCollectionTypeInfo( wxTypeInfo *elementType , converterToString_t to , converterFromString_t from  , const wxString &name) :
+    wxCollectionTypeInfo( const wxString &elementName , converterToString_t to , converterFromString_t from  , const wxString &name) :

        wxTypeInfo( wxT_COLLECTION , to , from , name )
        wxTypeInfo( wxT_COLLECTION , to , from , name )

-       { m_elementType = elementType ;}
-
-       const wxTypeInfo* GetElementType() const { return m_elementType ; }
+       { 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


@@ -490,34 +516,35 @@ class WXDLLIMPEXP_BASE wxDelegateTypeInfo : public wxTypeInfo
 {
 public :
     wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass , converterToString_t to = NULL , converterFromString_t from = NULL ) ;
 {
 public :
     wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass , converterToString_t to = NULL , converterFromString_t from = NULL ) ;

+    wxDelegateTypeInfo( int eventType , int lastEventType, wxClassInfo* eventClass , converterToString_t to = NULL , converterFromString_t from = NULL ) ;

     int GetEventType() const { return m_eventType ; }
     int 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( 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 WX_CUSTOM_TYPE_INFO( e , toString , fromString ) \
+    wxCustomTypeInfo s_typeInfo##e(typeid(e).name() , &toString , &fromString) ;

 
 #define WX_COLLECTION_TYPE_INFO( element , collection ) \
 
 #define WX_COLLECTION_TYPE_INFO( element , collection ) \

-    template<> const wxTypeInfo* wxGetTypeInfo( collection * ) \
-{ \
-    static wxCollectionTypeInfo s_typeInfo( (wxTypeInfo*) wxGetTypeInfo( (element *) NULL) , NULL , NULL , #collection ) ; \
-    return &s_typeInfo ; \
-} \
+    wxCollectionTypeInfo s_typeInfo##collection( typeid(element).name() , NULL , NULL , typeid(collection).name() ) ;

 
 // sometimes a compiler invents specializations that are nowhere called, use this macro to satisfy the refs
 
 
 // sometimes a compiler invents specializations that are nowhere called, use this macro to satisfy the refs
 

-#define WX_ILLEGAL_TYPE_SPECIALIZATION( a ) \
-    template<> const wxTypeInfo* wxGetTypeInfo( a * ) { assert(0) ; \
+#define WX_ILLEGAL_TYPE_SPECIALIZATION( a )
+/*
+    template<>  const wxTypeInfo* wxGetTypeInfo( a * ) { assert(0) ; \

     static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ; return &s_typeInfo ; } \
     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) ; }
+    template<>  void wxStringReadValue(const wxString & , a & ) { assert(0) ; }\
+    template<>  void wxStringWriteValue(wxString & , a const & ) { assert(0) ; }
+*/

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


@@ -535,7 +562,7 @@ 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) {}


@@ -555,6 +582,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;
 };


@@ -587,6 +615,8 @@ public :
         return dataptr->Get() ;
     }
 
         return dataptr->Get() ;
     }
 

+    bool IsEmpty() const { return m_data == NULL ; }
+

     template<typename T> bool HasData() const
     {
         const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;
     template<typename T> bool HasData() const
     {
         const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;


@@ -652,7 +682,7 @@ void wxFromStringConverter( const wxString &s, wxxVariant &v) { T d ; wxStringRe
 // want access, look at wxPropertyAccessor.
 // ----------------------------------------------------------------------------
 
 // want access, look at wxPropertyAccessor.
 // ----------------------------------------------------------------------------
 

-class wxSetter
+class WXDLLIMPEXP_BASE wxSetter

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


@@ -663,7 +693,7 @@ private:
     wxString m_name;
 };
 
     wxString m_name;
 };
 

-class wxGetter
+class WXDLLIMPEXP_BASE wxGetter

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


@@ -674,7 +704,7 @@ private:
     wxString m_name;
 };
 
     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 ; }


@@ -687,7 +717,7 @@ 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 ; }


@@ -704,7 +734,8 @@ private :
 class wxSetter##property : public wxSetter \
 { \
 public: \
 class wxSetter##property : public wxSetter \
 { \
 public: \

-    wxSetter##property() : wxSetter( #setterMethod ) {} \
+    wxSetter##property() : wxSetter( wxT(#setterMethod) ) {} \
+    ~wxSetter##property() {} \

     void Set( wxObject *object, const wxxVariant &variantValue ) const \
 { \
     Klass *obj = dynamic_cast<Klass*>(object) ;  \
     void Set( wxObject *object, const wxxVariant &variantValue ) const \
 { \
     Klass *obj = dynamic_cast<Klass*>(object) ;  \


@@ -719,7 +750,8 @@ public: \
 class wxGetter##property : public wxGetter \
 { \
 public : \
 class wxGetter##property : public wxGetter \
 { \
 public : \

-    wxGetter##property() : wxGetter( #gettermethod ) {} \
+    wxGetter##property() : wxGetter( wxT(#gettermethod) ) {} \
+    ~wxGetter##property() {} \

     void Get( const wxObject *object , wxxVariant &result) const \
 { \
     const Klass *obj = dynamic_cast<const Klass*>(object) ;  \
     void Get( const wxObject *object , wxxVariant &result) const \
 { \
     const Klass *obj = dynamic_cast<const Klass*>(object) ;  \


@@ -731,7 +763,8 @@ public : \
 class wxAdder##property : public wxAdder \
 { \
 public: \
 class wxAdder##property : public wxAdder \
 { \
 public: \

-    wxAdder##property() : wxAdder( #addermethod ) {} \
+    wxAdder##property() : wxAdder( wxT(#addermethod) ) {} \
+    ~wxAdder##property() {} \

     void Add( wxObject *object, const wxxVariant &variantValue ) const \
 { \
     Klass *obj = dynamic_cast<Klass*>(object) ;  \
     void Add( wxObject *object, const wxxVariant &variantValue ) const \
 { \
     Klass *obj = dynamic_cast<Klass*>(object) ;  \


@@ -746,7 +779,8 @@ public: \
 class wxCollectionGetter##property : public wxCollectionGetter \
 { \
 public : \
 class wxCollectionGetter##property : public wxCollectionGetter \
 { \
 public : \

-    wxCollectionGetter##property() : wxCollectionGetter( #gettermethod ) {} \
+    wxCollectionGetter##property() : wxCollectionGetter( wxT(#gettermethod) ) {} \
+    ~wxCollectionGetter##property() {} \

     void Get( const wxObject *object , wxxVariantArray &result) const \
 { \
     const Klass *obj = dynamic_cast<const Klass*>(object) ;  \
     void Get( const wxObject *object , wxxVariantArray &result) const \
 { \
     const Klass *obj = dynamic_cast<const Klass*>(object) ;  \


@@ -791,10 +825,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 ;


@@ -808,6 +839,10 @@ public :
     wxGenericPropertyAccessor( const wxString &propName ) ;
     ~wxGenericPropertyAccessor() ;
 
     wxGenericPropertyAccessor( const wxString &propName ) ;
     ~wxGenericPropertyAccessor() ;
 

+    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 HasSetter() const { return true ; }
     virtual bool HasGetter() const { return true ; }
     virtual bool HasAdder() const { return false ; }


@@ -850,48 +885,123 @@ enum {
 
 class WXDLLIMPEXP_BASE wxPropertyInfo
 {
 
 class WXDLLIMPEXP_BASE wxPropertyInfo
 {

+    friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ;

 public :
     wxPropertyInfo(wxPropertyInfo* &iter,
 public :
     wxPropertyInfo(wxPropertyInfo* &iter,

-                   const wxClassInfo* itsClass,
+                   wxClassInfo* itsClass,

                    const wxString& name,
                    const wxString& name,

-                   const wxTypeInfo* typeInfo,
+                   const wxString& typeName,

                    wxPropertyAccessor *accessor,
                    wxxVariant dv,
                    wxPropertyInfoFlags flags = 0,
                    const wxString& helpString = wxEmptyString,
                    const wxString& groupString = wxEmptyString) :
                    wxPropertyAccessor *accessor,
                    wxxVariant dv,
                    wxPropertyInfoFlags flags = 0,
                    const wxString& helpString = wxEmptyString,
                    const wxString& groupString = wxEmptyString) :

+                   m_itsClass(itsClass),

            m_name(name),
            m_name(name),

-           m_groupString(groupString),
+           m_typeInfo(NULL),
+           m_typeName(typeName) ,
+           m_collectionElementTypeInfo(NULL),
+           m_accessor(accessor),
+           m_defaultValue(dv),
+           m_flags(flags),

            m_helpString(helpString),
            m_helpString(helpString),

-           m_itsClass(itsClass),
+           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_flags(flags),

-           m_typeInfo(typeInfo),
+           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_collectionElementTypeInfo(NULL),
            m_accessor(accessor),

-           m_defaultValue(dv)
+           m_defaultValue(dv),
+           m_flags(flags),
+           m_helpString(helpString),
+           m_groupString(groupString)

        {
            Insert(iter);
        }
 
        wxPropertyInfo(wxPropertyInfo* &iter,
        {
            Insert(iter);
        }
 
        wxPropertyInfo(wxPropertyInfo* &iter,

-                      const wxClassInfo* itsClass, const wxString& name,
-                      const wxTypeInfo* collTypeInfo,
-                      const wxTypeInfo* elemTypeInfo,
+                      wxClassInfo* itsClass, const wxString& name,
+                      const wxString& collectionTypeName,
+                      const wxString& elementTypeName,

                       wxPropertyAccessor *accessor,
                       wxPropertyInfoFlags flags = 0,
                       const wxString& helpString = wxEmptyString,
                       const wxString& groupString = wxEmptyString) :
                       wxPropertyAccessor *accessor,
                       wxPropertyInfoFlags flags = 0,
                       const wxString& helpString = wxEmptyString,
                       const wxString& groupString = wxEmptyString) :

+           m_itsClass(itsClass),

            m_name(name),
            m_name(name),

-           m_groupString(groupString),
+           m_typeInfo(NULL),
+           m_typeName(collectionTypeName) ,
+           m_collectionElementTypeInfo(NULL),
+           m_collectionElementTypeName(elementTypeName),
+           m_accessor(accessor) ,
+           m_flags(flags),

            m_helpString(helpString),
            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_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_flags(flags),

-           m_typeInfo(collTypeInfo),
-           m_collectionElementTypeInfo(elemTypeInfo),
-           m_accessor(accessor)
+           m_helpString(helpString),
+           m_groupString(groupString)

        {
            Insert(iter);
        }
        {
            Insert(iter);
        }

+#endif
+       ~wxPropertyInfo() ;

 
        // return the class this property is declared in
        const wxClassInfo*   GetDeclaringClass() const { return m_itsClass ; }
 
        // return the class this property is declared in
        const wxClassInfo*   GetDeclaringClass() const { return m_itsClass ; }


@@ -909,10 +1019,20 @@ public :
        const wxString&     GetGroupString() const { return m_groupString ; }
 
        // return the element type info of this property (for collections, otherwise NULL)
        const wxString&     GetGroupString() const { return m_groupString ; }
 
        // return the element type info of this property (for collections, otherwise NULL)

-       const wxTypeInfo *      GetCollectionElementTypeInfo() const { return m_collectionElementTypeInfo ; }
+       const wxTypeInfo *      GetCollectionElementTypeInfo() const
+       {
+           if ( m_collectionElementTypeInfo == NULL )
+               m_collectionElementTypeInfo = wxTypeInfo::FindType(m_collectionElementTypeName) ;
+           return m_collectionElementTypeInfo ;
+       }

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

-       const wxTypeInfo *      GetTypeInfo() const { return m_typeInfo ; }
+       const wxTypeInfo *      GetTypeInfo() const
+       {
+           if ( m_typeInfo == NULL )
+               m_typeInfo = wxTypeInfo::FindType(m_typeName) ;
+           return m_typeInfo ;
+       }

 
        // return the accessor for this property
        wxPropertyAccessor* GetAccessor() const { return m_accessor ; }
 
        // return the accessor for this property
        wxPropertyAccessor* GetAccessor() const { return m_accessor ; }


@@ -937,24 +1057,25 @@ private :
             i->m_next = this ;
         }
     }
             i->m_next = this ;
         }
     }

-    
+
+    wxClassInfo*        m_itsClass ;

     wxString            m_name ;
     wxString            m_name ;

+    mutable wxTypeInfo*         m_typeInfo ;

     wxString            m_typeName ;
     wxString            m_typeName ;

-    wxString            m_groupString ;
-    wxString            m_helpString ;
-    const wxClassInfo*  m_itsClass ;
-    wxPropertyInfoFlags m_flags ;
-    const wxTypeInfo*   m_typeInfo ;
-    const wxTypeInfo*   m_collectionElementTypeInfo ;
+    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 ;
 };
 

-WX_DECLARE_EXPORTED_STRING_HASH_MAP( wxPropertyInfo* , wxPropertyInfoMap ) ;
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo* , wxPropertyInfoMap , class WXDLLIMPEXP_BASE ) ;

 
 #define WX_BEGIN_PROPERTIES_TABLE(theClass) \
     wxPropertyInfo *theClass::GetPropertiesStatic()  \
 
 #define WX_BEGIN_PROPERTIES_TABLE(theClass) \
     wxPropertyInfo *theClass::GetPropertiesStatic()  \


@@ -965,59 +1086,70 @@ WX_DECLARE_EXPORTED_STRING_HASH_MAP( wxPropertyInfo* , wxPropertyInfoMap ) ;
 #define WX_END_PROPERTIES_TABLE() \
     return first ; }
 
 #define WX_END_PROPERTIES_TABLE() \
     return first ; }
 

-#define WX_HIDE_PROPERTY( name ) \
-    static wxPropertyInfo _propertyInfo##name( first , class_t::GetClassInfoStatic() , #name , wxGetTypeInfo( (void*) NULL ) ,NULL , wxxVariant() , wxPROP_DONT_STREAM , wxEmptyString , wxEmptyString ) ;
-
-#define WX_PROPERTY( name , type , setter , getter ,defaultValue , flags , help , group) \
-    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 , class_t::GetClassInfoStatic() , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) , flags , group , help ) ;
-
-#define WX_PROPERTY_FLAGS( name , flags , type , setter , getter ,defaultValue , pflags , help , group) \
-    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 , class_t::GetClassInfoStatic() , #name , wxGetTypeInfo( (flags*) NULL ) ,&_accessor##name , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ;
-
-#define WX_READONLY_PROPERTY( name , type , getter ,defaultValue , flags , help , group) \
-    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 , class_t::GetClassInfoStatic() , #name , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue), flags , help , group ) ;
-
-#define WX_PROPERTY_COLLECTION( name , colltype , addelemtype , adder , getter , flags , help , group ) \
-    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 , class_t::GetClassInfoStatic() , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name , flags , help , group ) ;
-
-#define WX_READONLY_PROPERTY_COLLECTION( name , colltype , addelemtype , getter , flags , help , group) \
-    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 ,class_t::GetClassInfoStatic() ,  #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name , flags , help , group  ) ;
-/*
-#define WX_PROPERTY_COLLECTION( name , colltype , addelemtype , adder , getter ) \
-static wxPropertyCollectionAccessorT<class_t , colltype , addelemtype > _accessor##name( &adder , &getter , #adder , #getter ) ; \
-static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (colltype*) NULL ) ,wxGetTypeInfo( (addelemtype*) NULL ) ,&_accessor##name ) ;
-
-#define WX_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 WX_HIDE_PROPERTY( pname ) \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(void).name() ,NULL , wxxVariant() , wxPROP_DONT_STREAM , wxEmptyString , wxEmptyString ) ;
+
+#define WX_PROPERTY( pname , type , setter , getter ,defaultValue , flags , help , group) \
+    WX_SETTER( pname , class_t , type , setter ) \
+    static wxSetter##pname _setter##pname ; \
+    WX_GETTER( pname , class_t , type , getter ) \
+    static wxGetter##pname _getter##pname ; \
+    static wxPropertyAccessor _accessor##pname( &_setter##pname , &_getter##pname , NULL , NULL ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(type).name() ,&_accessor##pname , wxxVariant(defaultValue) , flags , group , help ) ;
+
+#define WX_PROPERTY_FLAGS( pname , flags , type , setter , getter ,defaultValue , pflags , help , group) \
+    WX_SETTER( pname , class_t , type , setter ) \
+    static wxSetter##pname _setter##pname ; \
+    WX_GETTER( pname , class_t , type , getter ) \
+    static wxGetter##pname _getter##pname ; \
+    static wxPropertyAccessor _accessor##pname( &_setter##pname , &_getter##pname , NULL , NULL ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(flags).name() ,&_accessor##pname , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ;
+
+#define WX_READONLY_PROPERTY( pname , type , getter ,defaultValue , flags , help , group) \
+    WX_GETTER( pname , class_t , type , getter ) \
+    static wxGetter##pname _getter##pname ; \
+    static wxPropertyAccessor _accessor##pname( NULL , &_getter##pname , NULL , NULL ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(type).name() ,&_accessor##pname , wxxVariant(defaultValue), flags , help , group ) ;
+
+#define WX_READONLY_PROPERTY_FLAGS( pname , flags , type , getter ,defaultValue , pflags , help , group) \
+    WX_GETTER( pname , class_t , type , getter ) \
+    static wxGetter##pname _getter##pname ; \
+    static wxPropertyAccessor _accessor##pname( NULL , &_getter##pname , NULL , NULL ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(flags).name() ,&_accessor##pname , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ;
+
+#define WX_PROPERTY_COLLECTION( pname , colltype , addelemtype , adder , getter , flags , help , group ) \
+    WX_ADDER( pname , class_t , addelemtype , adder ) \
+    static wxAdder##pname _adder##pname ; \
+    WX_COLLECTION_GETTER( pname , class_t , colltype , getter ) \
+    static wxCollectionGetter##pname _collectionGetter##pname ; \
+    static wxPropertyAccessor _accessor##pname( NULL , NULL ,&_adder##pname , &_collectionGetter##pname ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(colltype).name() ,typeid(addelemtype).name() ,&_accessor##pname , flags , help , group ) ;
+
+#define WX_READONLY_PROPERTY_COLLECTION( pname , colltype , addelemtype , getter , flags , help , group) \
+    WX_COLLECTION_GETTER( pname , class_t , colltype , getter ) \
+    static wxCollectionGetter##pname _collectionGetter##pname ; \
+    static wxPropertyAccessor _accessor##pname( NULL , NULL , NULL , &_collectionGetter##pname ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first ,class_t::GetClassInfoStatic() ,  wxT(#pname) , typeid(colltype).name() ,typeid(addelemtype).name() ,&_accessor##pname , flags , help , group  ) ;
+
+
+#define WX_EVENT_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 WX_EVENT_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 ,class_t::GetClassInfoStatic() , #name , &_typeInfo##name , NULL , wxxVariant() ) ; \
+#define WX_IMPLEMENT_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


@@ -1025,16 +1157,19 @@ static wxPropertyInfo _propertyInfo##name( first , #name , wxGetTypeInfo( (collt
 // this is describing an event sink
 // ----------------------------------------------------------------------------
 
 // this is describing an event sink
 // ----------------------------------------------------------------------------
 

-class wxHandlerInfo
+class WXDLLIMPEXP_BASE wxHandlerInfo

 {
 {

+    friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ;

 public :
     wxHandlerInfo(wxHandlerInfo* &iter,
 public :
     wxHandlerInfo(wxHandlerInfo* &iter,

+                   wxClassInfo* itsClass,

                   const wxString& name,
                   wxObjectEventFunction address,
                   const wxClassInfo* eventClassInfo) :
             m_eventFunction(address),
             m_name(name),
                   const wxString& name,
                   wxObjectEventFunction address,
                   const wxClassInfo* eventClassInfo) :
             m_eventFunction(address),
             m_name(name),

-            m_eventClassInfo(eventClassInfo)
+            m_eventClassInfo(eventClassInfo) ,
+            m_itsClass(itsClass)

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


@@ -1049,6 +1184,8 @@ public :
            }
        }
 
            }
        }
 

+       ~wxHandlerInfo() ;
+

        // return the name of this handler
        const wxString&         GetName() const { return m_name ; }
 
        // return the name of this handler
        const wxString&         GetName() const { return m_name ; }
 


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

+
+       // return the class this property is declared in
+       const wxClassInfo*   GetDeclaringClass() const { return m_itsClass ; }
+

 private :
     wxObjectEventFunction m_eventFunction ;
     wxString            m_name;
     const wxClassInfo*  m_eventClassInfo ;
     wxHandlerInfo*      m_next ;
 private :
     wxObjectEventFunction m_eventFunction ;
     wxString            m_name;
     const wxClassInfo*  m_eventClassInfo ;
     wxHandlerInfo*      m_next ;

+    wxClassInfo*        m_itsClass ;

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

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

 
 #define WX_BEGIN_HANDLERS_TABLE(theClass) \
     wxHandlerInfo *theClass::GetHandlersStatic()  \
 
 #define WX_BEGIN_HANDLERS_TABLE(theClass) \
     wxHandlerInfo *theClass::GetHandlersStatic()  \


@@ -1088,9 +1230,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


@@ -1098,7 +1249,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();


@@ -1107,7 +1258,7 @@ struct wxConstructorBridge_0 : public wxConstructorBridge
 
 struct wxConstructorBridge_Dummy : public wxConstructorBridge
 {
 
 struct wxConstructorBridge_Dummy : public wxConstructorBridge
 {

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

     {
     }
 } ;
     {
     }
 } ;


@@ -1129,7 +1280,7 @@ struct wxConstructorBridge_Dummy : public wxConstructorBridge
 template<typename Class, typename T0>
 struct wxConstructorBridge_1 : public wxConstructorBridge
 {
 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(


@@ -1141,7 +1292,7 @@ struct wxConstructorBridge_1 : public wxConstructorBridge
 #define WX_CONSTRUCTOR_1(klass,t0,v0) \
     wxConstructorBridge_1<klass,t0> constructor##klass ; \
     wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
 #define WX_CONSTRUCTOR_1(klass,t0,v0) \
     wxConstructorBridge_1<klass,t0> constructor##klass ; \
     wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \

-    const wxChar *klass::sm_constructorProperties##klass[] = { #v0 } ; \
+    const wxChar *klass::sm_constructorProperties##klass[] = { wxT(#v0) } ; \

     const int klass::sm_constructorPropertiesCount##klass = 1 ;
 
 // 2 params
     const int klass::sm_constructorPropertiesCount##klass = 1 ;
 
 // 2 params


@@ -1150,7 +1301,7 @@ template<typename Class,
 typename T0, typename T1>
 struct wxConstructorBridge_2 : public wxConstructorBridge
 {
 typename T0, typename T1>
 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(


@@ -1163,16 +1314,38 @@ struct wxConstructorBridge_2 : public wxConstructorBridge
 #define WX_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
     wxConstructorBridge_2<klass,t0,t1> constructor##klass ; \
     wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
 #define WX_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
     wxConstructorBridge_2<klass,t0,t1> constructor##klass ; \
     wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \

-    const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 } ; \
+    const wxChar *klass::sm_constructorProperties##klass[] = { wxT(#v0)  , wxT(#v1)  } ; \
+    const int klass::sm_constructorPropertiesCount##klass = 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].WX_TEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].WX_TEMPLATED_MEMBER_CALL(Get , T1)
+            );
+    }
+};
+
+#define WX_DIRECT_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
+    wxDirectConstructorBridge_2<klass,t0,t1> constructor##klass ; \
+    wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
+    const wxChar *klass::sm_constructorProperties##klass[] = { wxT(#v0)  , wxT(#v1)  } ; \

     const int klass::sm_constructorPropertiesCount##klass = 2;
 
     const int klass::sm_constructorPropertiesCount##klass = 2;
 

+

 // 3 params
 
 template<typename Class,
 typename T0, typename T1, typename T2>
 struct wxConstructorBridge_3 : public wxConstructorBridge
 {
 // 3 params
 
 template<typename Class,
 typename T0, typename T1, typename T2>
 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(


@@ -1186,7 +1359,7 @@ struct wxConstructorBridge_3 : public wxConstructorBridge
 #define WX_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
     wxConstructorBridge_3<klass,t0,t1,t2> constructor##klass ; \
     wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
 #define WX_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
     wxConstructorBridge_3<klass,t0,t1,t2> constructor##klass ; \
     wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \

-    const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 } ; \
+    const wxChar *klass::sm_constructorProperties##klass[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  } ; \

     const int klass::sm_constructorPropertiesCount##klass = 3 ;
 
 // 4 params
     const int klass::sm_constructorPropertiesCount##klass = 3 ;
 
 // 4 params


@@ -1195,7 +1368,7 @@ template<typename Class,
 typename T0, typename T1, typename T2, typename T3>
 struct wxConstructorBridge_4 : public wxConstructorBridge
 {
 typename T0, typename T1, typename T2, typename T3>
 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(


@@ -1210,7 +1383,7 @@ struct wxConstructorBridge_4 : public wxConstructorBridge
 #define WX_CONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \
     wxConstructorBridge_4<klass,t0,t1,t2,t3> constructor##klass ; \
     wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
 #define WX_CONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \
     wxConstructorBridge_4<klass,t0,t1,t2,t3> constructor##klass ; \
     wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \

-    const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 } ; \
+    const wxChar *klass::sm_constructorProperties##klass[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  } ; \

     const int klass::sm_constructorPropertiesCount##klass = 4 ;
 
 // 5 params
     const int klass::sm_constructorPropertiesCount##klass = 4 ;
 
 // 5 params


@@ -1219,7 +1392,7 @@ template<typename Class,
 typename T0, typename T1, typename T2, typename T3, typename T4>
 struct wxConstructorBridge_5 : public wxConstructorBridge
 {
 typename T0, typename T1, typename T2, typename T3, typename T4>
 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(


@@ -1235,7 +1408,7 @@ struct wxConstructorBridge_5 : public wxConstructorBridge
 #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 ; \
 #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 wxChar *klass::sm_constructorProperties##klass[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  } ; \

     const int klass::sm_constructorPropertiesCount##klass = 5;
 
 // 6 params
     const int klass::sm_constructorPropertiesCount##klass = 5;
 
 // 6 params


@@ -1244,7 +1417,7 @@ template<typename Class,
 typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
 struct wxConstructorBridge_6 : public wxConstructorBridge
 {
 typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
 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(


@@ -1258,13 +1431,21 @@ struct wxConstructorBridge_6 : public wxConstructorBridge
     }
 };
 
     }
 };
 

+#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[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  } ; \
+    const int klass::sm_constructorPropertiesCount##klass = 6;
+
+// direct constructor version
+

 template<typename Class,
 typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
 template<typename Class,
 typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>

-struct wxDirectConstructorBridge_6 : public wxConstructorBridge
+struct wxDirectConstructorBridge_6 : public wxDirectConstructorBrigde

 {
 {

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

     {
     {

-        Class *obj = new Class(
+        o = new Class(

             args[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) ,
             args[1].WX_TEMPLATED_MEMBER_CALL(Get , T1) ,
             args[2].WX_TEMPLATED_MEMBER_CALL(Get , T2) ,
             args[0].WX_TEMPLATED_MEMBER_CALL(Get , T0) ,
             args[1].WX_TEMPLATED_MEMBER_CALL(Get , T1) ,
             args[2].WX_TEMPLATED_MEMBER_CALL(Get , T2) ,


@@ -1278,13 +1459,7 @@ struct wxDirectConstructorBridge_6 : public wxConstructorBridge
 #define WX_DIRECT_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
     wxDirectConstructorBridge_6<klass,t0,t1,t2,t3,t4,t5> constructor##klass ; \
     wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
 #define WX_DIRECT_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
     wxDirectConstructorBridge_6<klass,t0,t1,t2,t3,t4,t5> constructor##klass ; \
     wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \

-    const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 , #v3 , #v4 , #v5 } ; \
-    const int klass::sm_constructorPropertiesCount##klass = 6;
-
-#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 wxChar *klass::sm_constructorProperties##klass[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  } ; \

     const int klass::sm_constructorPropertiesCount##klass = 6;
 
 // 7 params
     const int klass::sm_constructorPropertiesCount##klass = 6;
 
 // 7 params


@@ -1293,7 +1468,7 @@ template<typename Class,
 typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
 struct wxConstructorBridge_7 : public wxConstructorBridge
 {
 typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
 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(


@@ -1311,7 +1486,7 @@ struct wxConstructorBridge_7 : public wxConstructorBridge
 #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 ; \
 #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 wxChar *klass::sm_constructorProperties##klass[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  , wxT(#v6) } ; \

     const int klass::sm_constructorPropertiesCount##klass = 7;
 
 // 8 params
     const int klass::sm_constructorPropertiesCount##klass = 7;
 
 // 8 params


@@ -1320,7 +1495,7 @@ template<typename Class,
 typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
 struct wxConstructorBridge_8 : public wxConstructorBridge
 {
 typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
 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(


@@ -1339,7 +1514,7 @@ struct wxConstructorBridge_8 : public wxConstructorBridge
 #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 ; \
 #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 wxChar *klass::sm_constructorProperties##klass[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  , wxT(#v6) , wxT(#v7) } ; \

     const int klass::sm_constructorPropertiesCount##klass = 8;
 // ----------------------------------------------------------------------------
 // wxClassInfo
     const int klass::sm_constructorPropertiesCount##klass = 8;
 // ----------------------------------------------------------------------------
 // wxClassInfo


@@ -1348,12 +1523,16 @@ struct wxConstructorBridge_8 : public wxConstructorBridge
 typedef wxObject *(*wxObjectConstructorFn)(void);
 typedef wxObject* (*wxVariantToObjectConverter)( wxxVariant &data ) ;
 typedef wxxVariant (*wxObjectToVariantConverter)( wxObject* ) ;
 typedef wxObject *(*wxObjectConstructorFn)(void);
 typedef wxObject* (*wxVariantToObjectConverter)( wxxVariant &data ) ;
 typedef wxxVariant (*wxObjectToVariantConverter)( wxObject* ) ;

-class wxWriter ;
-class wxPersister ;
+
+class WXDLLIMPEXP_BASE wxWriter;
+class WXDLLIMPEXP_BASE wxPersister;
+

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

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

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


@@ -1369,8 +1548,8 @@ public:
         wxVariantToObjectConverter _Converter2 ,
         wxObjectToVariantConverter _Converter3 ,
         wxObjectStreamingCallback _streamingCallback = NULL
         wxVariantToObjectConverter _Converter2 ,
         wxObjectToVariantConverter _Converter3 ,
         wxObjectStreamingCallback _streamingCallback = NULL

-        ) : 
-    
+        ) :
+

             m_className(_ClassName),
             m_objectSize(size),
             m_objectConstructor(ctor),
             m_className(_ClassName),
             m_objectSize(size),
             m_objectConstructor(ctor),


@@ -1378,7 +1557,7 @@ public:
             m_firstProperty(_Props),
             m_firstHandler(_Handlers),
             m_parents(_Parents),
             m_firstProperty(_Props),
             m_firstHandler(_Handlers),
             m_parents(_Parents),

-            m_unitName(_UnitName),            
+            m_unitName(_UnitName),

             m_constructor(_Constructor),
             m_constructorProperties(_ConstructorProperties),
             m_constructorPropertiesCount(_ConstructorPropertiesCount),
             m_constructor(_Constructor),
             m_constructorProperties(_ConstructorProperties),
             m_constructorPropertiesCount(_ConstructorPropertiesCount),


@@ -1392,7 +1571,7 @@ public:
     }
 
     wxClassInfo(const wxChar *_UnitName, const wxChar *_ClassName,
     }
 
     wxClassInfo(const wxChar *_UnitName, const wxChar *_ClassName,

-                const wxClassInfo **_Parents) : 
+                const wxClassInfo **_Parents) :

             m_className(_ClassName),
             m_objectSize(0),
             m_objectConstructor(NULL),
             m_className(_ClassName),
             m_objectSize(0),
             m_objectConstructor(NULL),


@@ -1422,6 +1601,17 @@ 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
+    {
+        wxASSERT_MSG( ParamCount == m_constructorPropertiesCount , wxT("Illegal Parameter Count for ConstructObject Method")) ;
+        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       *GetIncludeName() const { return m_unitName ; }
     const wxClassInfo **GetParents() const { return m_parents; }
     const wxChar       *GetClassName() const { return m_className; }
     const wxChar       *GetIncludeName() const { return m_unitName ; }
     const wxClassInfo **GetParents() const { return m_parents; }


@@ -1514,10 +1704,10 @@ 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)
 
     // 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)


@@ -1574,7 +1764,7 @@ 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

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


@@ -1602,11 +1792,17 @@ public :
     // removes an existing runtime-property
     void RemoveProperty( const wxChar *propertyName ) ;
 
     // 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 ) ;
 
     // removes an existing runtime-handler
     void RemoveHandler( const wxChar *handlerName ) ;
     // as a handler to this class at runtime
     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 ) ;

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


@@ -1647,6 +1843,10 @@ public :
 
 // Single inheritance with one base class
 
 
 // Single inheritance with one base class
 

+#define _TYPEINFO_CLASSES(n , toString , fromString ) \
+    wxClassTypeInfo s_typeInfo##n(wxT_OBJECT , &n::sm_class##n , toString , fromString , typeid(n).name()) ; \
+    wxClassTypeInfo s_typeInfoPtr##n(wxT_OBJECT_PTR , &n::sm_class##n , toString , fromString , typeid(n*).name()) ;
+

 #define _IMPLEMENT_DYNAMIC_CLASS(name, basename, unit , callback)                 \
     wxObject* wxConstructorFor##name()                             \
 { return new name; }                                          \
 #define _IMPLEMENT_DYNAMIC_CLASS(name, basename, unit , callback)                 \
     wxObject* wxConstructorFor##name()                             \
 { return new name; }                                          \


@@ -1657,16 +1857,7 @@ public :
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) wxConstructorFor##name   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name ,     \
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) wxConstructorFor##name   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name ,     \

-    name::sm_constructorPropertiesCount##name , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name , callback);    \
-    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 ; }
+    name::sm_constructorPropertiesCount##name , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name , callback);

 
 #define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit, callback )                 \
     wxObject* wxConstructorFor##name()                             \
 
 #define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit, callback )                 \
     wxObject* wxConstructorFor##name()                             \


@@ -1679,37 +1870,37 @@ public :
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) wxConstructorFor##name   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name ,     \
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) wxConstructorFor##name   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name ,     \

-    name::sm_constructorPropertiesCount##name , wxVariantOfPtrToObjectConverter##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name, callback);    \
-    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 ; }
+    name::sm_constructorPropertiesCount##name , wxVariantOfPtrToObjectConverter##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name, callback);

 
 #define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename ) \
     _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , "" , NULL ) \
 
 #define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename ) \
     _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , "" , NULL ) \

+    _TYPEINFO_CLASSES(name, NULL , NULL) \

     const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
     const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
     WX_CONSTRUCTOR_DUMMY( name )
 
 #define IMPLEMENT_DYNAMIC_CLASS( name , basename ) \
     _IMPLEMENT_DYNAMIC_CLASS( name , basename , "" , NULL ) \
     const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
     const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
     WX_CONSTRUCTOR_DUMMY( name )
 
 #define IMPLEMENT_DYNAMIC_CLASS( name , basename ) \
     _IMPLEMENT_DYNAMIC_CLASS( name , basename , "" , NULL ) \

-    wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
+     _TYPEINFO_CLASSES(name, NULL , NULL) \
+   wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \

     wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
     WX_CONSTRUCTOR_DUMMY( name )
 
 #define IMPLEMENT_DYNAMIC_CLASS_XTI( name , basename , unit ) \
     wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
     WX_CONSTRUCTOR_DUMMY( name )
 
 #define IMPLEMENT_DYNAMIC_CLASS_XTI( name , basename , unit ) \

-    _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , NULL )
+    _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , NULL ) \
+    _TYPEINFO_CLASSES(name, NULL , NULL)

 
 #define IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK( name , basename , unit , callback ) \
 
 #define IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK( name , basename , unit , callback ) \

-    _IMPLEMENT_DYNAMIC_CLASS( 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 , NULL  )
+    _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
 
 
 // this is for classes that do not derive from wxobject, there are no creators for these
 


@@ -1720,13 +1911,7 @@ public :
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
     0 , 0 , 0 );    \
     (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 ; }
+    _TYPEINFO_CLASSES(name, NULL , NULL)

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


@@ -1737,13 +1922,7 @@ public :
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
     0 , 0 , 0 );    \
     (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 ; }
+    _TYPEINFO_CLASSES(name, NULL , NULL)

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


@@ -1759,22 +1938,18 @@ public :
     (wxObjectConstructorFn) wxConstructorFor##name   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name ,     \
     name::sm_constructorPropertiesCount##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##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 ; }

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

+    _TYPEINFO_CLASSES(name, NULL , NULL) \

     wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
     wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
     WX_CONSTRUCTOR_DUMMY( name )
 
 #define IMPLEMENT_DYNAMIC_CLASS2_XTI( name , basename , basename2, unit) \
     wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
     wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
     WX_CONSTRUCTOR_DUMMY( name )
 
 #define IMPLEMENT_DYNAMIC_CLASS2_XTI( name , basename , basename2, unit) \

-    _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


@@ -1792,13 +1967,7 @@ public :
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
     0 , wxVariantOfPtrToObjectConverter##name ,wxVariantToObjectConverter##name , wxObjectToVariantConverter##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 ; }
+    _TYPEINFO_CLASSES(name, NULL , NULL)

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