added logic to manage automatically allocated ids in-use status to avoid clashes...

[wxWidgets.git] / include / wx / xml / xml.h

diff --git a/include/wx/xml/xml.h b/include/wx/xml/xml.h
index 030f4d34c1fdff871cb2c1a4ed5ea36de48e62d7..22f3e8978b03bc16ae3a292ea27f42a38451eca6 100644 (file)
--- a/include/wx/xml/xml.h
+++ b/include/wx/xml/xml.h
@@ -103,10 +103,16 @@ class WXDLLIMPEXP_XML wxXmlNode
 {
 public:
     wxXmlNode()
-        : m_attrs(NULL), m_parent(NULL), m_children(NULL), m_next(NULL) {}
+        : m_attrs(NULL), m_parent(NULL), m_children(NULL), m_next(NULL),
+          m_lineNo(-1)
+    {
+    }
+
     wxXmlNode(wxXmlNode *parent, wxXmlNodeType type,
               const wxString& name, const wxString& content = wxEmptyString,
-              wxXmlAttribute *attrs = NULL, wxXmlNode *next = NULL);
+              wxXmlAttribute *attrs = NULL, wxXmlNode *next = NULL,
+              int lineNo = -1);
+
     virtual ~wxXmlNode();
 
     // copy ctor & operator=. Note that this does NOT copy syblings
@@ -118,7 +124,8 @@ public:
 
     // user-friendly creation:
     wxXmlNode(wxXmlNodeType type, const wxString& name,
-              const wxString& content = wxEmptyString);
+              const wxString& content = wxEmptyString,
+              int lineNo = -1);
     virtual void AddChild(wxXmlNode *child);
     virtual bool InsertChild(wxXmlNode *child, wxXmlNode *before_node);
     virtual bool RemoveChild(wxXmlNode *child);
@@ -152,6 +159,8 @@ public:
                          const wxString& defaultVal) const;
     bool HasAttribute(const wxString& attrName) const;
 
+    int GetLineNumber() const { return m_lineNo; }
+
     void SetType(wxXmlNodeType type) { m_type = type; }
     void SetName(const wxString& name) { m_name = name; }
     void SetContent(const wxString& con) { m_content = con; }
@@ -202,6 +211,7 @@ private:
     wxString m_content;
     wxXmlAttribute *m_attrs;
     wxXmlNode *m_parent, *m_children, *m_next;
+    int m_lineNo; // line number in original file, or -1 
 
     void DoCopy(const wxXmlNode& node);
 };