X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/xtixml.cpp diff --git a/src/common/xtixml.cpp b/src/common/xtixml.cpp index 79e77061fc..dae1f64eba 100644 --- a/src/common/xtixml.cpp +++ b/src/common/xtixml.cpp @@ -1,39 +1,36 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/common/xtistrm.cpp +// Name: src/common/xtixml.cpp // Purpose: streaming runtime metadata information // Author: Stefan Csomor // Modified by: // Created: 27/07/03 // RCS-ID: $Id$ // Copyright: (c) 2003 Stefan Csomor -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "xtistrm.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 + +#include "wx/xtixml.h" + #ifndef WX_PRECOMP -#include "wx/hash.h" -#include "wx/object.h" + #include "wx/object.h" + #include "wx/hash.h" + #include "wx/event.h" #endif #include "wx/xml/xml.h" #include "wx/tokenzr.h" #include "wx/txtstrm.h" -#include "wx/event.h" - -#if wxUSE_EXTENDED_RTTI #include "wx/xtistrm.h" -#include "wx/xtixml.h" #include "wx/beforestd.h" #include @@ -97,7 +94,7 @@ void wxXmlWriter::DoBeginWriteTopLevelEntry( const wxString &name ) { wxXmlNode *pnode; pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("entry")); - pnode->AddProperty(wxString(wxT("name")), name); + pnode->AddAttribute(wxString(wxT("name")), name); m_data->m_current->AddChild(pnode) ; m_data->Push( pnode ) ; } @@ -111,12 +108,12 @@ void wxXmlWriter::DoBeginWriteObject(const wxObject *WXUNUSED(object), const wxC { wxXmlNode *pnode; pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); - pnode->AddProperty(wxT("class"), wxString(classInfo->GetClassName())); - pnode->AddProperty(wxT("id"), wxString::Format( wxT("%d") , objectID ) ); + pnode->AddAttribute(wxT("class"), wxString(classInfo->GetClassName())); + pnode->AddAttribute(wxT("id"), wxString::Format( wxT("%d") , objectID ) ); for ( size_t i = 0 ; i < metadata.GetCount() ; ++i ) { - pnode->AddProperty( metadata[i].GetName() , metadata[i].GetAsString() ) ; + pnode->AddAttribute( metadata[i].GetName() , metadata[i].GetAsString() ) ; } m_data->m_current->AddChild(pnode) ; m_data->Push( pnode ) ; @@ -151,7 +148,7 @@ void wxXmlWriter::DoBeginWriteProperty(const wxPropertyInfo *pi ) { wxXmlNode *pnode; pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("prop") ); - pnode->AddProperty(wxT("name"), pi->GetName() ); + pnode->AddAttribute(wxT("name"), pi->GetName() ); m_data->m_current->AddChild(pnode) ; m_data->Push( pnode ) ; } @@ -168,7 +165,7 @@ void wxXmlWriter::DoWriteRepeatedObject( int objectID ) { wxXmlNode *pnode; pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); - pnode->AddProperty(wxString(wxT("href")), wxString::Format( wxT("%d") , objectID ) ); + pnode->AddAttribute(wxString(wxT("href")), wxString::Format( wxT("%d") , objectID ) ); m_data->m_current->AddChild(pnode) ; } @@ -223,7 +220,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) if (!children) { // check for a null object or href - if (node->GetPropVal(wxT("href") , &ObjectIdString ) ) + if (node->GetAttribute(wxT("href") , &ObjectIdString ) ) { objectID = atoi( ObjectIdString.ToAscii() ) ; if ( HasObjectClassInfo( objectID ) ) @@ -233,15 +230,15 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) else { wxLogError( _("Forward hrefs are not supported") ) ; - return wxInvalidObjectID ; + return wxInvalidObjectID ; } } - if ( !node->GetPropVal(wxT("id") , &ObjectIdString ) ) + if ( !node->GetAttribute(wxT("id") , &ObjectIdString ) ) { return wxNullObjectID; } } - if (!node->GetPropVal(wxT("class"), &className)) + if (!node->GetAttribute(wxT("class"), &className)) { // No class name. Eek. FIXME: error handling return wxInvalidObjectID; @@ -255,10 +252,10 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) if ( children != NULL && children->GetType() == wxXML_TEXT_NODE ) { - wxLogError(_("objects cannot have XML Text Nodes") ) ; + wxLogError(_("objects cannot have XML Text Nodes") ) ; return wxInvalidObjectID; } - if (!node->GetPropVal(wxT("id"), &ObjectIdString)) + if (!node->GetAttribute(wxT("id"), &ObjectIdString)) { wxLogError(_("Objects must have an id attribute") ) ; // No object id. Eek. FIXME: error handling @@ -268,7 +265,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) // is this object already has been streamed in, return it here if ( HasObjectClassInfo( objectID ) ) { - wxLogError ( wxString::Format(_("Doubly used id : %d"), objectID ) ) ; + wxLogError ( wxString::Format(_("Doubly used id : %d"), objectID ) ) ; return wxInvalidObjectID ; } @@ -277,7 +274,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) SetObjectClassInfo( objectID , classInfo ) ; wxxVariantArray metadata ; - wxXmlProperty *xp = node->GetProperties() ; + wxXmlAttribute *xp = node->GetAttributes() ; while ( xp ) { if ( xp->GetName() != wxString(wxT("class")) && xp->GetName() != wxString(wxT("id")) ) @@ -308,9 +305,9 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) while( children ) { wxString name ; - children->GetPropVal( wxT("name") , &name ) ; - propertyNames.push_back( name.c_str() ) ; - propertyNodes[name.c_str()] = children->GetChildren() ; + children->GetAttribute( wxT("name") , &name ) ; + propertyNames.push_back( (const wxChar*)name.c_str() ) ; + propertyNodes[(const wxChar*)name.c_str()] = children->GetChildren() ; children = children->GetNext() ; } @@ -528,7 +525,7 @@ int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks) while ( iter ) { wxString entryName ; - if ( iter->GetPropVal(wxT("name"), &entryName) ) + if ( iter->GetAttribute(wxT("name"), &entryName) ) { if ( entryName == name ) return ReadComponent( iter->GetChildren() , callbacks ) ; @@ -538,4 +535,4 @@ int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks) return wxInvalidObjectID ; } -#endif +#endif // wxUSE_EXTENDED_RTTI