#include "wx/beforestd.h"
#include <map>
#include <string>
+#include <list>
#include "wx/afterstd.h"
using namespace std ;
// built-ins
//
-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()) ;
+#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
+
+typedef unsigned char unsigned_char;
+typedef unsigned int unsigned_int;
+typedef unsigned long unsigned_long;
+
+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);
+
// this are compiler induced specialization which are never used anywhere
wxArrayCollectionToVariantArray( theArray , value ) ;
}
-wxTypeInfoMap *wxTypeInfo::sm_typeTable = NULL ;
+wxTypeInfoMap *wxTypeInfo::ms_typeTable = NULL ;
wxTypeInfo *wxTypeInfo::FindType(const wxChar *typeName)
{
- wxTypeInfoMap::iterator iter = sm_typeTable->find(typeName) ;
- wxASSERT_MSG( iter != sm_typeTable->end() , wxT("lookup for a non-existent type-info") ) ;
+ 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;
}
{ 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
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 )
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() ;
- 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() ;
}
const wxClassInfo** parents = GetParents() ;
for ( int i = 0 ; parents[i] ; ++ i )
{
- parents[i]->GetProperties( map ) ;
+ parents[i]->GetProperties( infomap ) ;
}
}
// 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
-// can't keep the attributes in a hash map, because if someone renames a property in
-// the class info, then things go potty later on when we try to iterate through
-// the property values by name.
-struct wxDynamicProperty__
-{
-#if wxUSE_UNICODE
- wstring name;
-#else
- string name;
-#endif
- wxxVariant value;
- wxDynamicProperty__ *next;
-};
-
struct wxDynamicObject::wxDynamicObjectInternal
{
- wxDynamicObjectInternal() : m_properties(NULL) {}
- wxDynamicProperty__ *m_properties;
-#if 0
+ wxDynamicObjectInternal() {}
+
#if wxUSE_UNICODE
map<wstring,wxxVariant> m_properties ;
#else
map<string,wxxVariant> m_properties ;
#endif
-#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 ;
}
void wxDynamicObject::SetProperty (const wxChar *propertyName, const wxxVariant &value)
{
wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName),wxT("Accessing Unknown Property in a Dynamic Object") ) ;
- wxDynamicProperty__ *prop;
- prop = m_data->m_properties;
- while (prop)
- {
- if (!strcmp(prop->name.c_str(), propertyName))
- {
- prop->value = value;
- return;
- }
- prop = prop->next;
- }
- prop = new wxDynamicProperty__;
- prop->name = propertyName;
- prop->value = value;
- prop->next = m_data->m_properties;
- m_data->m_properties = prop;
-// m_data->m_properties[propertyName] = value ;
+ 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") ) ;
- wxDynamicProperty__ *prop;
- prop = m_data->m_properties;
- while (prop)
- {
- if (!strcmp(prop->name.c_str(), propertyName))
- return prop->value;
- prop = prop->next;
- }
- // FIXME: needs to return something a little more sane here.
- return wxxVariant();
-// 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
// ----------------------------------------------------------------------------
{
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
}
// 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
-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 )
+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 )
+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