X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b8d5be011d6d7e9aaf493eb8f5e21960d22b2a8f..1b5ff3a3feed9f5a23dcf8de40189c0af2746483:/src/common/xti.cpp?ds=sidebyside diff --git a/src/common/xti.cpp b/src/common/xti.cpp index c3b5bef7d2..b6596338db 100644 --- a/src/common/xti.cpp +++ b/src/common/xti.cpp @@ -22,18 +22,18 @@ #endif #ifndef WX_PRECOMP - #include "wx/hash.h" - #include "wx/object.h" +#include "wx/hash.h" +#include "wx/object.h" #endif +#if wxUSE_EXTENDED_RTTI + +#include "wx/xti.h" #include "wx/xml/xml.h" #include "wx/tokenzr.h" -#include "wx/notebook.h" #include "wx/list.h" #include -#if wxUSE_EXTENDED_RTTI - #include "wx/beforestd.h" #include #include @@ -47,36 +47,36 @@ using namespace std ; wxEnumData::wxEnumData( wxEnumMemberData* data ) { - m_members = data ; + m_members = data ; for ( m_count = 0; m_members[m_count].m_name ; m_count++) - {} ; + {} ; } bool wxEnumData::HasEnumMemberValue(const wxChar *name, int *value) { int i; for (i = 0; m_members[i].m_name ; i++ ) - { - if (!strcmp(name, m_members[i].m_name)) - { - if ( value ) - *value = m_members[i].m_value; - return true ; - } - } - return false ; + { + if (!strcmp(name, m_members[i].m_name)) + { + if ( value ) + *value = m_members[i].m_value; + return true ; + } + } + return false ; } int wxEnumData::GetEnumMemberValue(const wxChar *name) { int i; for (i = 0; m_members[i].m_name ; i++ ) - { - if (!strcmp(name, m_members[i].m_name)) - { - return m_members[i].m_value; - } - } + { + if (!strcmp(name, m_members[i].m_name)) + { + return m_members[i].m_value; + } + } return 0 ; } @@ -84,22 +84,22 @@ const wxChar *wxEnumData::GetEnumMemberName(int value) { int i; for (i = 0; m_members[i].m_name ; i++) - if (value == m_members[i].m_value) - return m_members[i].m_name; + if (value == m_members[i].m_value) + return m_members[i].m_name; - return wxT("") ; + return wxT("") ; } 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 ) { - // 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 ; } // ---------------------------------------------------------------------------- @@ -116,245 +116,195 @@ const char * wxEnumData::GetEnumMemberNameByIndex( int idx ) template<> void wxStringReadValue(const wxString &s , bool &data ) { - int intdata ; - wxSscanf(s, _T("%d"), &intdata ) ; - data = bool(intdata) ; + int intdata ; + wxSscanf(s, _T("%d"), &intdata ) ; + data = bool(intdata) ; } template<> void wxStringWriteValue(wxString &s , const bool &data ) { - s = wxString::Format("%d", data ) ; + s = wxString::Format("%d", data ) ; } // char template<> void wxStringReadValue(const wxString &s , char &data ) { - int intdata ; - wxSscanf(s, _T("%d"), &intdata ) ; - data = char(intdata) ; + int intdata ; + wxSscanf(s, _T("%d"), &intdata ) ; + data = char(intdata) ; } template<> void wxStringWriteValue(wxString &s , const char &data ) { - s = wxString::Format("%d", data ) ; + s = wxString::Format("%d", data ) ; } // unsigned char template<> void wxStringReadValue(const wxString &s , unsigned char &data ) { - int intdata ; - wxSscanf(s, _T("%d"), &intdata ) ; - data = (unsigned char)(intdata) ; + int intdata ; + wxSscanf(s, _T("%d"), &intdata ) ; + data = (unsigned char)(intdata) ; } template<> void wxStringWriteValue(wxString &s , const unsigned char &data ) { - s = wxString::Format("%d", data ) ; + s = wxString::Format("%d", data ) ; } // int template<> void wxStringReadValue(const wxString &s , int &data ) { - wxSscanf(s, _T("%d"), &data ) ; + wxSscanf(s, _T("%d"), &data ) ; } template<> void wxStringWriteValue(wxString &s , const int &data ) { - s = wxString::Format("%d", data ) ; + s = wxString::Format("%d", data ) ; } // unsigned int template<> void wxStringReadValue(const wxString &s , unsigned int &data ) { - wxSscanf(s, _T("%d"), &data ) ; + wxSscanf(s, _T("%d"), &data ) ; } template<> void wxStringWriteValue(wxString &s , const unsigned int &data ) { - s = wxString::Format("%d", data ) ; + s = wxString::Format("%d", data ) ; } // long template<> void wxStringReadValue(const wxString &s , long &data ) { - wxSscanf(s, _T("%ld"), &data ) ; + wxSscanf(s, _T("%ld"), &data ) ; } template<> void wxStringWriteValue(wxString &s , const long &data ) { - s = wxString::Format("%ld", data ) ; + s = wxString::Format("%ld", data ) ; } // unsigned long template<> void wxStringReadValue(const wxString &s , unsigned long &data ) { - wxSscanf(s, _T("%ld"), &data ) ; + wxSscanf(s, _T("%ld"), &data ) ; } template<> void wxStringWriteValue(wxString &s , const unsigned long &data ) { - s = wxString::Format("%ld", data ) ; + s = wxString::Format("%ld", data ) ; } // float template<> void wxStringReadValue(const wxString &s , float &data ) { - wxSscanf(s, _T("%f"), &data ) ; + wxSscanf(s, _T("%f"), &data ) ; } template<> void wxStringWriteValue(wxString &s , const float &data ) { - s = wxString::Format("%f", data ) ; + s = wxString::Format("%f", data ) ; } // double template<> void wxStringReadValue(const wxString &s , double &data ) { - wxSscanf(s, _T("%lf"), &data ) ; + wxSscanf(s, _T("%lf"), &data ) ; } template<> void wxStringWriteValue(wxString &s , const double &data ) { - s = wxString::Format("%lf", data ) ; + s = wxString::Format("%lf", data ) ; } // wxString template<> void wxStringReadValue(const wxString &s , wxString &data ) { - data = s ; + data = s ; } template<> void wxStringWriteValue(wxString &s , const wxString &data ) { - s = data ; -} - -/* - Custom Data Streaming / Type Infos - we will have to add this for all wx non object types, but it is also an example - for custom data structures -*/ - -// wxPoint - -template<> void wxStringReadValue(const wxString &s , wxPoint &data ) -{ - wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ; + s = data ; } -template<> void wxStringWriteValue(wxString &s , const wxPoint &data ) -{ - 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) - -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) - +// built-ins +// template<> const wxTypeInfo* wxGetTypeInfo( void * ) { - static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ; - return &s_typeInfo ; + static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ; + return &s_typeInfo ; } template<> const wxTypeInfo* wxGetTypeInfo( bool * ) { - static wxBuiltInTypeInfo s_typeInfo( wxT_BOOL , &wxToStringConverter , &wxFromStringConverter) ; - return &s_typeInfo ; + static wxBuiltInTypeInfo s_typeInfo( wxT_BOOL , &wxToStringConverter , &wxFromStringConverter) ; + return &s_typeInfo ; } template<> const wxTypeInfo* wxGetTypeInfo( char * ) { - static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR , &wxToStringConverter , &wxFromStringConverter) ; - return &s_typeInfo ; + static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR , &wxToStringConverter , &wxFromStringConverter) ; + return &s_typeInfo ; } template<> const wxTypeInfo* wxGetTypeInfo( unsigned char * ) { - static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR , &wxToStringConverter< unsigned char > , &wxFromStringConverter) ; - return &s_typeInfo ; + static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR , &wxToStringConverter< unsigned char > , &wxFromStringConverter) ; + return &s_typeInfo ; } template<> const wxTypeInfo* wxGetTypeInfo( int * ) { - static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR , &wxToStringConverter , &wxFromStringConverter) ; - return &s_typeInfo ; + static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR , &wxToStringConverter , &wxFromStringConverter) ; + return &s_typeInfo ; } template<> const wxTypeInfo* wxGetTypeInfo( unsigned int * ) { - static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR , &wxToStringConverter , &wxFromStringConverter) ; - return &s_typeInfo ; + static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR , &wxToStringConverter , &wxFromStringConverter) ; + return &s_typeInfo ; } template<> const wxTypeInfo* wxGetTypeInfo( long * ) { - static wxBuiltInTypeInfo s_typeInfo( wxT_LONG , &wxToStringConverter , &wxFromStringConverter) ; - return &s_typeInfo ; + static wxBuiltInTypeInfo s_typeInfo( wxT_LONG , &wxToStringConverter , &wxFromStringConverter) ; + return &s_typeInfo ; } template<> const wxTypeInfo* wxGetTypeInfo( unsigned long * ) { - static wxBuiltInTypeInfo s_typeInfo( wxT_ULONG , &wxToStringConverter , &wxFromStringConverter) ; - return &s_typeInfo ; + static wxBuiltInTypeInfo s_typeInfo( wxT_ULONG , &wxToStringConverter , &wxFromStringConverter) ; + return &s_typeInfo ; } template<> const wxTypeInfo* wxGetTypeInfo( float * ) { - static wxBuiltInTypeInfo s_typeInfo( wxT_FLOAT , &wxToStringConverter , &wxFromStringConverter) ; - return &s_typeInfo ; + static wxBuiltInTypeInfo s_typeInfo( wxT_FLOAT , &wxToStringConverter , &wxFromStringConverter) ; + return &s_typeInfo ; } template<> const wxTypeInfo* wxGetTypeInfo( double * ) { - static wxBuiltInTypeInfo s_typeInfo( wxT_DOUBLE , &wxToStringConverter , &wxFromStringConverter) ; - return &s_typeInfo ; + static wxBuiltInTypeInfo s_typeInfo( wxT_DOUBLE , &wxToStringConverter , &wxFromStringConverter) ; + return &s_typeInfo ; } template<> const wxTypeInfo* wxGetTypeInfo( wxString * ) { - static wxBuiltInTypeInfo s_typeInfo( wxT_STRING , &wxToStringConverter , &wxFromStringConverter) ; - return &s_typeInfo ; + static wxBuiltInTypeInfo s_typeInfo( wxT_STRING , &wxToStringConverter , &wxFromStringConverter) ; + return &s_typeInfo ; } // this are compiler induced specialization which are never used anywhere @@ -367,65 +317,54 @@ WX_ILLEGAL_TYPE_SPECIALIZATION( bool * ) WX_ILLEGAL_TYPE_SPECIALIZATION( long * ) WX_ILLEGAL_TYPE_SPECIALIZATION( wxString * ) -// - -// make wxWindowList known - -template<> const wxTypeInfo* wxGetTypeInfo( wxArrayString * ) -{ - static wxCollectionTypeInfo s_typeInfo( (wxTypeInfo*) wxGetTypeInfo( (wxString *) NULL) ) ; - return &s_typeInfo ; -} +WX_COLLECTION_TYPE_INFO( wxString , wxArrayString ) ; template<> void wxCollectionToVariantArray( wxArrayString const &theArray, wxxVariantArray &value) { wxArrayCollectionToVariantArray( theArray , value ) ; } +wxTypeInfoMap *wxTypeInfo::sm_typeTable = NULL ; +wxTypeInfo *wxTypeInfo::FindType(const wxChar *typeName) +{ + return (wxTypeInfo *)sm_typeTable->find(typeName)->second; +} -/* +wxClassTypeInfo::wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to , converterFromString_t from ) : +wxTypeInfo( kind , to , from , classInfo->GetClassName() ) +{ wxASSERT_MSG( kind == wxT_OBJECT_PTR || kind == wxT_OBJECT , wxT("Illegal Kind for Enum Type")) ; m_classInfo = classInfo ;} -template<> void wxStringReadValue(const wxString &s , wxColour &data ) -{ - // copied from VS xrc - unsigned long tmp = 0; +wxDelegateTypeInfo::wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass , converterToString_t to , converterFromString_t from ) : +wxTypeInfo ( wxT_DELEGATE , to , from , wxEmptyString ) +{ m_eventClass = eventClass ; m_eventType = eventType ;} - 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))); - } +void wxTypeInfo::Register() +{ + if ( sm_typeTable == NULL ) + sm_typeTable = new wxTypeInfoMap() ; + + if( !m_name.IsEmpty() ) + (*sm_typeTable)[m_name] = this ; } -template<> void wxStringWriteValue(wxString &s , const wxColour &data ) +void wxTypeInfo::Unregister() { - s = wxString::Format("#%2X%2X%2X", data.Red() , data.Green() , data.Blue() ) ; + if( !m_name.IsEmpty() ) + sm_typeTable->erase(m_name); } -WX_CUSTOM_TYPE_INFO(wxColour) - -*/ - // removing header dependancy on string tokenizer void wxSetStringToArray( const wxString &s , wxArrayString &array ) { wxStringTokenizer tokenizer(s, wxT("| \t\n"), wxTOKEN_STRTOK); wxString flag; - array.Clear() ; + array.Clear() ; while (tokenizer.HasMoreTokens()) { - array.Add(tokenizer.GetNextToken()) ; - } + array.Add(tokenizer.GetNextToken()) ; + } } // ---------------------------------------------------------------------------- @@ -436,73 +375,95 @@ const wxPropertyAccessor *wxClassInfo::FindAccessor(const char *PropertyName) co { const wxPropertyInfo* info = FindPropertyInfo( PropertyName ) ; - if ( info ) - return info->GetAccessor() ; + if ( info ) + return info->GetAccessor() ; - return NULL ; + return NULL ; } const wxPropertyInfo *wxClassInfo::FindPropertyInfoInThisClass (const char *PropertyName) const { - const wxPropertyInfo* info = GetFirstProperty() ; + const wxPropertyInfo* info = GetFirstProperty() ; - while( info ) - { - if ( strcmp( info->GetName() , PropertyName ) == 0 ) - return info ; - info = info->GetNext() ; - } + while( info ) + { + if ( strcmp( info->GetName() , PropertyName ) == 0 ) + return info ; + info = info->GetNext() ; + } return 0; } const wxPropertyInfo *wxClassInfo::FindPropertyInfo (const char *PropertyName) const { - const wxPropertyInfo* info = FindPropertyInfoInThisClass( PropertyName ) ; + const wxPropertyInfo* info = FindPropertyInfoInThisClass( PropertyName ) ; if ( info ) return info ; - const wxClassInfo** parents = GetParents() ; - for ( int i = 0 ; parents[i] ; ++ i ) - { - if ( ( info = parents[i]->FindPropertyInfo( PropertyName ) ) != NULL ) - return info ; - } + const wxClassInfo** parents = GetParents() ; + for ( int i = 0 ; parents[i] ; ++ i ) + { + if ( ( info = parents[i]->FindPropertyInfo( PropertyName ) ) != NULL ) + return info ; + } return 0; } const wxHandlerInfo *wxClassInfo::FindHandlerInfoInThisClass (const char *PropertyName) const { - const wxHandlerInfo* info = GetFirstHandler() ; + const wxHandlerInfo* info = GetFirstHandler() ; - while( info ) - { - if ( strcmp( info->GetName() , PropertyName ) == 0 ) - return info ; - info = info->GetNext() ; - } + while( info ) + { + if ( strcmp( info->GetName() , PropertyName ) == 0 ) + return info ; + info = info->GetNext() ; + } return 0; } const wxHandlerInfo *wxClassInfo::FindHandlerInfo (const char *PropertyName) const { - const wxHandlerInfo* info = FindHandlerInfoInThisClass( PropertyName ) ; + const wxHandlerInfo* info = FindHandlerInfoInThisClass( PropertyName ) ; if ( info ) return info ; - const wxClassInfo** parents = GetParents() ; - for ( int i = 0 ; parents[i] ; ++ i ) - { - if ( ( info = parents[i]->FindHandlerInfo( PropertyName ) ) != NULL ) - return info ; - } + const wxClassInfo** parents = GetParents() ; + for ( int i = 0 ; parents[i] ; ++ i ) + { + if ( ( info = parents[i]->FindHandlerInfo( PropertyName ) ) != NULL ) + return info ; + } return 0; } +wxObjectStreamingCallback wxClassInfo::GetStreamingCallback() const +{ + if ( m_streamingCallback ) + return m_streamingCallback ; + + wxObjectStreamingCallback retval = NULL ; + const wxClassInfo** parents = GetParents() ; + for ( int i = 0 ; parents[i] && retval == NULL ; ++ i ) + { + retval = parents[i]->GetStreamingCallback() ; + } + return retval ; +} + +bool wxClassInfo::BeforeWriteObject( const wxObject *obj, wxWriter *streamer , wxPersister *persister , wxxVariantArray &metadata) const +{ + wxObjectStreamingCallback sb = GetStreamingCallback() ; + if ( sb ) + return (*sb)(obj , streamer , persister , metadata ) ; + + return true ; +} void wxClassInfo::SetProperty(wxObject *object, const char *propertyName, const wxxVariant &value) const { @@ -510,7 +471,7 @@ void wxClassInfo::SetProperty(wxObject *object, const char *propertyName, const accessor = FindAccessor(propertyName); wxASSERT(accessor->HasSetter()); - accessor->SetProperty( object , value ) ; + accessor->SetProperty( object , value ) ; } wxxVariant wxClassInfo::GetProperty(wxObject *object, const char *propertyName) const @@ -544,17 +505,35 @@ void wxClassInfo::AddToPropertyCollection(wxObject *object, const wxChar *proper accessor->AddToPropertyCollection( object , value ) ; } +void wxClassInfo::GetProperties( wxPropertyInfoMap &map ) const +{ + const wxPropertyInfo *pi = GetFirstProperty() ; + while( pi ) + { + if ( map.find( pi->GetName() ) == map.end() ) + map[pi->GetName()] = (wxPropertyInfo*) pi ; + + pi = pi->GetNext() ; + } + + const wxClassInfo** parents = GetParents() ; + for ( int i = 0 ; parents[i] ; ++ i ) + { + parents[i]->GetProperties( map ) ; + } +} + /* VARIANT TO OBJECT */ wxObject* wxxVariant::GetAsObject() { - const wxClassTypeInfo *ti = dynamic_cast( m_data->GetTypeInfo() ) ; - if ( ti ) - return ti->GetClassInfo()->VariantToInstance(*this) ; - else - return NULL ; + const wxClassTypeInfo *ti = dynamic_cast( m_data->GetTypeInfo() ) ; + if ( ti ) + return ti->GetClassInfo()->VariantToInstance(*this) ; + else + return NULL ; } // ---------------------------------------------------------------------------- @@ -592,8 +571,8 @@ void wxDynamicObject::SetProperty (const wxChar *propertyName, const wxxVariant 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] ; + wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName),wxT("Accessing Unknown Property in a Dynamic Object") ) ; + return m_data->m_properties[propertyName] ; } // ---------------------------------------------------------------------------- @@ -601,7 +580,7 @@ wxxVariant wxDynamicObject::GetProperty (const wxChar *propertyName) const // ---------------------------------------------------------------------------- wxDynamicClassInfo::wxDynamicClassInfo( const wxChar *unitName, const wxChar *className , const wxClassInfo* superClass ) : - wxClassInfo( unitName, className , new const wxClassInfo*[2]) +wxClassInfo( unitName, className , new const wxClassInfo*[2]) { GetParents()[0] = superClass ; GetParents()[1] = NULL ; @@ -659,7 +638,7 @@ wxxVariant wxDynamicClassInfo::GetProperty(wxObject *object, const char *propert void wxDynamicClassInfo::AddProperty( const wxChar *propertyName , const wxTypeInfo* typeInfo ) { - new wxPropertyInfo( m_firstProperty , propertyName , typeInfo , new wxGenericPropertyAccessor( propertyName ) , wxxVariant() ) ; + new wxPropertyInfo( m_firstProperty , this , propertyName , typeInfo , new wxGenericPropertyAccessor( propertyName ) , wxxVariant() ) ; } void wxDynamicClassInfo::AddHandler( const wxChar *handlerName , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) @@ -667,6 +646,16 @@ void wxDynamicClassInfo::AddHandler( const wxChar *handlerName , wxObjectEventFu new wxHandlerInfo( m_firstHandler , handlerName , address , eventClassInfo ) ; } +// removes an existing runtime-property +void wxDynamicClassInfo::RemoveProperty( const wxChar *propertyName ) +{ +} + +// removes an existing runtime-handler +void wxDynamicClassInfo::RemoveHandler( const wxChar *handlerName ) +{ +} + // ---------------------------------------------------------------------------- // wxGenericPropertyAccessor // ----------------------------------------------------------------------------