X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f2b1cfd3942412889d9f7e2fd2efe27e2d049c1..88a7a4e10ed18f81a576dcd866cfbf02bf404c00:/src/common/xtixml.cpp diff --git a/src/common/xtixml.cpp b/src/common/xtixml.cpp index 3bd916c190..7531d3df03 100644 --- a/src/common/xtixml.cpp +++ b/src/common/xtixml.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/common/xtistrm.cpp +// Name: src/common/xtixml.cpp // Purpose: streaming runtime metadata information // Author: Stefan Csomor // Modified by: @@ -9,20 +9,18 @@ // 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 + #ifndef WX_PRECOMP -#include "wx/hash.h" -#include "wx/object.h" + #include "wx/object.h" + #include "wx/hash.h" #endif #include "wx/xml/xml.h" @@ -30,8 +28,6 @@ #include "wx/txtstrm.h" #include "wx/event.h" -#if wxUSE_EXTENDED_RTTI - #include "wx/xtistrm.h" #include "wx/xtixml.h" @@ -233,7 +229,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) else { wxLogError( _("Forward hrefs are not supported") ) ; - return wxInvalidObjectID ; + return wxInvalidObjectID ; } } if ( !node->GetPropVal(wxT("id") , &ObjectIdString ) ) @@ -255,7 +251,7 @@ 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)) @@ -268,7 +264,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 ; } @@ -538,4 +534,4 @@ int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks) return wxInvalidObjectID ; } -#endif +#endif // wxUSE_EXTENDED_RTTI