#ifndef WX_PRECOMP
#include "wx/hash.h"
#include "wx/object.h"
-#include "wx/xti.h"
#endif
+#if wxUSE_EXTENDED_RTTI
+
+#include "wx/xti.h"
#include "wx/xml/xml.h"
#include "wx/tokenzr.h"
#include "wx/list.h"
#include <string.h>
-#if wxUSE_EXTENDED_RTTI
-
#include "wx/beforestd.h"
#include <map>
#include <string>
+#include <list>
#include "wx/afterstd.h"
using namespace std ;
{} ;
}
-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++ )
{
- if (!strcmp(name, m_members[i].m_name))
+ if (!wxStrcmp(name, m_members[i].m_name))
{
if ( value )
*value = m_members[i].m_value;
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++ )
{
- if (!strcmp(name, m_members[i].m_name))
+ if (!wxStrcmp(name, m_members[i].m_name))
{
return m_members[i].m_value;
}
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++)
return wxT("") ;
}
-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 ;
}
-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 ;
{
int intdata ;
wxSscanf(s, _T("%d"), &intdata ) ;
- data = bool(intdata) ;
+ data = (bool)intdata ;
}
template<> void wxStringWriteValue(wxString &s , const bool &data )
{
- s = wxString::Format("%d", data ) ;
+ s = wxString::Format(_T("%d"), data ) ;
}
// char
template<> void wxStringWriteValue(wxString &s , const char &data )
{
- s = wxString::Format("%d", data ) ;
+ s = wxString::Format(_T("%d"), data ) ;
}
// unsigned char
template<> void wxStringWriteValue(wxString &s , const unsigned char &data )
{
- s = wxString::Format("%d", data ) ;
+ s = wxString::Format(_T("%d"), data ) ;
}
// int
template<> void wxStringWriteValue(wxString &s , const int &data )
{
- s = wxString::Format("%d", data ) ;
+ s = wxString::Format(_T("%d"), data ) ;
}
// unsigned int
template<> void wxStringWriteValue(wxString &s , const unsigned int &data )
{
- s = wxString::Format("%d", data ) ;
+ s = wxString::Format(_T("%d"), data ) ;
}
// long
template<> void wxStringWriteValue(wxString &s , const long &data )
{
- s = wxString::Format("%ld", data ) ;
+ s = wxString::Format(_T("%ld"), data ) ;
}
// unsigned long
template<> void wxStringWriteValue(wxString &s , const unsigned long &data )
{
- s = wxString::Format("%ld", data ) ;
+ s = wxString::Format(_T("%ld"), data ) ;
}
// float
template<> void wxStringWriteValue(wxString &s , const float &data )
{
- s = wxString::Format("%f", data ) ;
+ s = wxString::Format(_T("%f"), data ) ;
}
// double
template<> void wxStringWriteValue(wxString &s , const double &data )
{
- s = wxString::Format("%lf", data ) ;
+ s = wxString::Format(_T("%lf"), data ) ;
}
// wxString
// 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 ;
-}
-
-template<> const wxTypeInfo* wxGetTypeInfo( long * )
-{
- static wxBuiltInTypeInfo s_typeInfo( wxT_LONG , &wxToStringConverter<long> , &wxFromStringConverter<long>) ;
- return &s_typeInfo ;
-}
-
-template<> const wxTypeInfo* wxGetTypeInfo( unsigned long * )
-{
- static wxBuiltInTypeInfo s_typeInfo( wxT_ULONG , &wxToStringConverter<unsigned long> , &wxFromStringConverter<unsigned long>) ;
- return &s_typeInfo ;
-}
-
-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 ;
-}
+wxBuiltInTypeInfo s_typeInfovoid( wxT_VOID , NULL , NULL , typeid(void).name() ) ;
+wxBuiltInTypeInfo s_typeInfobool( wxT_BOOL , &wxToStringConverter<bool> , &wxFromStringConverter<bool>, typeid(bool).name()) ;
+wxBuiltInTypeInfo s_typeInfochar( wxT_CHAR , &wxToStringConverter<char> , &wxFromStringConverter<char>, typeid(char).name()) ;
+wxBuiltInTypeInfo s_typeInfounsignedchar( wxT_UCHAR , &wxToStringConverter< unsigned char > , &wxFromStringConverter<unsigned char>, typeid(unsigned char).name()) ;
+wxBuiltInTypeInfo s_typeInfoint( wxT_INT , &wxToStringConverter<int> , &wxFromStringConverter<int>, typeid(int).name()) ;
+wxBuiltInTypeInfo s_typeInfounsignedint( wxT_UINT , &wxToStringConverter<unsigned int> , &wxFromStringConverter<unsigned int>, typeid(unsigned int).name()) ;
+wxBuiltInTypeInfo s_typeInfolong( wxT_LONG , &wxToStringConverter<long> , &wxFromStringConverter<long>, typeid(long).name()) ;
+wxBuiltInTypeInfo s_typeInfounsignedlong( wxT_ULONG , &wxToStringConverter<unsigned long> , &wxFromStringConverter<unsigned long>, typeid(unsigned long).name()) ;
+wxBuiltInTypeInfo s_typeInfofloat( wxT_FLOAT , &wxToStringConverter<float> , &wxFromStringConverter<float>, typeid(float).name()) ;
+wxBuiltInTypeInfo s_typeInfodouble( wxT_DOUBLE , &wxToStringConverter<double> , &wxFromStringConverter<double>, typeid(double).name()) ;
+wxBuiltInTypeInfo s_typeInfowxString( wxT_STRING , &wxToStringConverter<wxString> , &wxFromStringConverter<wxString>, typeid(wxString).name()) ;
// 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 ) ;
}
-wxTypeInfoMap *wxTypeInfo::sm_typeTable = NULL ;
+wxTypeInfoMap *wxTypeInfo::ms_typeTable = NULL ;
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 )
-{ 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()
{
- 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 ;
+ (*ms_typeTable)[m_name] = this ;
}
void wxTypeInfo::Unregister()
{
if( !m_name.IsEmpty() )
- sm_typeTable->erase(m_name);
+ ms_typeTable->erase(m_name);
}
// removing header dependancy on string tokenizer
// 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 ) ;
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 )
{
- if ( strcmp( info->GetName() , PropertyName ) == 0 )
+ if ( wxStrcmp( info->GetName() , PropertyName ) == 0 )
return info ;
info = info->GetNext() ;
}
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 )
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 )
{
- if ( strcmp( info->GetName() , PropertyName ) == 0 )
+ if ( wxStrcmp( info->GetName() , PropertyName ) == 0 )
return info ;
info = info->GetNext() ;
}
return 0;
}
-const wxHandlerInfo *wxClassInfo::FindHandlerInfo (const char *PropertyName) const
+const wxHandlerInfo *wxClassInfo::FindHandlerInfo (const wxChar *PropertyName) const
{
const wxHandlerInfo* info = FindHandlerInfoInThisClass( PropertyName ) ;
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;
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;
struct wxDynamicObject::wxDynamicObjectInternal
{
+ wxDynamicObjectInternal() {}
+
+#if wxUSE_UNICODE
+ map<wstring,wxxVariant> m_properties ;
+#else
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
wxDynamicObject::~wxDynamicObject()
{
+ dynamic_cast<const wxDynamicClassInfo*>(m_classInfo)->m_data->m_dynamicObjects.remove( this ) ;
delete m_data ;
delete m_superClassInstance ;
}
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
// ----------------------------------------------------------------------------
{
GetParents()[0] = superClass ;
GetParents()[1] = NULL ;
+ m_data = new wxDynamicClassInfoInternal ;
}
wxDynamicClassInfo::~wxDynamicClassInfo()
{
delete[] GetParents() ;
+ delete m_data ;
}
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
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") ) ;
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") ) ;
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 )
{
- new wxHandlerInfo( m_firstHandler , handlerName , address , eventClassInfo ) ;
+ new wxHandlerInfo( m_firstHandler , this , handlerName , address , eventClassInfo ) ;
}
// removes an existing runtime-property
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
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 ;
}
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff