unicode compilation fix

[wxWidgets.git] / src / common / xti.cpp

diff --git a/src/common/xti.cpp b/src/common/xti.cpp
index 74db154c9203b5fa6b52b2cb915f6e332c7980e9..38ed197501e6f0cf7461cebbce2a929658650086 100644 (file)
--- a/src/common/xti.cpp
+++ b/src/common/xti.cpp
@@ -2,7 +2,7 @@
 // Name:        src/common/xti.cpp
 // Purpose:     runtime metadata information (extended class info
 // Author:      Stefan Csomor
 // Name:        src/common/xti.cpp
 // 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


@@ -10,7 +10,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xti.h"
 #endif
 
 #pragma implementation "xti.h"
 #endif
 


@@ -33,13 +33,20 @@
 
 #if wxUSE_EXTENDED_RTTI
 
 
 #if wxUSE_EXTENDED_RTTI
 

+#include "wx/beforestd.h"
+#include <map>
+#include <string>
+#include "wx/afterstd.h"
+
+using namespace std ;
+

 // ----------------------------------------------------------------------------
 // Enum Support
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // Enum Support
 // ----------------------------------------------------------------------------
 

-wxEnumData::wxEnumData( wxEnumMemberData* data ) 
+wxEnumData::wxEnumData( wxEnumMemberData* data )

 {
 {

-       m_members = data ; 
+       m_members = data ;

     for ( m_count = 0; m_members[m_count].m_name ; m_count++)
                {} ;
 }
     for ( m_count = 0; m_members[m_count].m_name ; m_count++)
                {} ;
 }


@@ -69,7 +76,7 @@ int wxEnumData::GetEnumMemberValue(const wxChar *name)
                        return m_members[i].m_value;
                }
        }
                        return m_members[i].m_value;
                }
        }

-       return 0 ;
+    return 0 ;

 }
 
 const wxChar *wxEnumData::GetEnumMemberName(int value)
 }
 
 const wxChar *wxEnumData::GetEnumMemberName(int value)


@@ -82,13 +89,13 @@ const wxChar *wxEnumData::GetEnumMemberName(int value)
        return wxT("") ;
 }
 
        return wxT("") ;
 }
 

-int wxEnumData::GetEnumMemberValueByIndex( int idx ) 
+int wxEnumData::GetEnumMemberValueByIndex( int idx )

 {
        // we should cache the count in order to avoid out-of-bounds errors
        return m_members[idx].m_value ;
 }
 
 {
        // we should cache the count in order to avoid out-of-bounds errors
        return m_members[idx].m_value ;
 }
 

-const char * wxEnumData::GetEnumMemberNameByIndex( int idx ) 
+const char * wxEnumData::GetEnumMemberNameByIndex( int idx )

 {
        // we should cache the count in order to avoid out-of-bounds errors
        return m_members[idx].m_name ;
 {
        // we should cache the count in order to avoid out-of-bounds errors
        return m_members[idx].m_name ;


@@ -98,145 +105,217 @@ const char * wxEnumData::GetEnumMemberNameByIndex( int idx )
 // Type Information
 // ----------------------------------------------------------------------------
 
 // Type Information
 // ----------------------------------------------------------------------------
 

-const wxTypeInfo* wxGetTypeInfo( void * )
+template<> const wxTypeInfo* wxGetTypeInfo( void * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( bool * )
+template<> const wxTypeInfo* wxGetTypeInfo( bool * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_BOOL ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_BOOL ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( char * )
+template<> const wxTypeInfo* wxGetTypeInfo( char * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( unsigned char * )
+template<> const wxTypeInfo* wxGetTypeInfo( unsigned char * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( int * )
+template<> const wxTypeInfo* wxGetTypeInfo( int * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( unsigned int * )
+template<> const wxTypeInfo* wxGetTypeInfo( unsigned int * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( long * )
+template<> const wxTypeInfo* wxGetTypeInfo( long * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( unsigned long * )
+template<> const wxTypeInfo* wxGetTypeInfo( unsigned long * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( float * )
+template<> const wxTypeInfo* wxGetTypeInfo( float * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_FLOAT ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_FLOAT ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( double * )
+template<> const wxTypeInfo* wxGetTypeInfo( double * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_DOUBLE ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_DOUBLE ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( wxString * )
+template<> const wxTypeInfo* wxGetTypeInfo( wxString * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_STRING ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_STRING ) ;
        return &s_typeInfo ;
 }
 

-// this is a compiler induced specialization which is never used anywhere
-// const char * should never be active
+template<> const wxTypeInfo* wxGetTypeInfo( wxWindowList * )
+{
+    static wxCollectionTypeInfo s_typeInfo( (wxTypeInfo*) wxGetTypeInfo( (wxWindow **) NULL) ) ;
+    return &s_typeInfo ;
+}
+
+// this are compiler induced specialization which are never used anywhere
+
+WX_ILLEGAL_TYPE_SPECIALIZATION( char const * )
+WX_ILLEGAL_TYPE_SPECIALIZATION( char * )
+WX_ILLEGAL_TYPE_SPECIALIZATION( unsigned char * )
+WX_ILLEGAL_TYPE_SPECIALIZATION( int * )
+WX_ILLEGAL_TYPE_SPECIALIZATION( bool * )
+WX_ILLEGAL_TYPE_SPECIALIZATION( long * )
+WX_ILLEGAL_TYPE_SPECIALIZATION( wxString * )
+
+// ----------------------------------------------------------------------------
+// value streaming
+// ----------------------------------------------------------------------------
+
+// streamer specializations
+// for all built-in types

 
 

-const wxTypeInfo* wxGetTypeInfo( char const ** )
+// bool
+
+template<> void wxStringReadValue(const wxString &s , bool &data )

 {
 {

-       assert(0) ;
-       static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ;
-       return &s_typeInfo ;
+       int intdata ;
+       wxSscanf(s, _T("%d"), &intdata ) ;
+       data = bool(intdata) ;

 }
 
 }
 

-void wxStringReadValue(const wxString & , const char* & )
+template<> void wxStringWriteValue(wxString &s , const bool &data )

 {
 {

-       assert(0) ;
+       s = wxString::Format("%d", data ) ;

 }
 
 }
 

-void wxStringWriteValue(wxString & , char const * const & )
+// char
+
+template<> void wxStringReadValue(const wxString &s , char &data )

 {
 {

-       assert(0) ;
+       int intdata ;
+       wxSscanf(s, _T("%d"), &intdata ) ;
+       data = char(intdata) ;

 }
 
 }
 

+template<> void wxStringWriteValue(wxString &s , const char &data )
+{
+       s = wxString::Format("%d", data ) ;
+}

 
 

-// ----------------------------------------------------------------------------
-// value streaming 
-// ----------------------------------------------------------------------------
+// unsigned char

 
 

-// convenience function (avoids including xml headers in users code)
+template<> void wxStringReadValue(const wxString &s , unsigned char &data )
+{
+       int intdata ;
+       wxSscanf(s, _T("%d"), &intdata ) ;
+       data = (unsigned char)(intdata) ;
+}

 
 

-void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data ) 
+template<> void wxStringWriteValue(wxString &s , const unsigned char &data )

 {
 {

-       node->AddChild(new wxXmlNode(wxXML_TEXT_NODE, "value", data ) ); 
+       s = wxString::Format("%d", data ) ;

 }
 
 }
 

-wxString wxXmlGetContentFromNode( wxXmlNode *node ) 
+// int
+
+template<> void wxStringReadValue(const wxString &s , int &data )

 {
 {

-       return node->GetChildren()->GetContent() ;
+       wxSscanf(s, _T("%d"), &data ) ;

 }
 
 }
 

-// streamer specializations
+template<> void wxStringWriteValue(wxString &s , const int &data )
+{
+       s = wxString::Format("%d", data ) ;
+}
+
+// unsigned int

 
 

-// TODO for all built-in types
+template<> void wxStringReadValue(const wxString &s , unsigned int &data )
+{
+       wxSscanf(s, _T("%d"), &data ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const unsigned int &data )
+{
+       s = wxString::Format("%d", data ) ;
+}

 
 // long
 
 
 // long
 

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

 {
        wxSscanf(s, _T("%ld"), &data ) ;
 }
 
 {
        wxSscanf(s, _T("%ld"), &data ) ;
 }
 

-void wxStringWriteValue(wxString &s , const long &data )
+template<> void wxStringWriteValue(wxString &s , const long &data )

 {
        s = wxString::Format("%ld", data ) ;
 }
 
 {
        s = wxString::Format("%ld", data ) ;
 }
 

-// long
+// unsigned long

 
 

-void wxStringReadValue(const wxString &s , int &data )
+template<> void wxStringReadValue(const wxString &s , unsigned long &data )

 {
 {

-       wxSscanf(s, _T("%d"), &data ) ;
+       wxSscanf(s, _T("%ld"), &data ) ;

 }
 
 }
 

-void wxStringWriteValue(wxString &s , const int &data )
+template<> void wxStringWriteValue(wxString &s , const unsigned long &data )

 {
 {

-       s = wxString::Format("%d", data ) ;
+       s = wxString::Format("%ld", data ) ;
+}
+
+// float
+
+template<> void wxStringReadValue(const wxString &s , float &data )
+{
+       wxSscanf(s, _T("%f"), &data ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const float &data )
+{
+       s = wxString::Format("%f", data ) ;
+}
+
+// double
+
+template<> void wxStringReadValue(const wxString &s , double &data )
+{
+       wxSscanf(s, _T("%lf"), &data ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const double &data )
+{
+       s = wxString::Format("%lf", data ) ;

 }
 
 // wxString
 
 }
 
 // wxString
 

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

 {
        data = s ;
 }
 
 {
        data = s ;
 }
 

-void wxStringWriteValue(wxString &s , const wxString &data )
+template<> void wxStringWriteValue(wxString &s , const wxString &data )

 {
        s = data ;
 }
 {
        s = data ;
 }


@@ -249,21 +328,84 @@ void wxStringWriteValue(wxString &s , const wxString &data )
 
 // wxPoint
 
 
 // wxPoint
 

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

 {
        wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ;
 }
 
 {
        wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ;
 }
 

-void wxStringWriteValue(wxString &s , const wxPoint &data )
+template<> void wxStringWriteValue(wxString &s , const wxPoint &data )

 {
        s = wxString::Format("%d,%d", data.x , data.y ) ;
 }
 
 {
        s = wxString::Format("%d,%d", data.x , data.y ) ;
 }
 

+template<> void wxStringReadValue(const wxString & , wxPoint* & )
+{
+    assert(0) ;
+}
+
+template<> void wxStringWriteValue(wxString & , wxPoint* const & )
+{
+    assert(0) ;
+}
+

 WX_CUSTOM_TYPE_INFO(wxPoint)
 
 WX_CUSTOM_TYPE_INFO(wxPoint)
 

+template<> void wxStringReadValue(const wxString &s , wxSize &data )
+{
+       wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxSize &data )
+{
+       s = wxString::Format("%d,%d", data.x , data.y ) ;
+}
+
+template<> void wxStringReadValue(const wxString & , wxSize* & )
+{
+    assert(0) ;
+}
+
+template<> void wxStringWriteValue(wxString & , wxSize * const & )
+{
+    assert(0) ;
+}
+
+WX_CUSTOM_TYPE_INFO(wxSize)
+
+/*
+
+template<> void wxStringReadValue(const wxString &s , wxColour &data )
+{
+       // copied from VS xrc
+       unsigned long tmp = 0;
+
+    if (s.Length() != 7 || s[0u] != wxT('#') ||
+        wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
+    {
+               wxLogError(_("String To Colour : Incorrect colour specification : %s"),
+                   s.c_str() );
+        data = wxNullColour;
+    }
+       else
+       {
+               data = wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
+                    (unsigned char) ((tmp & 0x00FF00) >> 8),
+                    (unsigned char) ((tmp & 0x0000FF)));
+       }
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxColour &data )
+{
+       s = wxString::Format("#%2X%2X%2X", data.Red() , data.Green() , data.Blue() ) ;
+}
+
+WX_CUSTOM_TYPE_INFO(wxColour)
+
+*/
+

 // removing header dependancy on string tokenizer
 
 // removing header dependancy on string tokenizer
 

-void wxSetStringToArray( const wxString &s , wxArrayString &array ) 
+void wxSetStringToArray( const wxString &s , wxArrayString &array )

 {
     wxStringTokenizer tokenizer(s, wxT("| \t\n"), wxTOKEN_STRTOK);
     wxString flag;
 {
     wxStringTokenizer tokenizer(s, wxT("| \t\n"), wxTOKEN_STRTOK);
     wxString flag;


@@ -275,40 +417,52 @@ void wxSetStringToArray( const wxString &s , wxArrayString &array )
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxClassInfo 
+// wxClassInfo

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-
-void wxClassInfo::Register(const char *WXUNUSED(name), wxClassInfo *WXUNUSED(info))
+const wxPropertyAccessor *wxClassInfo::FindAccessor(const char *PropertyName) const

 {
 {

-       /*
-    if (!ExtendedTypeMap)
-       ExtendedTypeMap = new ClassMap;
-    (*ExtendedTypeMap)[string(Name)] = Info;
-       */
+    const wxPropertyInfo* info = FindPropertyInfo( PropertyName ) ;
+
+       if ( info )
+               return info->GetAccessor() ;
+
+       return NULL ;

 }
 
 }
 

-void wxClassInfo::Unregister(const char *WXUNUSED(name))
+const wxPropertyInfo *wxClassInfo::FindPropertyInfoInThisClass (const char *PropertyName) const

 {
 {

-       /*
-    assert(ExtendedTypeMap);
-    ExtendedTypeMap->erase(Name);
-       */
+       const wxPropertyInfo* info = GetFirstProperty() ;
+
+       while( info )
+       {
+               if ( strcmp( info->GetName() , PropertyName ) == 0 )
+                       return info ;
+               info = info->GetNext() ;
+       }
+
+    return 0;

 }
 
 }
 

-const wxPropertyAccessor *wxClassInfo::FindAccessor(const char *PropertyName)
+const wxPropertyInfo *wxClassInfo::FindPropertyInfo (const char *PropertyName) const

 {
 {

-    const wxPropertyInfo* info = FindPropInfo( PropertyName ) ;
-       
-       if ( info )
-               return info->GetAccessor() ;
+       const wxPropertyInfo* info = FindPropertyInfoInThisClass( PropertyName ) ;
+    if ( info )
+        return info ;

 
 

-       return NULL ;
+       const wxClassInfo** parents = GetParents() ;
+       for ( int i = 0 ; parents[i] ; ++ i )
+       {
+               if ( ( info = parents[i]->FindPropertyInfo( PropertyName ) ) != NULL )
+                       return info ;
+       }
+
+    return 0;

 }
 
 }
 

-const wxPropertyInfo *wxClassInfo::FindPropInfo (const char *PropertyName) const
+const wxHandlerInfo *wxClassInfo::FindHandlerInfoInThisClass (const char *PropertyName) const

 {
 {

-       const wxPropertyInfo* info = GetFirstProperty() ;
+       const wxHandlerInfo* info = GetFirstHandler() ;

 
        while( info )
        {
 
        while( info )
        {


@@ -317,17 +471,28 @@ const wxPropertyInfo *wxClassInfo::FindPropInfo (const char *PropertyName) const
                info = info->GetNext() ;
        }
 
                info = info->GetNext() ;
        }
 

+    return 0;
+}
+
+const wxHandlerInfo *wxClassInfo::FindHandlerInfo (const char *PropertyName) const
+{
+       const wxHandlerInfo* info = FindHandlerInfoInThisClass( PropertyName ) ;
+
+    if ( info )
+        return info ;
+

        const wxClassInfo** parents = GetParents() ;
        for ( int i = 0 ; parents[i] ; ++ i )
        {
        const wxClassInfo** parents = GetParents() ;
        for ( int i = 0 ; parents[i] ; ++ i )
        {

-               if ( ( info = parents[i]->FindPropInfo( PropertyName ) ) != NULL )
+               if ( ( info = parents[i]->FindHandlerInfo( PropertyName ) ) != NULL )

                        return info ;
        }
 
     return 0;
 }
 
                        return info ;
        }
 
     return 0;
 }
 

-void wxClassInfo::SetProperty(wxObject *object, const char *propertyName, const wxxVariant &value)
+
+void wxClassInfo::SetProperty(wxObject *object, const char *propertyName, const wxxVariant &value) const

 {
     const wxPropertyAccessor *accessor;
 
 {
     const wxPropertyAccessor *accessor;
 


@@ -336,7 +501,7 @@ void wxClassInfo::SetProperty(wxObject *object, const char *propertyName, const
        accessor->SetProperty( object , value ) ;
 }
 
        accessor->SetProperty( object , value ) ;
 }
 

-wxxVariant wxClassInfo::GetProperty(wxObject *object, const char *propertyName)
+wxxVariant wxClassInfo::GetProperty(wxObject *object, const char *propertyName) const

 {
     const wxPropertyAccessor *accessor;
 
 {
     const wxPropertyAccessor *accessor;
 


@@ -345,11 +510,29 @@ wxxVariant wxClassInfo::GetProperty(wxObject *object, const char *propertyName)
     return accessor->GetProperty(object);
 }
 
     return accessor->GetProperty(object);
 }
 

+wxxVariantArray wxClassInfo::GetPropertyCollection(wxObject *object, const wxChar *propertyName) const 
+{
+    const wxPropertyAccessor *accessor;
+
+    accessor = FindAccessor(propertyName);
+    wxASSERT(accessor->HasGetter());
+    return accessor->GetPropertyCollection(object);
+}
+
+void wxClassInfo::AddToPropertyCollection(wxObject *object, const wxChar *propertyName , const wxxVariant& value) const 
+{
+    const wxPropertyAccessor *accessor;
+
+    accessor = FindAccessor(propertyName);
+    wxASSERT(accessor->HasAdder());
+    accessor->AddToPropertyCollection( object , value ) ;
+}
+

 /*
 VARIANT TO OBJECT
 */
 
 /*
 VARIANT TO OBJECT
 */
 

-wxObject* wxxVariant::GetAsObject() const
+wxObject* wxxVariant::GetAsObject()

 {
        const wxClassTypeInfo *ti = dynamic_cast<const wxClassTypeInfo*>( m_data->GetTypeInfo() ) ;
        if ( ti )
 {
        const wxClassTypeInfo *ti = dynamic_cast<const wxClassTypeInfo*>( m_data->GetTypeInfo() ) ;
        if ( ti )


@@ -358,5 +541,160 @@ wxObject* wxxVariant::GetAsObject() const
                return NULL ;
 }
 
                return NULL ;
 }
 

+// ----------------------------------------------------------------------------
+// wxDynamicObject support
+// ----------------------------------------------------------------------------
+//
+// Dynamic Objects are objects that have a real superclass instance and carry their
+// own attributes in a hash map. Like this it is possible to create the objects and
+// stream them, as if their class information was already available from compiled data
+
+struct wxDynamicObject::wxDynamicObjectInternal
+{
+    map<string,wxxVariant> m_properties ;
+} ;
+
+// instantiates this object with an instance of its superclass
+wxDynamicObject::wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info) 
+{
+    m_superClassInstance = superClassInstance ;
+    m_classInfo = info ;
+    m_data = new wxDynamicObjectInternal ;
+}
+
+wxDynamicObject::~wxDynamicObject()
+{
+    delete m_data ;
+    delete m_superClassInstance ;
+}
+
+void wxDynamicObject::SetProperty (const wxChar *propertyName, const wxxVariant &value)
+{
+    wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName),wxT("Accessing Unknown Property in a Dynamic Object") ) ;
+    m_data->m_properties[propertyName] = value ;
+}
+
+wxxVariant wxDynamicObject::GetProperty (const wxChar *propertyName) const
+{
+   wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName),wxT("Accessing Unknown Property in a Dynamic Object") ) ;
+   return m_data->m_properties[propertyName] ;
+}
+
+// ----------------------------------------------------------------------------
+// wxDynamiClassInfo
+// ----------------------------------------------------------------------------
+
+wxDynamicClassInfo::wxDynamicClassInfo( const wxChar *unitName, const wxChar *className , const wxClassInfo* superClass ) :
+    wxClassInfo( unitName, className , new const wxClassInfo*[2]) 
+{
+    GetParents()[0] = superClass ;
+    GetParents()[1] = NULL ;
+}
+
+wxDynamicClassInfo::~wxDynamicClassInfo()
+{
+    delete[] GetParents() ;
+}
+
+wxObject *wxDynamicClassInfo::AllocateObject() const 
+{
+    wxObject* parent = GetParents()[0]->AllocateObject() ;
+    return new wxDynamicObject( parent , this ) ;
+}
+
+void wxDynamicClassInfo::Create (wxObject *object, int paramCount, wxxVariant *params) const 
+{
+    wxDynamicObject *dynobj = dynamic_cast< wxDynamicObject *>( object ) ;
+    wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::Create on an object other than wxDynamicObject") ) ;
+    GetParents()[0]->Create( dynobj->GetSuperClassInstance() , paramCount , params ) ;
+}
+
+// get number of parameters for constructor
+int wxDynamicClassInfo::GetCreateParamCount() const 
+{
+    return GetParents()[0]->GetCreateParamCount() ;
+}
+
+// get i-th constructor parameter
+const wxChar* wxDynamicClassInfo::GetCreateParamName(int i) const 
+{
+    return GetParents()[0]->GetCreateParamName( i ) ;
+}
+
+void wxDynamicClassInfo::SetProperty(wxObject *object, const char *propertyName, const wxxVariant &value) const
+{
+    wxDynamicObject* dynobj = dynamic_cast< wxDynamicObject * >( object ) ;
+    wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
+    if ( FindPropertyInfoInThisClass(propertyName) )
+        dynobj->SetProperty( propertyName , value ) ;
+    else
+        GetParents()[0]->SetProperty( dynobj->GetSuperClassInstance() , propertyName , value ) ;
+}
+
+wxxVariant wxDynamicClassInfo::GetProperty(wxObject *object, const char *propertyName) const
+{
+    wxDynamicObject* dynobj = dynamic_cast< wxDynamicObject * >( object ) ;
+    wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
+    if ( FindPropertyInfoInThisClass(propertyName) )
+        return dynobj->GetProperty( propertyName ) ;
+    else
+        return GetParents()[0]->GetProperty( dynobj->GetSuperClassInstance() , propertyName ) ;
+}
+
+void wxDynamicClassInfo::AddProperty( const wxChar *propertyName , const wxTypeInfo* typeInfo ) 
+{
+    new wxPropertyInfo( m_firstProperty , propertyName , typeInfo , new wxGenericPropertyAccessor( propertyName ) , wxxVariant() ) ;
+}
+
+void wxDynamicClassInfo::AddHandler( const wxChar *handlerName , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) 
+{
+    new wxHandlerInfo( m_firstHandler , handlerName , address , eventClassInfo ) ;
+}
+
+// ----------------------------------------------------------------------------
+// wxGenericPropertyAccessor
+// ----------------------------------------------------------------------------
+
+struct wxGenericPropertyAccessor::wxGenericPropertyAccessorInternal
+{
+    wxString m_propertyName ;
+} ;
+
+wxGenericPropertyAccessor::wxGenericPropertyAccessor( const wxChar* propertyName ) 
+{
+    m_data = new wxGenericPropertyAccessorInternal ;
+    m_data->m_propertyName = propertyName ;
+}
+
+wxGenericPropertyAccessor::~wxGenericPropertyAccessor()
+{
+    delete m_data ;
+}
+void wxGenericPropertyAccessor::SetProperty(wxObject *object, const wxxVariant &value) const 
+{
+    wxDynamicObject* dynobj = dynamic_cast< wxDynamicObject * >( object ) ;
+    wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
+    dynobj->SetProperty(m_data->m_propertyName , value ) ;
+}
+
+wxxVariant wxGenericPropertyAccessor::GetProperty(const wxObject *object) const 
+{
+    const wxDynamicObject* dynobj = dynamic_cast< const wxDynamicObject * >( object ) ;
+    wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
+    return dynobj->GetProperty( m_data->m_propertyName ) ;
+}
+
+wxxVariant wxGenericPropertyAccessor::ReadValue( const wxString &value ) const 
+{
+    return wxxVariant(value) ;
+}
+
+void wxGenericPropertyAccessor::WriteValue( wxString& value , const wxObject *object ) const 
+{
+    const wxDynamicObject* dynobj = dynamic_cast< const wxDynamicObject * >( object ) ;
+    wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
+    wxxVariant val = dynobj->GetProperty( m_data->m_propertyName ) ;
+    value = val.GetAsString() ;
+}

 
 #endif
 
 #endif