no need to check for wxID_HELP buttons in SetLabel() now that it's overridden in...

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

diff --git a/src/common/xti.cpp b/src/common/xti.cpp
index b6596338db973e9d03169e32c93248070ceca800..04e166170d9afd69820157e0e885f74b974ae8ff 100644 (file)
--- a/src/common/xti.cpp
+++ b/src/common/xti.cpp
@@ -10,33 +10,30 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xti.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_EXTENDED_RTTI
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/hash.h"
-#include "wx/object.h"
+    #include "wx/object.h"
+    #include "wx/list.h"
+    #include "wx/hash.h"

 #endif
 
 #endif
 

-#if wxUSE_EXTENDED_RTTI
-

 #include "wx/xti.h"
 #include "wx/xml/xml.h"
 #include "wx/tokenzr.h"
 #include "wx/xti.h"
 #include "wx/xml/xml.h"
 #include "wx/tokenzr.h"

-#include "wx/list.h"

 #include <string.h>
 
 #include "wx/beforestd.h"
 #include <map>
 #include <string>
 #include <string.h>
 
 #include "wx/beforestd.h"
 #include <map>
 #include <string>

+#include <list>

 #include "wx/afterstd.h"
 
 using namespace std ;
 #include "wx/afterstd.h"
 
 using namespace std ;


@@ -52,12 +49,12 @@ wxEnumData::wxEnumData( wxEnumMemberData* data )
     {} ;
 }
 
     {} ;
 }
 

-bool wxEnumData::HasEnumMemberValue(const wxChar *name, int *value)
+bool wxEnumData::HasEnumMemberValue(const wxChar *name, int *value) const

 {
     int i;
     for (i = 0; m_members[i].m_name ; i++ )
     {
 {
     int i;
     for (i = 0; m_members[i].m_name ; i++ )
     {

-        if (!strcmp(name, m_members[i].m_name))
+        if (!wxStrcmp(name, m_members[i].m_name))

         {
             if ( value )
                 *value = m_members[i].m_value;
         {
             if ( value )
                 *value = m_members[i].m_value;


@@ -67,12 +64,12 @@ bool wxEnumData::HasEnumMemberValue(const wxChar *name, int *value)
     return false ;
 }
 
     return false ;
 }
 

-int wxEnumData::GetEnumMemberValue(const wxChar *name)
+int wxEnumData::GetEnumMemberValue(const wxChar *name) const

 {
     int i;
     for (i = 0; m_members[i].m_name ; i++ )
     {
 {
     int i;
     for (i = 0; m_members[i].m_name ; i++ )
     {

-        if (!strcmp(name, m_members[i].m_name))
+        if (!wxStrcmp(name, m_members[i].m_name))

         {
             return m_members[i].m_value;
         }
         {
             return m_members[i].m_value;
         }


@@ -80,23 +77,23 @@ int wxEnumData::GetEnumMemberValue(const wxChar *name)
     return 0 ;
 }
 
     return 0 ;
 }
 

-const wxChar *wxEnumData::GetEnumMemberName(int value)
+const wxChar *wxEnumData::GetEnumMemberName(int value) const

 {
     int i;
     for (i = 0; m_members[i].m_name ; i++)
         if (value == m_members[i].m_value)
             return m_members[i].m_name;
 
 {
     int i;
     for (i = 0; m_members[i].m_name ; i++)
         if (value == m_members[i].m_value)
             return m_members[i].m_name;
 

-    return wxT("") ;
+    return wxEmptyString ;

 }
 
 }
 

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

 {
     // 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 wxChar * wxEnumData::GetEnumMemberNameByIndex( int idx ) const

 {
     // 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 ;


@@ -118,12 +115,12 @@ template<> void wxStringReadValue(const wxString &s , bool &data )
 {
     int intdata ;
     wxSscanf(s, _T("%d"), &intdata ) ;
 {
     int intdata ;
     wxSscanf(s, _T("%d"), &intdata ) ;

-    data = bool(intdata) ;
+    data = (bool)intdata ;

 }
 
 template<> void wxStringWriteValue(wxString &s , const bool &data )
 {
 }
 
 template<> void wxStringWriteValue(wxString &s , const bool &data )
 {

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

 }
 
 // char
 }
 
 // char


@@ -137,7 +134,7 @@ template<> void wxStringReadValue(const wxString &s , char &data )
 
 template<> void wxStringWriteValue(wxString &s , const char &data )
 {
 
 template<> void wxStringWriteValue(wxString &s , const char &data )
 {

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

 }
 
 // unsigned char
 }
 
 // unsigned char


@@ -151,7 +148,7 @@ template<> void wxStringReadValue(const wxString &s , unsigned char &data )
 
 template<> void wxStringWriteValue(wxString &s , const unsigned char &data )
 {
 
 template<> void wxStringWriteValue(wxString &s , const unsigned char &data )
 {

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

 }
 
 // int
 }
 
 // int


@@ -163,7 +160,7 @@ template<> void wxStringReadValue(const wxString &s , int &data )
 
 template<> void wxStringWriteValue(wxString &s , const int &data )
 {
 
 template<> void wxStringWriteValue(wxString &s , const int &data )
 {

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

 }
 
 // unsigned int
 }
 
 // unsigned int


@@ -175,7 +172,7 @@ template<> void wxStringReadValue(const wxString &s , unsigned int &data )
 
 template<> void wxStringWriteValue(wxString &s , const unsigned int &data )
 {
 
 template<> void wxStringWriteValue(wxString &s , const unsigned int &data )
 {

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

 }
 
 // long
 }
 
 // long


@@ -187,7 +184,7 @@ template<> void wxStringReadValue(const wxString &s , long &data )
 
 template<> void wxStringWriteValue(wxString &s , const long &data )
 {
 
 template<> void wxStringWriteValue(wxString &s , const long &data )
 {

-    s = wxString::Format("%ld", data ) ;
+    s = wxString::Format(_T("%ld"), data ) ;

 }
 
 // unsigned long
 }
 
 // unsigned long


@@ -199,7 +196,7 @@ template<> void wxStringReadValue(const wxString &s , unsigned long &data )
 
 template<> void wxStringWriteValue(wxString &s , const unsigned long &data )
 {
 
 template<> void wxStringWriteValue(wxString &s , const unsigned long &data )
 {

-    s = wxString::Format("%ld", data ) ;
+    s = wxString::Format(_T("%ld"), data ) ;

 }
 
 // float
 }
 
 // float


@@ -211,7 +208,7 @@ template<> void wxStringReadValue(const wxString &s , float &data )
 
 template<> void wxStringWriteValue(wxString &s , const float &data )
 {
 
 template<> void wxStringWriteValue(wxString &s , const float &data )
 {

-    s = wxString::Format("%f", data ) ;
+    s = wxString::Format(_T("%f"), data ) ;

 }
 
 // double
 }
 
 // double


@@ -223,7 +220,7 @@ template<> void wxStringReadValue(const wxString &s , double &data )
 
 template<> void wxStringWriteValue(wxString &s , const double &data )
 {
 
 template<> void wxStringWriteValue(wxString &s , const double &data )
 {

-    s = wxString::Format("%lf", data ) ;
+    s = wxString::Format(_T("%lf"), data ) ;

 }
 
 // wxString
 }
 
 // wxString


@@ -241,117 +238,90 @@ template<> void wxStringWriteValue(wxString &s , const wxString &data )
 // built-ins
 //
 
 // built-ins
 //
 

-template<> const wxTypeInfo* wxGetTypeInfo( void * )
-{
-    static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ;
-    return &s_typeInfo ;
-}
-
-template<> const wxTypeInfo* wxGetTypeInfo( bool * )
-{
-    static wxBuiltInTypeInfo s_typeInfo( wxT_BOOL , &wxToStringConverter<bool> , &wxFromStringConverter<bool>) ;
-    return &s_typeInfo ;
-}
-
-template<> const wxTypeInfo* wxGetTypeInfo( char * )
-{
-    static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR , &wxToStringConverter<char> , &wxFromStringConverter<char>) ;
-    return &s_typeInfo ;
-}
-
-template<> const wxTypeInfo* wxGetTypeInfo( unsigned char * )
-{
-    static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR , &wxToStringConverter< unsigned char > , &wxFromStringConverter<unsigned char>) ;
-    return &s_typeInfo ;
-}
-
-template<> const wxTypeInfo* wxGetTypeInfo( int * )
-{
-    static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR , &wxToStringConverter<int> , &wxFromStringConverter<int>) ;
-    return &s_typeInfo ;
-}
-
-template<> const wxTypeInfo* wxGetTypeInfo( unsigned int * )
-{
-    static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR , &wxToStringConverter<unsigned int> , &wxFromStringConverter<unsigned int>) ;
-    return &s_typeInfo ;
-}
+#if wxUSE_FUNC_TEMPLATE_POINTER
+#define wxBUILTIN_TYPE_INFO( element , type ) \
+    wxBuiltInTypeInfo s_typeInfo##type(element , &wxToStringConverter<type> , &wxFromStringConverter<type> , typeid(type).name()) ;
+#else
+#define wxBUILTIN_TYPE_INFO( element , type ) \
+    void _toString##element( const wxxVariant& data , wxString &result ) { wxToStringConverter<type>(data, result); } \
+    void _fromString##element( const wxString& data , wxxVariant &result ) { wxFromStringConverter<type>(data, result); } \
+    wxBuiltInTypeInfo s_typeInfo##type(element , &_toString##element , &_fromString##element , typeid(type).name()) ;
+#endif

 
 

-template<> const wxTypeInfo* wxGetTypeInfo( long * )
-{
-    static wxBuiltInTypeInfo s_typeInfo( wxT_LONG , &wxToStringConverter<long> , &wxFromStringConverter<long>) ;
-    return &s_typeInfo ;
-}
+typedef unsigned char unsigned_char;
+typedef unsigned int unsigned_int;
+typedef unsigned long unsigned_long;

 
 

-template<> const wxTypeInfo* wxGetTypeInfo( unsigned long * )
-{
-    static wxBuiltInTypeInfo s_typeInfo( wxT_ULONG , &wxToStringConverter<unsigned long> , &wxFromStringConverter<unsigned long>) ;
-    return &s_typeInfo ;
-}
+wxBuiltInTypeInfo s_typeInfovoid( wxT_VOID , NULL , NULL , typeid(void).name());
+wxBUILTIN_TYPE_INFO( wxT_BOOL ,  bool);
+wxBUILTIN_TYPE_INFO( wxT_CHAR ,  char);
+wxBUILTIN_TYPE_INFO( wxT_UCHAR , unsigned_char);
+wxBUILTIN_TYPE_INFO( wxT_INT , int);
+wxBUILTIN_TYPE_INFO( wxT_UINT , unsigned_int);
+wxBUILTIN_TYPE_INFO( wxT_LONG , long);
+wxBUILTIN_TYPE_INFO( wxT_ULONG , unsigned_long);
+wxBUILTIN_TYPE_INFO( wxT_FLOAT , float);
+wxBUILTIN_TYPE_INFO( wxT_DOUBLE , double);
+wxBUILTIN_TYPE_INFO( wxT_STRING , wxString);

 
 

-template<> const wxTypeInfo* wxGetTypeInfo( float * )
-{
-    static wxBuiltInTypeInfo s_typeInfo( wxT_FLOAT , &wxToStringConverter<float> , &wxFromStringConverter<float>) ;
-    return &s_typeInfo ;
-}
-
-template<> const wxTypeInfo* wxGetTypeInfo( double * )
-{
-    static wxBuiltInTypeInfo s_typeInfo( wxT_DOUBLE , &wxToStringConverter<double> , &wxFromStringConverter<double>) ;
-    return &s_typeInfo ;
-}
-
-template<> const wxTypeInfo* wxGetTypeInfo( wxString * )
-{
-    static wxBuiltInTypeInfo s_typeInfo( wxT_STRING , &wxToStringConverter<wxString> , &wxFromStringConverter<wxString>) ;
-    return &s_typeInfo ;
-}

 
 // this are compiler induced specialization which are never used anywhere
 
 
 // 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 * )
+wxILLEGAL_TYPE_SPECIALIZATION( char const * )
+wxILLEGAL_TYPE_SPECIALIZATION( char * )
+wxILLEGAL_TYPE_SPECIALIZATION( unsigned char * )
+wxILLEGAL_TYPE_SPECIALIZATION( int * )
+wxILLEGAL_TYPE_SPECIALIZATION( bool * )
+wxILLEGAL_TYPE_SPECIALIZATION( long * )
+wxILLEGAL_TYPE_SPECIALIZATION( wxString * )

 
 

-WX_COLLECTION_TYPE_INFO( wxString , wxArrayString ) ;
+wxCOLLECTION_TYPE_INFO( wxString , wxArrayString ) ;

 
 template<> void wxCollectionToVariantArray( wxArrayString const &theArray, wxxVariantArray &value)
 {
     wxArrayCollectionToVariantArray( theArray , value ) ;
 }
 
 
 template<> void wxCollectionToVariantArray( wxArrayString const &theArray, wxxVariantArray &value)
 {
     wxArrayCollectionToVariantArray( theArray , value ) ;
 }
 

-wxTypeInfoMap *wxTypeInfo::sm_typeTable = NULL ;
+wxTypeInfoMap *wxTypeInfo::ms_typeTable = NULL ;

 
 wxTypeInfo *wxTypeInfo::FindType(const wxChar *typeName)
 {
 
 wxTypeInfo *wxTypeInfo::FindType(const wxChar *typeName)
 {

-    return (wxTypeInfo *)sm_typeTable->find(typeName)->second;
+    wxTypeInfoMap::iterator iter = ms_typeTable->find(typeName) ;
+    wxASSERT_MSG( iter != ms_typeTable->end() , wxT("lookup for a non-existent type-info") ) ;
+    return (wxTypeInfo *)iter->second;

 }
 
 }
 

-wxClassTypeInfo::wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to , converterFromString_t from ) :
-wxTypeInfo( kind , to , from , classInfo->GetClassName() )
+#if wxUSE_UNICODE
+wxClassTypeInfo::wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to , converterFromString_t from , const char *name) :
+wxTypeInfo( kind , to , from , name)
+{ wxASSERT_MSG( kind == wxT_OBJECT_PTR || kind == wxT_OBJECT , wxT("Illegal Kind for Enum Type")) ; m_classInfo = classInfo ;}
+#endif
+
+wxClassTypeInfo::wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to , converterFromString_t from , const wxString &name) :
+wxTypeInfo( kind , to , from , name)

 { wxASSERT_MSG( kind == wxT_OBJECT_PTR || kind == wxT_OBJECT , wxT("Illegal Kind for Enum Type")) ; m_classInfo = classInfo ;}
 
 wxDelegateTypeInfo::wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass , converterToString_t to , converterFromString_t from ) :
 wxTypeInfo ( wxT_DELEGATE , to , from , wxEmptyString )
 { wxASSERT_MSG( kind == wxT_OBJECT_PTR || kind == wxT_OBJECT , wxT("Illegal Kind for Enum Type")) ; m_classInfo = classInfo ;}
 
 wxDelegateTypeInfo::wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass , converterToString_t to , converterFromString_t from ) :
 wxTypeInfo ( wxT_DELEGATE , to , from , wxEmptyString )

-{ m_eventClass = eventClass ; m_eventType = eventType ;}
+{ m_eventClass = eventClass ; m_eventType = eventType ; m_lastEventType = -1 ;}
+
+wxDelegateTypeInfo::wxDelegateTypeInfo( int eventType , int lastEventType , wxClassInfo* eventClass , converterToString_t to , converterFromString_t from ) :
+wxTypeInfo ( wxT_DELEGATE , to , from , wxEmptyString )
+{ m_eventClass = eventClass ; m_eventType = eventType ; m_lastEventType = lastEventType; }

 
 void wxTypeInfo::Register()
 
 void wxTypeInfo::Register()

-{    
-    if ( sm_typeTable == NULL )
-        sm_typeTable = new wxTypeInfoMap() ;
+{
+    if ( ms_typeTable == NULL )
+        ms_typeTable = new wxTypeInfoMap() ;

 
 

-    if( !m_name.IsEmpty() )
-        (*sm_typeTable)[m_name] = this ;
+    if( !m_name.empty() )
+        (*ms_typeTable)[m_name] = this ;

 }
 
 void wxTypeInfo::Unregister()
 {
 }
 
 void wxTypeInfo::Unregister()
 {

-    if( !m_name.IsEmpty() )
-        sm_typeTable->erase(m_name);
+    if( !m_name.empty() )
+        ms_typeTable->erase(m_name);

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


@@ -371,7 +341,51 @@ void wxSetStringToArray( const wxString &s , wxArrayString &array )
 // wxClassInfo
 // ----------------------------------------------------------------------------
 
 // wxClassInfo
 // ----------------------------------------------------------------------------
 

-const wxPropertyAccessor *wxClassInfo::FindAccessor(const char *PropertyName) const
+wxPropertyInfo::~wxPropertyInfo()
+{
+    if ( this == m_itsClass->m_firstProperty )
+    {
+        m_itsClass->m_firstProperty = m_next;
+    }
+    else
+    {
+        wxPropertyInfo *info = m_itsClass->m_firstProperty;
+        while (info)
+        {
+            if ( info->m_next == this )
+            {
+                info->m_next = m_next;
+                break;
+            }
+
+            info = info->m_next;
+        }
+    }
+}
+
+wxHandlerInfo::~wxHandlerInfo()
+{
+    if ( this == m_itsClass->m_firstHandler )
+    {
+        m_itsClass->m_firstHandler = m_next;
+    }
+    else
+    {
+        wxHandlerInfo *info = m_itsClass->m_firstHandler;
+        while (info)
+        {
+            if ( info->m_next == this )
+            {
+                info->m_next = m_next;
+                break;
+            }
+
+            info = info->m_next;
+        }
+    }
+}
+
+const wxPropertyAccessor *wxClassInfo::FindAccessor(const wxChar *PropertyName) const

 {
     const wxPropertyInfo* info = FindPropertyInfo( PropertyName ) ;
 
 {
     const wxPropertyInfo* info = FindPropertyInfo( PropertyName ) ;
 


@@ -381,13 +395,13 @@ const wxPropertyAccessor *wxClassInfo::FindAccessor(const char *PropertyName) co
     return NULL ;
 }
 
     return NULL ;
 }
 

-const wxPropertyInfo *wxClassInfo::FindPropertyInfoInThisClass (const char *PropertyName) const
+wxPropertyInfo *wxClassInfo::FindPropertyInfoInThisClass (const wxChar *PropertyName) const

 {
 {

-    const wxPropertyInfo* info = GetFirstProperty() ;
+    wxPropertyInfo* info = m_firstProperty ;

 
     while( info )
     {
 
     while( info )
     {

-        if ( strcmp( info->GetName() , PropertyName ) == 0 )
+        if ( wxStrcmp( info->GetName() , PropertyName ) == 0 )

             return info ;
         info = info->GetNext() ;
     }
             return info ;
         info = info->GetNext() ;
     }


@@ -395,7 +409,7 @@ const wxPropertyInfo *wxClassInfo::FindPropertyInfoInThisClass (const char *Prop
     return 0;
 }
 
     return 0;
 }
 

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

 {
     const wxPropertyInfo* info = FindPropertyInfoInThisClass( PropertyName ) ;
     if ( info )
 {
     const wxPropertyInfo* info = FindPropertyInfoInThisClass( PropertyName ) ;
     if ( info )


@@ -411,13 +425,13 @@ const wxPropertyInfo *wxClassInfo::FindPropertyInfo (const char *PropertyName) c
     return 0;
 }
 
     return 0;
 }
 

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

 {
 {

-    const wxHandlerInfo* info = GetFirstHandler() ;
+    wxHandlerInfo* info = m_firstHandler ;

 
     while( info )
     {
 
     while( info )
     {

-        if ( strcmp( info->GetName() , PropertyName ) == 0 )
+        if ( wxStrcmp( info->GetName() , PropertyName ) == 0 )

             return info ;
         info = info->GetNext() ;
     }
             return info ;
         info = info->GetNext() ;
     }


@@ -425,7 +439,7 @@ const wxHandlerInfo *wxClassInfo::FindHandlerInfoInThisClass (const char *Proper
     return 0;
 }
 
     return 0;
 }
 

-const wxHandlerInfo *wxClassInfo::FindHandlerInfo (const char *PropertyName) const
+const wxHandlerInfo *wxClassInfo::FindHandlerInfo (const wxChar *PropertyName) const

 {
     const wxHandlerInfo* info = FindHandlerInfoInThisClass( PropertyName ) ;
 
 {
     const wxHandlerInfo* info = FindHandlerInfoInThisClass( PropertyName ) ;
 


@@ -456,7 +470,7 @@ wxObjectStreamingCallback wxClassInfo::GetStreamingCallback() const
     return retval ;
 }
 
     return retval ;
 }
 

-bool wxClassInfo::BeforeWriteObject( const wxObject *obj, wxWriter *streamer , wxPersister *persister , wxxVariantArray &metadata) const  
+bool wxClassInfo::BeforeWriteObject( const wxObject *obj, wxWriter *streamer , wxPersister *persister , wxxVariantArray &metadata) const

 {
     wxObjectStreamingCallback sb = GetStreamingCallback() ;
     if ( sb )
 {
     wxObjectStreamingCallback sb = GetStreamingCallback() ;
     if ( sb )


@@ -465,7 +479,7 @@ bool wxClassInfo::BeforeWriteObject( const wxObject *obj, wxWriter *streamer , w
     return true ;
 }
 
     return true ;
 }
 

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

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


@@ -474,7 +488,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) const
+wxxVariant wxClassInfo::GetProperty(wxObject *object, const wxChar *propertyName) const

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


@@ -505,13 +519,16 @@ void wxClassInfo::AddToPropertyCollection(wxObject *object, const wxChar *proper
     accessor->AddToPropertyCollection( object , value ) ;
 }
 
     accessor->AddToPropertyCollection( object , value ) ;
 }
 

-void wxClassInfo::GetProperties( wxPropertyInfoMap &map ) const
+// void wxClassInfo::GetProperties( wxPropertyInfoMap &map ) const
+// The map parameter (the name map that is) seems something special
+// to MSVC and so we use a other name.
+void wxClassInfo::GetProperties( wxPropertyInfoMap &infomap ) const

 {
     const wxPropertyInfo *pi = GetFirstProperty() ;
 {
     const wxPropertyInfo *pi = GetFirstProperty() ;

-    while( pi ) 
+    while( pi )

     {
     {

-        if ( map.find( pi->GetName() ) == map.end() )
-            map[pi->GetName()] = (wxPropertyInfo*) pi ;
+        if ( infomap.find( pi->GetName() ) == infomap.end() )
+            infomap[pi->GetName()] = (wxPropertyInfo*) pi ;

 
         pi = pi->GetNext() ;
     }
 
         pi = pi->GetNext() ;
     }


@@ -519,7 +536,7 @@ void wxClassInfo::GetProperties( wxPropertyInfoMap &map ) const
     const wxClassInfo** parents = GetParents() ;
     for ( int i = 0 ; parents[i] ; ++ i )
     {
     const wxClassInfo** parents = GetParents() ;
     for ( int i = 0 ; parents[i] ; ++ i )
     {

-        parents[i]->GetProperties( map ) ;
+        parents[i]->GetProperties( infomap ) ;

     }
 }
 
     }
 }
 


@@ -546,7 +563,20 @@ wxObject* wxxVariant::GetAsObject()
 
 struct wxDynamicObject::wxDynamicObjectInternal
 {
 
 struct wxDynamicObject::wxDynamicObjectInternal
 {

+    wxDynamicObjectInternal() {}
+
+#if wxUSE_UNICODE
+    map<wstring,wxxVariant> m_properties ;
+#else

     map<string,wxxVariant> m_properties ;
     map<string,wxxVariant> m_properties ;

+#endif
+} ;
+
+typedef list< wxDynamicObject* > wxDynamicObjectList ;
+
+struct wxDynamicClassInfo::wxDynamicClassInfoInternal
+{
+    wxDynamicObjectList m_dynamicObjects ;

 } ;
 
 // instantiates this object with an instance of its superclass
 } ;
 
 // instantiates this object with an instance of its superclass


@@ -559,6 +589,7 @@ wxDynamicObject::wxDynamicObject(wxObject* superClassInstance, const wxDynamicCl
 
 wxDynamicObject::~wxDynamicObject()
 {
 
 wxDynamicObject::~wxDynamicObject()
 {

+    dynamic_cast<const wxDynamicClassInfo*>(m_classInfo)->m_data->m_dynamicObjects.remove( this ) ;

     delete m_data ;
     delete m_superClassInstance ;
 }
     delete m_data ;
     delete m_superClassInstance ;
 }


@@ -575,6 +606,21 @@ wxxVariant wxDynamicObject::GetProperty (const wxChar *propertyName) const
     return m_data->m_properties[propertyName] ;
 }
 
     return m_data->m_properties[propertyName] ;
 }
 

+void wxDynamicObject::RemoveProperty( const wxChar *propertyName )
+{
+    wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName),wxT("Removing Unknown Property in a Dynamic Object") ) ;
+    m_data->m_properties.erase( propertyName ) ;
+}
+
+void wxDynamicObject::RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName )
+{
+    wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(oldPropertyName),wxT("Renaming Unknown Property in a Dynamic Object") ) ;
+    wxxVariant value = m_data->m_properties[oldPropertyName] ;
+    m_data->m_properties.erase( oldPropertyName ) ;
+    m_data->m_properties[newPropertyName] = value ;
+}
+
+

 // ----------------------------------------------------------------------------
 // wxDynamiClassInfo
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDynamiClassInfo
 // ----------------------------------------------------------------------------


@@ -584,17 +630,21 @@ wxClassInfo( unitName, className , new const wxClassInfo*[2])
 {
     GetParents()[0] = superClass ;
     GetParents()[1] = NULL ;
 {
     GetParents()[0] = superClass ;
     GetParents()[1] = NULL ;

+    m_data = new wxDynamicClassInfoInternal ;

 }
 
 wxDynamicClassInfo::~wxDynamicClassInfo()
 {
     delete[] GetParents() ;
 }
 
 wxDynamicClassInfo::~wxDynamicClassInfo()
 {
     delete[] GetParents() ;

+    delete m_data ;

 }
 
 wxObject *wxDynamicClassInfo::AllocateObject() const
 {
     wxObject* parent = GetParents()[0]->AllocateObject() ;
 }
 
 wxObject *wxDynamicClassInfo::AllocateObject() const
 {
     wxObject* parent = GetParents()[0]->AllocateObject() ;

-    return new wxDynamicObject( parent , this ) ;
+    wxDynamicObject *obj = new wxDynamicObject( parent , this ) ;
+    m_data->m_dynamicObjects.push_back( obj ) ;
+    return obj ;

 }
 
 void wxDynamicClassInfo::Create (wxObject *object, int paramCount, wxxVariant *params) const
 }
 
 void wxDynamicClassInfo::Create (wxObject *object, int paramCount, wxxVariant *params) const


@@ -616,7 +666,7 @@ const wxChar* wxDynamicClassInfo::GetCreateParamName(int i) const
     return GetParents()[0]->GetCreateParamName( i ) ;
 }
 
     return GetParents()[0]->GetCreateParamName( i ) ;
 }
 

-void wxDynamicClassInfo::SetProperty(wxObject *object, const char *propertyName, const wxxVariant &value) const
+void wxDynamicClassInfo::SetProperty(wxObject *object, const wxChar *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") ) ;
 {
     wxDynamicObject* dynobj = dynamic_cast< wxDynamicObject * >( object ) ;
     wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;


@@ -626,7 +676,7 @@ void wxDynamicClassInfo::SetProperty(wxObject *object, const char *propertyName,
         GetParents()[0]->SetProperty( dynobj->GetSuperClassInstance() , propertyName , value ) ;
 }
 
         GetParents()[0]->SetProperty( dynobj->GetSuperClassInstance() , propertyName , value ) ;
 }
 

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

 {
     wxDynamicObject* dynobj = dynamic_cast< wxDynamicObject * >( object ) ;
     wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
 {
     wxDynamicObject* dynobj = dynamic_cast< wxDynamicObject * >( object ) ;
     wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;


@@ -638,22 +688,44 @@ wxxVariant wxDynamicClassInfo::GetProperty(wxObject *object, const char *propert
 
 void wxDynamicClassInfo::AddProperty( const wxChar *propertyName , const wxTypeInfo* typeInfo )
 {
 
 void wxDynamicClassInfo::AddProperty( const wxChar *propertyName , const wxTypeInfo* typeInfo )
 {

-    new wxPropertyInfo( m_firstProperty , this , propertyName , typeInfo , new wxGenericPropertyAccessor( propertyName ) , wxxVariant() ) ;
+    new wxPropertyInfo( m_firstProperty , this , propertyName , typeInfo->GetTypeName() , new wxGenericPropertyAccessor( propertyName ) , wxxVariant() ) ;

 }
 
 void wxDynamicClassInfo::AddHandler( const wxChar *handlerName , wxObjectEventFunction address , const wxClassInfo* eventClassInfo )
 {
 }
 
 void wxDynamicClassInfo::AddHandler( const wxChar *handlerName , wxObjectEventFunction address , const wxClassInfo* eventClassInfo )
 {

-    new wxHandlerInfo( m_firstHandler , handlerName , address , eventClassInfo ) ;
+    new wxHandlerInfo( m_firstHandler , this , handlerName , address , eventClassInfo ) ;

 }
 
 // removes an existing runtime-property
 }
 
 // removes an existing runtime-property

-void wxDynamicClassInfo::RemoveProperty( const wxChar *propertyName ) 
+void wxDynamicClassInfo::RemoveProperty( const wxChar *propertyName )

 {
 {

+    for ( wxDynamicObjectList::iterator iter = m_data->m_dynamicObjects.begin() ; iter != m_data->m_dynamicObjects.end() ; ++iter )
+        (*iter)->RemoveProperty( propertyName ) ;
+    delete FindPropertyInfoInThisClass(propertyName) ;

 }
 
 // removes an existing runtime-handler
 }
 
 // removes an existing runtime-handler

-void wxDynamicClassInfo::RemoveHandler( const wxChar *handlerName ) 
+void wxDynamicClassInfo::RemoveHandler( const wxChar *handlerName )
+{
+    delete FindHandlerInfoInThisClass(handlerName) ;
+}
+
+// renames an existing runtime-property
+void wxDynamicClassInfo::RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName )

 {
 {

+    wxPropertyInfo* pi = FindPropertyInfoInThisClass(oldPropertyName) ;
+    wxASSERT_MSG( pi ,wxT("not existing property") ) ;
+    pi->m_name = newPropertyName ;
+    dynamic_cast<wxGenericPropertyAccessor*>(pi->GetAccessor())->RenameProperty( oldPropertyName , newPropertyName ) ;
+    for ( wxDynamicObjectList::iterator iter = m_data->m_dynamicObjects.begin() ; iter != m_data->m_dynamicObjects.end() ; ++iter )
+        (*iter)->RenameProperty( oldPropertyName , newPropertyName ) ;
+}
+
+// renames an existing runtime-handler
+void wxDynamicClassInfo::RenameHandler( const wxChar *oldHandlerName , const wxChar *newHandlerName )
+{
+    wxASSERT_MSG(FindHandlerInfoInThisClass(oldHandlerName),wxT("not existing handler") ) ;
+    FindHandlerInfoInThisClass(oldHandlerName)->m_name = newHandlerName ;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -691,4 +763,5 @@ void wxGenericPropertyAccessor::GetProperty(const wxObject *object, wxxVariant&
     wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
     value = dynobj->GetProperty( m_propertyName ) ;
 }
     wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
     value = dynobj->GetProperty( m_propertyName ) ;
 }

-#endif
+
+#endif // wxUSE_EXTENDED_RTTI