// 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__
-#pragma hdrstop
+ #pragma hdrstop
#endif
+#if wxUSE_EXTENDED_RTTI
+
#ifndef WX_PRECOMP
-#include "wx/hash.h"
-#include "wx/object.h"
+ #include "wx/object.h"
+ #include "wx/list.h"
+ #include "wx/hash.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>
#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++ )
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++ )
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;
- 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 ;
}
-const wxChar * 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 ;
template<> void wxStringReadValue(const wxString &s , bool &data )
{
int intdata ;
- wxSscanf(s, _T("%d"), &intdata ) ;
- data = bool(intdata) ;
+ wxSscanf(s, wxT("%d"), &intdata ) ;
+ data = (bool)intdata ;
}
template<> void wxStringWriteValue(wxString &s , const bool &data )
{
- s = wxString::Format(_T("%d"), data ) ;
+ s = wxString::Format(wxT("%d"), data ) ;
}
// char
template<> void wxStringReadValue(const wxString &s , char &data )
{
int intdata ;
- wxSscanf(s, _T("%d"), &intdata ) ;
+ wxSscanf(s, wxT("%d"), &intdata ) ;
data = char(intdata) ;
}
template<> void wxStringWriteValue(wxString &s , const char &data )
{
- s = wxString::Format(_T("%d"), data ) ;
+ s = wxString::Format(wxT("%d"), data ) ;
}
// unsigned char
template<> void wxStringReadValue(const wxString &s , unsigned char &data )
{
int intdata ;
- wxSscanf(s, _T("%d"), &intdata ) ;
+ wxSscanf(s, wxT("%d"), &intdata ) ;
data = (unsigned char)(intdata) ;
}
template<> void wxStringWriteValue(wxString &s , const unsigned char &data )
{
- s = wxString::Format(_T("%d"), data ) ;
+ s = wxString::Format(wxT("%d"), data ) ;
}
// int
template<> void wxStringReadValue(const wxString &s , int &data )
{
- wxSscanf(s, _T("%d"), &data ) ;
+ wxSscanf(s, wxT("%d"), &data ) ;
}
template<> void wxStringWriteValue(wxString &s , const int &data )
{
- s = wxString::Format(_T("%d"), data ) ;
+ s = wxString::Format(wxT("%d"), data ) ;
}
// unsigned int
template<> void wxStringReadValue(const wxString &s , unsigned int &data )
{
- wxSscanf(s, _T("%d"), &data ) ;
+ wxSscanf(s, wxT("%d"), &data ) ;
}
template<> void wxStringWriteValue(wxString &s , const unsigned int &data )
{
- s = wxString::Format(_T("%d"), data ) ;
+ s = wxString::Format(wxT("%d"), data ) ;
}
// long
template<> void wxStringReadValue(const wxString &s , long &data )
{
- wxSscanf(s, _T("%ld"), &data ) ;
+ wxSscanf(s, wxT("%ld"), &data ) ;
}
template<> void wxStringWriteValue(wxString &s , const long &data )
{
- s = wxString::Format(_T("%ld"), data ) ;
+ s = wxString::Format(wxT("%ld"), data ) ;
}
// unsigned long
template<> void wxStringReadValue(const wxString &s , unsigned long &data )
{
- wxSscanf(s, _T("%ld"), &data ) ;
+ wxSscanf(s, wxT("%ld"), &data ) ;
}
template<> void wxStringWriteValue(wxString &s , const unsigned long &data )
{
- s = wxString::Format(_T("%ld"), data ) ;
+ s = wxString::Format(wxT("%ld"), data ) ;
}
// float
template<> void wxStringReadValue(const wxString &s , float &data )
{
- wxSscanf(s, _T("%f"), &data ) ;
+ wxSscanf(s, wxT("%f"), &data ) ;
}
template<> void wxStringWriteValue(wxString &s , const float &data )
{
- s = wxString::Format(_T("%f"), data ) ;
+ s = wxString::Format(wxT("%f"), data ) ;
}
// double
template<> void wxStringReadValue(const wxString &s , double &data )
{
- wxSscanf(s, _T("%lf"), &data ) ;
+ wxSscanf(s, wxT("%lf"), &data ) ;
}
template<> void wxStringWriteValue(wxString &s , const double &data )
{
- s = wxString::Format(_T("%lf"), data ) ;
+ s = wxString::Format(wxT("%lf"), data ) ;
}
// wxString
// 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
-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)
{
- 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;
}
+#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 ;
+ if( !m_name.empty() )
+ (*ms_typeTable)[m_name] = this ;
}
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
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 ) ;
}
}
struct wxDynamicObject::wxDynamicObjectInternal
{
+ wxDynamicObjectInternal() {}
+
#if wxUSE_UNICODE
map<wstring,wxxVariant> m_properties ;
#else
#endif
} ;
+typedef list< wxDynamicObject* > wxDynamicObjectList ;
+
+struct wxDynamicClassInfo::wxDynamicClassInfoInternal
+{
+ wxDynamicObjectList m_dynamicObjects ;
+} ;
+
// instantiates this object with an instance of its superclass
wxDynamicObject::wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info)
{
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
}
// 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 ;
wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
value = dynobj->GetProperty( m_propertyName ) ;
}
-#endif
+
+#endif // wxUSE_EXTENDED_RTTI
projects / wxWidgets.git / blobdiff