1. added flags to splitter drawing functions and replaced

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

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

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

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


@@ -19,14 +19,14 @@
 
 // We want to support properties, event sources and events sinks through
 // explicit declarations, using templates and specialization to make the
 
 // We want to support properties, event sources and events sinks through
 // explicit declarations, using templates and specialization to make the

-// effort as painless as possible. 
+// effort as painless as possible.

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

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

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


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

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

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


@@ -78,21 +78,21 @@ public :
        // pointed to accordingly (if ptr != null )
        // if not found returns false, value left unchanged
        bool HasEnumMemberValue( const wxChar *name , int *value = NULL ) ;
        // pointed to accordingly (if ptr != null )
        // if not found returns false, value left unchanged
        bool HasEnumMemberValue( const wxChar *name , int *value = NULL ) ;

-       
+

        // returns the value of the member, if not found in debug mode an
        // assert is issued, in release 0 is returned
        int GetEnumMemberValue(const wxChar *name );
        // returns the value of the member, if not found in debug mode an
        // assert is issued, in release 0 is returned
        int GetEnumMemberValue(const wxChar *name );

-       
+

        // returns the name of the enum member having the passed in value
        // returns an emtpy string if not found
     const wxChar *GetEnumMemberName(int value);
        // returns the name of the enum member having the passed in value
        // returns an emtpy string if not found
     const wxChar *GetEnumMemberName(int value);

-       
+

        // returns the number of members in this enum
        int GetEnumCount() { return m_count ; }
        // returns the number of members in this enum
        int GetEnumCount() { return m_count ; }

-       
+

        // returns the value of the nth member
        int GetEnumMemberValueByIndex( int n ) ;
        // returns the value of the nth member
        int GetEnumMemberValueByIndex( int n ) ;

-       
+

        // returns the value of the nth member
        const wxChar *GetEnumMemberNameByIndex( int n ) ;
 private :
        // returns the value of the nth member
        const wxChar *GetEnumMemberNameByIndex( int n ) ;
 private :


@@ -120,29 +120,29 @@ private :
 
 // ----------------------------------------------------------------------------
 // Set Support
 
 // ----------------------------------------------------------------------------
 // Set Support

-// 
+//

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

-// 
+//

 // enum wxFlavor
 // enum wxFlavor

-// {  
+// {

 //     Vanilla,
 //     Chocolate,
 //     Strawberry,
 // };
 //     Vanilla,
 //     Chocolate,
 //     Strawberry,
 // };

-// 
+//

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

-// 
+//

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

-// 
+//

 // WX_BEGIN_ENUM( wxFlavor )
 //     WX_ENUM_MEMBER( Vanilla )
 //     WX_ENUM_MEMBER( Chocolate )
 //     WX_ENUM_MEMBER( Strawberry )
 // WX_END_ENUM( wxFlavor )
 // WX_BEGIN_ENUM( wxFlavor )
 //     WX_ENUM_MEMBER( Vanilla )
 //     WX_ENUM_MEMBER( Chocolate )
 //     WX_ENUM_MEMBER( Strawberry )
 // WX_END_ENUM( wxFlavor )

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

 //
 //

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

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


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

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

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


@@ -191,7 +191,7 @@ void wxSetToString( wxString &s , const wxSet<e> &data )
 }
 
 //  if the wxSet specialization above does not work for all compilers, add this to the WX_IMPLEMENT_SET_STREAMING macro
 }
 
 //  if the wxSet specialization above does not work for all compilers, add this to the WX_IMPLEMENT_SET_STREAMING macro

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

 
 #define WX_IMPLEMENT_SET_STREAMING(SetName,e) \
        template<> void wxStringReadValue(const wxString &s , wxSet<e> &data ) \
 
 #define WX_IMPLEMENT_SET_STREAMING(SetName,e) \
        template<> void wxStringReadValue(const wxString &s , wxSet<e> &data ) \


@@ -242,15 +242,15 @@ protected :
 class WXDLLIMPEXP_BASE wxBuiltInTypeInfo : public wxTypeInfo
 {
 public :
 class WXDLLIMPEXP_BASE wxBuiltInTypeInfo : public wxTypeInfo
 {
 public :

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

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

-       wxCustomTypeInfo( const wxChar *typeName ) 
+       wxCustomTypeInfo( const wxChar *typeName )

        { m_kind = wxT_CUSTOM ; m_typeName = typeName ;}
        { m_kind = wxT_CUSTOM ; m_typeName = typeName ;}

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

 private :
        const wxChar *m_typeName; // Kind == wxT_CUSTOM
 } ;
 private :
        const wxChar *m_typeName; // Kind == wxT_CUSTOM
 } ;


@@ -258,9 +258,9 @@ private :
 class WXDLLIMPEXP_BASE wxEnumTypeInfo : public wxTypeInfo
 {
 public :
 class WXDLLIMPEXP_BASE wxEnumTypeInfo : public wxTypeInfo
 {
 public :

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

 private :
        wxEnumData *m_enumInfo; // Kind == wxT_ENUM or Kind == wxT_SET
 } ;
 private :
        wxEnumData *m_enumInfo; // Kind == wxT_ENUM or Kind == wxT_SET
 } ;


@@ -268,22 +268,22 @@ private :
 class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo
 {
 public :
 class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo
 {
 public :

-       wxClassTypeInfo( wxClassInfo* classInfo ) 
+       wxClassTypeInfo( wxClassInfo* classInfo )

        { m_kind = wxT_OBJECT ; m_classInfo = classInfo ;}
        { m_kind = wxT_OBJECT ; m_classInfo = classInfo ;}

-       const wxClassInfo *GetClassInfo() const { assert( m_kind == wxT_OBJECT ) ; return m_classInfo ; }
+       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
 } ;
 

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

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

-       wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass ) 
+       wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass )

        { m_kind = wxT_DELEGATE ; m_eventClass = eventClass ; m_eventType = eventType ;}
        const wxClassInfo *GetEventClass() const { assert( m_kind == wxT_DELEGATE ) ; return m_eventClass ; }
        { m_kind = wxT_DELEGATE ; m_eventClass = eventClass ; m_eventType = eventType ;}
        const wxClassInfo *GetEventClass() const { assert( m_kind == wxT_DELEGATE ) ; return m_eventClass ; }

-       int GetEventType() const { assert( m_kind == wxT_DELEGATE ) ; return m_eventType ; }
+       int GetEventType() const { return m_eventType ; }

 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 ;


@@ -291,9 +291,9 @@ private :
 
 template<typename T> const wxTypeInfo* wxGetTypeInfo( T * ) ;
 
 
 template<typename T> const wxTypeInfo* wxGetTypeInfo( T * ) ;
 

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

 {
 {

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

 }
 
 // this macro is for usage with custom, non-object derived classes and structs, wxPoint is such a custom type
 }
 
 // this macro is for usage with custom, non-object derived classes and structs, wxPoint is such a custom type


@@ -302,7 +302,7 @@ template<typename T> const wxTypeInfo* wxGetTypeInfo( wxSet<T> * )
        template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxCustomTypeInfo s_typeInfo(#e) ; return &s_typeInfo ; } \
 
 // ----------------------------------------------------------------------------
        template<> const wxTypeInfo* wxGetTypeInfo( e * ){ static wxCustomTypeInfo s_typeInfo(#e) ; return &s_typeInfo ; } \
 
 // ----------------------------------------------------------------------------

-// value streaming 
+// value streaming

 //
 // streaming is defined for xml constructs right now, the aim is to make this
 // pluggable in the future
 //
 // streaming is defined for xml constructs right now, the aim is to make this
 // pluggable in the future


@@ -323,16 +323,16 @@ template<typename T>
 void wxStringWriteValue( wxString &s , const T &data) ;
 
 // for simple types this default implementation is ok, composited structures will have to
 void wxStringWriteValue( wxString &s , const T &data) ;
 
 // for simple types this default implementation is ok, composited structures will have to

-// loop through their properties 
+// loop through their properties

 
 template<typename T>
 
 template<typename T>

-void wxXmlReadValue( wxXmlNode *node , T &data ) 
+void wxXmlReadValue( wxXmlNode *node , T &data )

 {
        wxStringReadValue<T>( wxXmlGetContentFromNode( node ) , data ) ;
 }
 
 template<typename T>
 {
        wxStringReadValue<T>( wxXmlGetContentFromNode( node ) , data ) ;
 }
 
 template<typename T>

-void wxXmlWriteValue( wxXmlNode *node , const T &data) 
+void wxXmlWriteValue( wxXmlNode *node , const T &data)

 {
        wxString s ;
        wxStringWriteValue<T>( s, data ) ;
 {
        wxString s ;
        wxStringWriteValue<T>( s, data ) ;


@@ -408,7 +408,7 @@ public :
        wxxVariant( wxxVariantData* data , const wxString& name = wxT("") ) : m_data(data) , m_name(name) {}
        wxxVariant( const wxxVariant &d ) { if ( d.m_data ) m_data = d.m_data->Clone() ; else m_data = NULL ; m_name = d.m_name ; }
 
        wxxVariant( wxxVariantData* data , const wxString& name = wxT("") ) : m_data(data) , m_name(name) {}
        wxxVariant( const wxxVariant &d ) { if ( d.m_data ) m_data = d.m_data->Clone() ; else m_data = NULL ; m_name = d.m_name ; }
 

-       template<typename T> wxxVariant( T data , const wxString& name = wxT("") ) : 
+       template<typename T> wxxVariant( T data , const wxString& name = wxT("") ) :

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


@@ -416,12 +416,12 @@ public :
        template<typename T> T Get() const
        {
                wxxVariantDataT<T> *dataptr = dynamic_cast<wxxVariantDataT<T>*> (m_data) ;
        template<typename T> T Get() const
        {
                wxxVariantDataT<T> *dataptr = dynamic_cast<wxxVariantDataT<T>*> (m_data) ;

-               assert( dataptr ) ;
+               wxASSERT_MSG( dataptr , "Cast not possible" ) ;

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

-       
+

        // stores the data
        // stores the data

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

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


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

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

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

-       
+

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


@@ -477,19 +477,22 @@ private :
 class WXDLLIMPEXP_BASE wxPropertyAccessor
 {
 public :
 class WXDLLIMPEXP_BASE wxPropertyAccessor
 {
 public :

+    class SetByRef ;
+    class SetAndGetByRef ;
+    class GetByRef ;

     virtual void SetProperty(wxObject *object, const wxxVariant &value) const = 0 ;
     virtual wxxVariant GetProperty(wxObject *object) const = 0 ;
     virtual bool HasSetter() const = 0 ;
     virtual bool HasGetter() const = 0 ;
     virtual void SetProperty(wxObject *object, const wxxVariant &value) const = 0 ;
     virtual wxxVariant GetProperty(wxObject *object) const = 0 ;
     virtual bool HasSetter() const = 0 ;
     virtual bool HasGetter() const = 0 ;

-       const char * GetGetterName() const { return m_setterName ; }
-       const char * GetSetterName() const { return m_getterName ; }
+       const wxChar * GetGetterName() const { return m_setterName ; }
+       const wxChar * GetSetterName() const { return m_getterName ; }

        virtual wxxVariant ReadValue( wxXmlNode* node ) const = 0 ;
        virtual void WriteValue( wxXmlNode* node , wxObject *o ) const = 0 ;
        virtual wxxVariant ReadValue( const wxString &value ) const = 0 ;
        virtual void WriteValue( wxString& value , wxObject *o ) const = 0 ;
 protected :
        virtual wxxVariant ReadValue( wxXmlNode* node ) const = 0 ;
        virtual void WriteValue( wxXmlNode* node , wxObject *o ) const = 0 ;
        virtual wxxVariant ReadValue( const wxString &value ) const = 0 ;
        virtual void WriteValue( wxString& value , wxObject *o ) const = 0 ;
 protected :

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

 };
 
 template<typename T>
 };
 
 template<typename T>


@@ -502,19 +505,38 @@ template<class Klass, typename T>
 class WXDLLIMPEXP_BASE wxPropertyAccessorT : public wxPropertyAccessor
 {
 public:
 class WXDLLIMPEXP_BASE wxPropertyAccessorT : public wxPropertyAccessor
 {
 public:

+

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

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

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

-    wxPropertyAccessorT(setter_t setter, getter_t getter, const char *g, const char *s)
+    wxPropertyAccessorT(setter_t setter, getter_t getter, const wxChar *g, const wxChar *s)

         : m_setter(setter), m_setter_ref(NULL), m_getter(getter) ,m_getter_ref(NULL) {m_setterName = s;m_getterName=g ;}
         : m_setter(setter), m_setter_ref(NULL), m_getter(getter) ,m_getter_ref(NULL) {m_setterName = s;m_getterName=g ;}

-    wxPropertyAccessorT(setter_ref_t setter, getter_t getter, const char *g, const char *s)
-        : m_setter(NULL), m_setter_ref(setter), m_getter(getter) , m_getter_ref(NULL){m_setterName = s;m_getterName=g ;}
-    wxPropertyAccessorT(setter_ref_t setter, getter_ref_t getter, const char *g, const char *s)
-        : m_setter(NULL), m_setter_ref(setter), m_getter(NULL) , m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
-    wxPropertyAccessorT(setter_t setter, getter_ref_t getter, const char *g, const char *s)
-        : m_setter(NULL), m_setter(setter), m_getter(NULL) ,  m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
+
+    wxPropertyAccessorT( getter_t getter, const wxChar *g)
+        : m_setter(NULL), m_setter_ref(NULL), m_getter(getter) ,m_getter_ref(NULL) {m_setterName = "";m_getterName=g ;}
+
+    wxPropertyAccessorT(SetByRef*, setter_ref_t setter, getter_t getter, const wxChar *g, const wxChar *s)
+       : m_setter(NULL), m_setter_ref(setter), m_getter(getter) , m_getter_ref(NULL){m_setterName = s;m_getterName=g ;}
+
+ //   wxPropertyAccessorT(setter_ref_t setter, getter_t getter, const wxChar *g, const wxChar *s)
+ //       : m_setter(NULL), m_setter_ref(setter), m_getter(getter) , m_getter_ref(NULL){m_setterName = s;m_getterName=g ;}
+
+    wxPropertyAccessorT(SetAndGetByRef*, setter_ref_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s)
+       : m_setter(NULL), m_setter_ref(setter), m_getter(NULL) , m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
+
+ //   wxPropertyAccessorT(setter_ref_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s)
+ //       : m_setter(NULL), m_setter_ref(setter), m_getter(NULL) , m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
+
+ //   wxPropertyAccessorT(setter_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s)
+ //       : m_setter(NULL), m_setter(setter), m_getter(NULL) ,  m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
+
+    wxPropertyAccessorT(GetByRef*, setter_t setter, getter_ref_t getter, const wxChar *g, const wxChar *s)
+       : m_setter(NULL), m_setter(setter), m_getter(NULL) ,  m_getter_ref(getter){m_setterName = s;m_getterName=g ;}
+
+ //   wxPropertyAccessorT( getter_ref_t getter, const wxChar *g)
+ //       : m_setter(NULL), m_setter(NULL), m_getter(NULL) ,  m_getter_ref(getter){m_setterName = "";m_getterName=g ;}

 
        // returns true if this accessor has a setter
        bool HasSetter() const { return m_setter != NULL || m_setter_ref != NULL ; }
 
        // returns true if this accessor has a setter
        bool HasSetter() const { return m_setter != NULL || m_setter_ref != NULL ; }


@@ -590,17 +612,26 @@ private :
 class WXDLLIMPEXP_BASE wxPropertyInfo
 {
 public :
 class WXDLLIMPEXP_BASE wxPropertyInfo
 {
 public :

-       wxPropertyInfo( wxPropertyInfo* &iter , const char *name , const char *typeName , const wxTypeInfo* typeInfo , wxPropertyAccessor *accessor , wxxVariant dv ) :
+       wxPropertyInfo( wxPropertyInfo* &iter , const wxChar *name , const wxChar *typeName , const wxTypeInfo* typeInfo , wxPropertyAccessor *accessor , wxxVariant dv ) :

           m_name( name ) , m_typeName(typeName) , m_typeInfo( typeInfo ) , m_accessor( accessor ) , m_defaultValue( dv )
        {
           m_name( name ) , m_typeName(typeName) , m_typeInfo( typeInfo ) , m_accessor( accessor ) , m_defaultValue( dv )
        {

-               m_next = iter ;
-               iter = 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 ;
+               }

        }
        // return the name of this property
        }
        // return the name of this property

-       const char *            GetName() const { return m_name ; }
+       const wxChar *          GetName() const { return m_name ; }

 
        // return the typename of this property
 
        // return the typename of this property

-       const char *            GetTypeName() const { return m_typeName ; }
+       const wxChar *          GetTypeName() const { return m_typeName ; }

 
        // return the type info of this property
        const wxTypeInfo *      GetTypeInfo() const { return m_typeInfo ; }
 
        // return the type info of this property
        const wxTypeInfo *      GetTypeInfo() const { return m_typeInfo ; }


@@ -610,12 +641,15 @@ public :
 
        // returns NULL if this is the last property of this class
        wxPropertyInfo*     GetNext() const { return m_next ; }
 
        // returns NULL if this is the last property of this class
        wxPropertyInfo*     GetNext() const { return m_next ; }

-private : 
-       const char *            m_name;
-       const char *            m_typeName ;
+
+       // returns the default value of this property, its kind may be wxT_VOID if it is not valid
+       wxxVariant                      GetDefaultValue() const { return m_defaultValue ; }
+private :
+       const wxChar *          m_name;
+       const wxChar *          m_typeName ;

        const wxTypeInfo*       m_typeInfo ;
        wxPropertyAccessor* m_accessor ;
        const wxTypeInfo*       m_typeInfo ;
        wxPropertyAccessor* m_accessor ;

-    wxxVariant m_defaultValue; 
+    wxxVariant m_defaultValue;

        // string representation of the default value
        //  to be assigned by the designer to the property
        //  when the component is dropped on the container.
        // string representation of the default value
        //  to be assigned by the designer to the property
        //  when the component is dropped on the container.


@@ -629,10 +663,18 @@ private :
                static wxPropertyInfo* first = NULL ;
 
 #define WX_END_PROPERTIES_TABLE() \
                static wxPropertyInfo* first = NULL ;
 
 #define WX_END_PROPERTIES_TABLE() \

-               return first ; } 
+               return first ; }

 
 #define WX_PROPERTY( name , type , setter , getter ,defaultValue ) \
 
 #define WX_PROPERTY( name , type , setter , getter ,defaultValue ) \

-       static wxPropertyAccessorT<class_t , type> _accessor##name( setter , getter , #setter , #getter ) ; \
+       static wxPropertyAccessorT<class_t , type> _accessor##name( &setter , &getter , #setter , #getter ) ; \
+       static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#define WX_PROPERTY_SET_BY_REF( name , type , setter , getter ,defaultValue ) \
+        static wxPropertyAccessorT<class_t , type> _accessor##name( (wxPropertyAccessor::SetByRef*)NULL, &setter , &getter , #setter , #getter ) ; \
+        static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
+
+#define WX_READONLY_PROPERTY( name , type , getter ,defaultValue ) \
+       static wxPropertyAccessorT<class_t , type> _accessor##name( &getter , #getter ) ; \

        static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
 
 #define WX_DELEGATE( name , eventType , eventClass ) \
        static wxPropertyInfo _propertyInfo##name( first , #name , #type , wxGetTypeInfo( (type*) NULL ) ,&_accessor##name , wxxVariant(defaultValue) ) ;
 
 #define WX_DELEGATE( name , eventType , eventClass ) \


@@ -649,14 +691,23 @@ class wxHandlerInfo
 {
 public :
        wxHandlerInfo( wxHandlerInfo* &iter , const wxChar *name , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) :
 {
 public :
        wxHandlerInfo( wxHandlerInfo* &iter , const wxChar *name , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) :

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

        {
        {

-               m_next = iter ;
-               iter = this ;
+               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
        }
 
        // get the name of the handler method

-       const char *            GetName() const { return m_name ; }
+       const wxChar *          GetName() const { return m_name ; }

 
        // return the class info of the event
        const wxClassInfo *     GetEventClassInfo() const { return m_eventClassInfo ; }
 
        // return the class info of the event
        const wxClassInfo *     GetEventClassInfo() const { return m_eventClassInfo ; }


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

-private : 
-       const wxChar *          m_name;
+private :

        wxObjectEventFunction m_eventFunction ;
        wxObjectEventFunction m_eventFunction ;

+       const wxChar *          m_name;

        const wxClassInfo*      m_eventClassInfo ;
        wxHandlerInfo*          m_next ;
 };
 
 #define WX_HANDLER(name,eventClassType) \
        const wxClassInfo*      m_eventClassInfo ;
        wxHandlerInfo*          m_next ;
 };
 
 #define WX_HANDLER(name,eventClassType) \

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

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


@@ -683,7 +734,7 @@ private :
                static wxHandlerInfo* first = NULL ;
 
 #define WX_END_HANDLERS_TABLE() \
                static wxHandlerInfo* first = NULL ;
 
 #define WX_END_HANDLERS_TABLE() \

-               return first ; } 
+               return first ; }

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


@@ -721,13 +772,13 @@ struct wxConstructorBridge_Dummy : public wxConstructorBridge
 #define WX_CONSTRUCTOR_0(klass) \
        wxConstructorBridge_0<klass> constructor##klass ; \
        wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
 #define WX_CONSTRUCTOR_0(klass) \
        wxConstructorBridge_0<klass> constructor##klass ; \
        wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \

-       const char *klass::sm_constructorProperties##klass[] = { NULL } ; \
+       const wxChar *klass::sm_constructorProperties##klass[] = { NULL } ; \

        const int klass::sm_constructorPropertiesCount##klass = 0 ;
 
 #define WX_CONSTRUCTOR_DUMMY(klass) \
        wxConstructorBridge_Dummy constructor##klass ; \
        wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
        const int klass::sm_constructorPropertiesCount##klass = 0 ;
 
 #define WX_CONSTRUCTOR_DUMMY(klass) \
        wxConstructorBridge_Dummy constructor##klass ; \
        wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \

-       const char *klass::sm_constructorProperties##klass[] = { NULL } ; \
+       const wxChar *klass::sm_constructorProperties##klass[] = { NULL } ; \

        const int klass::sm_constructorPropertiesCount##klass = 0 ;
 
 // 1 param
        const int klass::sm_constructorPropertiesCount##klass = 0 ;
 
 // 1 param


@@ -747,7 +798,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 char *klass::sm_constructorProperties##klass[] = { #v0 } ; \
+       const wxChar *klass::sm_constructorProperties##klass[] = { #v0 } ; \

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


@@ -756,21 +807,21 @@ 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(
                     args[0].Get<T0>() ,
     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(
                     args[0].Get<T0>() ,

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

                    );
     }
 };
 
 #define WX_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
        wxConstructorBridge_2<klass,t0,t1> constructor##klass ; \
                    );
     }
 };
 
 #define WX_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
        wxConstructorBridge_2<klass,t0,t1> constructor##klass ; \

-       klass::sm_constructor##klass = &constructor##klass ; \
-       klass::sm_constructorProperties##klass[] = { #v0 , #v1 } ; \
-       klass::sm_constructorPropertiesCount##klass = 2;
+       wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
+       const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 } ; \
+       const int klass::sm_constructorPropertiesCount##klass = 2;

 
 // 3 params
 
 
 // 3 params
 


@@ -778,22 +829,22 @@ template<typename Class,
          typename T0, typename T1, typename T2>
 struct wxConstructorBridge_3 : public wxConstructorBridge
 {
          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(
                     args[0].Get<T0>() ,
                     args[1].Get<T1>() ,
     {
         Class *obj = dynamic_cast<Class*>(o);
         obj->Create(
                     args[0].Get<T0>() ,
                     args[1].Get<T1>() ,

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

                    );
     }
 };
 
 #define WX_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
        wxConstructorBridge_3<klass,t0,t1,t2> constructor##klass ; \
                    );
     }
 };
 
 #define WX_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
        wxConstructorBridge_3<klass,t0,t1,t2> constructor##klass ; \

-       klass::sm_constructor##klass = &constructor##klass ; \
-       klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 } ; \
-       klass::sm_constructorPropertiesCount##klass = 3 ;
+       wxConstructorBridge* klass::sm_constructor##klass = &constructor##klass ; \
+       const wxChar *klass::sm_constructorProperties##klass[] = { #v0 , #v1 , #v2 } ; \
+       const int klass::sm_constructorPropertiesCount##klass = 3 ;

 
 // 4 params
 
 
 // 4 params
 


@@ -801,23 +852,48 @@ 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(
                     args[0].Get<T0>() ,
                     args[1].Get<T1>() ,
                     args[2].Get<T2>() ,
     {
         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[3].Get<T3>()

                    );
     }
 };
 
 #define WX_CONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \
        wxConstructorBridge_4<klass,t0,t1,t2,t3> constructor##klass ; \
                    );
     }
 };
 
 #define WX_CONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \
        wxConstructorBridge_4<klass,t0,t1,t2,t3> constructor##klass ; \

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

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


@@ -831,22 +907,23 @@ class WXDLLIMPEXP_BASE wxClassInfo
 {
 public:
     wxClassInfo(const wxClassInfo **_Parents,
 {
 public:
     wxClassInfo(const wxClassInfo **_Parents,

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

             int size,
             wxObjectConstructorFn ctor ,
                        const wxPropertyInfo *_Props ,
             int size,
             wxObjectConstructorFn ctor ,
                        const wxPropertyInfo *_Props ,

+                       const wxHandlerInfo *_Handlers ,

                        wxConstructorBridge* _Constructor ,
                        wxConstructorBridge* _Constructor ,

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

                        const int _ConstructorPropertiesCount ,
                        wxVariantToObjectConverter _Converter1 ,
                        const int _ConstructorPropertiesCount ,
                        wxVariantToObjectConverter _Converter1 ,

-                       wxObjectToVariantConverter _Converter2 
+                       wxObjectToVariantConverter _Converter2

                        ) : m_parents(_Parents) , m_unitName(_UnitName) ,m_className(_ClassName),
                        ) : m_parents(_Parents) , m_unitName(_UnitName) ,m_className(_ClassName),

-                       m_objectSize(size), m_objectConstructor(ctor) , m_firstProperty(_Props ) , m_constructor( _Constructor ) ,
+                       m_objectSize(size), m_objectConstructor(ctor) , m_firstProperty(_Props ) , m_firstHandler(_Handlers ) , m_constructor( _Constructor ) ,

                        m_constructorProperties(_ConstructorProperties) , m_constructorPropertiesCount(_ConstructorPropertiesCount),
                        m_variantToObjectConverter( _Converter1 ) , m_objectToVariantConverter( _Converter2 ) , m_next(sm_first)
        {
                        m_constructorProperties(_ConstructorProperties) , m_constructorPropertiesCount(_ConstructorPropertiesCount),
                        m_variantToObjectConverter( _Converter1 ) , m_objectToVariantConverter( _Converter2 ) , m_next(sm_first)
        {

-               sm_first = this; 
+               sm_first = this;

                Register( m_className , this ) ;
        }
 
                Register( m_className , this ) ;
        }
 


@@ -893,15 +970,15 @@ public:
     static void     CleanUpClasses();
 
        // returns the first property
     static void     CleanUpClasses();
 
        // returns the first property

-       const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; } 
+       const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; }

 
 

-       // returns the first handler 
-       const wxHandlerInfo* GetFirstHandler() const { return m_firstHandler ; } 
+       // returns the first handler
+       const wxHandlerInfo* GetFirstHandler() const { return m_firstHandler ; }

 
     // Call the Create method for a class
 
     // Call the Create method for a class

-    virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params) 
+    virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params)

        {
        {

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

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


@@ -912,15 +989,18 @@ public:
        virtual const wxChar* GetCreateParamName(int i) const { return m_constructorProperties[i] ; }
 
    // Runtime access to objects by property name, and variant data
        virtual const wxChar* GetCreateParamName(int i) const { return m_constructorProperties[i] ; }
 
    // Runtime access to objects by property name, and variant data

-    virtual void SetProperty (wxObject *object, const char *PropertyName, const wxxVariant &Value);
-    virtual wxxVariant GetProperty (wxObject *object, const char *PropertyName);
+    virtual void SetProperty (wxObject *object, const wxChar *PropertyName, const wxxVariant &Value);
+    virtual wxxVariant GetProperty (wxObject *object, const wxChar *PropertyName);

 
        // we must be able to cast variants to wxObject pointers, templates seem not to be suitable
        wxObject* VariantToInstance( const wxxVariant &data ) const { return m_variantToObjectConverter( data ) ; }
        wxxVariant InstanceToVariant( wxObject *object ) const { return m_objectToVariantConverter( object ) ; }
 
        // we must be able to cast variants to wxObject pointers, templates seem not to be suitable
        wxObject* VariantToInstance( const wxxVariant &data ) const { return m_variantToObjectConverter( data ) ; }
        wxxVariant InstanceToVariant( wxObject *object ) const { return m_objectToVariantConverter( object ) ; }

-    
+

        // find property by name
        // find property by name

-    virtual const wxPropertyInfo *FindPropInfo (const char *PropertyName) const ;
+    virtual const wxPropertyInfo *FindPropertyInfo (const wxChar *PropertyName) const ;
+
+       // find handler by name
+    virtual const wxHandlerInfo *FindHandlerInfo (const wxChar *PropertyName) const ;

 
 public:
     const wxChar            *m_className;
 
 public:
     const wxChar            *m_className;


@@ -944,16 +1024,16 @@ private:
     const wxChar*                      m_unitName;
 
        wxConstructorBridge*    m_constructor ;
     const wxChar*                      m_unitName;
 
        wxConstructorBridge*    m_constructor ;

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

        const int                               m_constructorPropertiesCount ;
        const int                               m_constructorPropertiesCount ;

-       wxVariantToObjectConverter m_variantToObjectConverter ; 
+       wxVariantToObjectConverter m_variantToObjectConverter ;

        wxObjectToVariantConverter m_objectToVariantConverter ;
 
        wxObjectToVariantConverter m_objectToVariantConverter ;
 

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

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

-       
+

        static void Unregister(const wxChar *name);
 
        // InitializeClasses() helper
        static void Unregister(const wxChar *name);
 
        // InitializeClasses() helper


@@ -980,7 +1060,7 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 #define DECLARE_DYNAMIC_CLASS(name)           \
        _DECLARE_DYNAMIC_CLASS(name) \
        static wxConstructorBridge* sm_constructor##name ; \
 #define DECLARE_DYNAMIC_CLASS(name)           \
        _DECLARE_DYNAMIC_CLASS(name) \
        static wxConstructorBridge* sm_constructor##name ; \

-       static const char * sm_constructorProperties##name[] ; \
+       static const wxChar * sm_constructorProperties##name[] ; \

        static const int sm_constructorPropertiesCount##name ;
 
 #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \
        static const int sm_constructorPropertiesCount##name ;
 
 #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \


@@ -1009,31 +1089,32 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT(unit) , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) wxConstructorFor##name   ,   \
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT(unit) , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) wxConstructorFor##name   ,   \

-                       name::GetPropertiesStatic(),name::sm_constructor##name , name::sm_constructorProperties##name ,     \
+                       name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name ,     \

                        name::sm_constructorPropertiesCount##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \
                        name::sm_constructorPropertiesCount##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \

- template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\
- template<> void wxStringWriteValue(wxString & , name* const & ){assert(0) ;}\
+ template<> 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(&name::sm_class##name) ; return &s_typeInfo ; }
 
 #define IMPLEMENT_DYNAMIC_CLASS( name , basename ) \
 _IMPLEMENT_DYNAMIC_CLASS( name , basename , "" ) \
 const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
  template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
 
 #define IMPLEMENT_DYNAMIC_CLASS( name , basename ) \
 _IMPLEMENT_DYNAMIC_CLASS( name , basename , "" ) \
 const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \

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

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

-// this is for classes that do not derive from wxobject, there are no creators for these 
+// this is for classes that do not derive from wxobject, there are no creators for these

 
 #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name , unit ) \
  const wxClassInfo* name::sm_classParents##name[] = { NULL } ; \
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) 0   ,   \
 
 #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name , unit ) \
  const wxClassInfo* name::sm_classParents##name[] = { NULL } ; \
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) 0   ,   \

-                       name::GetPropertiesStatic(),0 , 0 ,     \
+                       name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \

                        0 , 0 , 0 );    \
                        0 , 0 , 0 );    \

- template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\
- template<> void wxStringWriteValue(wxString & , name* const & ){assert(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<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
 
 // this is for subclasses that still do not derive from wxobject
  template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
 
 // this is for subclasses that still do not derive from wxobject


@@ -1043,10 +1124,10 @@ _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit )
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) 0   ,   \
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) 0   ,   \

-                       name::GetPropertiesStatic(),0 , 0 ,     \
+                       name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \

                        0 , 0 , 0 );    \
                        0 , 0 , 0 );    \

- template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\
- template<> void wxStringWriteValue(wxString & , name* const & ){assert(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<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
 
     // Multiple inheritance with two base classes
  template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
 
     // Multiple inheritance with two base classes


@@ -1060,19 +1141,20 @@ _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit )
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT(unit) , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) wxConstructorFor##name   ,   \
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT(unit) , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) wxConstructorFor##name   ,   \

-                       name::GetPropertiesStatic(),name::sm_constructor##name , name::sm_constructorProperties##name ,     \
+                       name::GetPropertiesStatic(),name::GetHandlersStatic(),name::sm_constructor##name , name::sm_constructorProperties##name ,     \

                        name::sm_constructorPropertiesCount##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \
                        name::sm_constructorPropertiesCount##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \

- template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\
- template<> void wxStringWriteValue(wxString & , name* const & ){assert(0) ;}\
+ template<> 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(&name::sm_class##name) ; return &s_typeInfo ; }
 
 #define IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2) \
 _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "") \
 const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
  template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
 
 #define IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2) \
 _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "") \
 const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \

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

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

-       _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , unit) 
+       _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , unit)

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


@@ -1087,15 +1169,16 @@ WX_CONSTRUCTOR_DUMMY( name )
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) 0   ,   \
  wxClassInfo name::sm_class##name(sm_classParents##name , wxT("") , wxT(#name),   \
             (int) sizeof(name),                              \
             (wxObjectConstructorFn) 0   ,   \

-                       name::GetPropertiesStatic(),0 , 0 ,     \
+                       name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \

                        0 , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \
                        0 , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \

- template<> void wxStringReadValue(const wxString & , name * & ){assert(0) ;}\
- template<> void wxStringWriteValue(wxString & , name* const & ){assert(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<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
 
 #define IMPLEMENT_ABSTRACT_CLASS( name , basename ) \
 _IMPLEMENT_ABSTRACT_CLASS( name , basename ) \
  template<> const wxTypeInfo* wxGetTypeInfo( name ** ){ static wxClassTypeInfo s_typeInfo(&name::sm_class##name) ; return &s_typeInfo ; }
 
 #define IMPLEMENT_ABSTRACT_CLASS( name , basename ) \
 _IMPLEMENT_ABSTRACT_CLASS( name , basename ) \

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

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