X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30f6914ba1d999b84c28fc84a3cf0fdbf9cc326f..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/xml/xml.h?ds=sidebyside diff --git a/include/wx/xml/xml.h b/include/wx/xml/xml.h index 02936478c2..6187e12c35 100644 --- a/include/wx/xml/xml.h +++ b/include/wx/xml/xml.h @@ -1,9 +1,8 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xml.h +// Name: wx/xml/xml.h // Purpose: wxXmlDocument - XML parser & data holder class // Author: Vaclav Slavik // Created: 2000/03/05 -// RCS-ID: $Id$ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,6 +18,7 @@ #include "wx/string.h" #include "wx/object.h" #include "wx/list.h" +#include "wx/versioninfo.h" #ifdef WXMAKINGDLL_XML #define WXDLLIMPEXP_XML WXEXPORT @@ -35,7 +35,6 @@ class WXDLLIMPEXP_FWD_XML wxXmlIOHandler; class WXDLLIMPEXP_FWD_BASE wxInputStream; class WXDLLIMPEXP_FWD_BASE wxOutputStream; - // Represents XML node type. enum wxXmlNodeType { @@ -69,8 +68,8 @@ public: : m_name(name), m_value(value), m_next(next) {} virtual ~wxXmlAttribute() {} - wxString GetName() const { return m_name; } - wxString GetValue() const { return m_value; } + const wxString& GetName() const { return m_name; } + const wxString& GetValue() const { return m_value; } wxXmlAttribute *GetNext() const { return m_next; } void SetName(const wxString& name) { m_name = name; } @@ -115,7 +114,7 @@ public: virtual ~wxXmlNode(); - // copy ctor & operator=. Note that this does NOT copy syblings + // copy ctor & operator=. Note that this does NOT copy siblings // and parent pointer, i.e. m_parent and m_next will be NULL // after using copy ctor and are never unmodified by operator=. // On the other hand, it DOES copy children and attributes. @@ -216,6 +215,7 @@ private: int m_lineNo; // line number in original file, or -1 bool m_noConversion; // don't do encoding conversion - node is plain text + void DoFree(); void DoCopy(const wxXmlNode& node); }; @@ -257,7 +257,7 @@ public: const wxString& encoding = wxT("UTF-8")); wxXmlDocument(wxInputStream& stream, const wxString& encoding = wxT("UTF-8")); - virtual ~wxXmlDocument() { wxDELETE(m_root); } + virtual ~wxXmlDocument() { wxDELETE(m_docNode); } wxXmlDocument(const wxXmlDocument& doc); wxXmlDocument& operator=(const wxXmlDocument& doc); @@ -273,10 +273,13 @@ public: virtual bool Save(const wxString& filename, int indentstep = 2) const; virtual bool Save(wxOutputStream& stream, int indentstep = 2) const; - bool IsOk() const { return m_root != NULL; } + bool IsOk() const { return GetRoot() != NULL; } // Returns root node of the document. - wxXmlNode *GetRoot() const { return m_root; } + wxXmlNode *GetRoot() const; + // Returns the document node. + wxXmlNode *GetDocumentNode() const { return m_docNode; } + // Returns version of document (may be empty). const wxString& GetVersion() const { return m_version; } @@ -286,10 +289,13 @@ public: const wxString& GetFileEncoding() const { return m_fileEncoding; } // Write-access methods: - wxXmlNode *DetachRoot() { wxXmlNode *old=m_root; m_root=NULL; return old; } - void SetRoot(wxXmlNode *node) { wxDELETE(m_root); m_root = node; } + wxXmlNode *DetachDocumentNode() { wxXmlNode *old=m_docNode; m_docNode=NULL; return old; } + void SetDocumentNode(wxXmlNode *node) { wxDELETE(m_docNode); m_docNode = node; } + wxXmlNode *DetachRoot(); + void SetRoot(wxXmlNode *node); void SetVersion(const wxString& version) { m_version = version; } void SetFileEncoding(const wxString& encoding) { m_fileEncoding = encoding; } + void AppendToProlog(wxXmlNode *node); #if !wxUSE_UNICODE // Returns encoding of in-memory representation of the document @@ -299,13 +305,15 @@ public: void SetEncoding(const wxString& enc) { m_encoding = enc; } #endif + static wxVersionInfo GetLibraryVersionInfo(); + private: wxString m_version; wxString m_fileEncoding; #if !wxUSE_UNICODE wxString m_encoding; #endif - wxXmlNode *m_root; + wxXmlNode *m_docNode; void DoCopy(const wxXmlDocument& doc);