fix typo in last commit

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

diff --git a/include/wx/xml/xml.h b/include/wx/xml/xml.h
index 22f3e8978b03bc16ae3a292ea27f42a38451eca6..939e5260980515ccf6255d6c5c8f3c1c39252260 100644 (file)
--- a/include/wx/xml/xml.h
+++ b/include/wx/xml/xml.h
@@ -127,12 +127,11 @@ public:
               const wxString& content = wxEmptyString,
               int lineNo = -1);
     virtual void AddChild(wxXmlNode *child);
               const wxString& content = wxEmptyString,
               int lineNo = -1);
     virtual void AddChild(wxXmlNode *child);

-    virtual bool InsertChild(wxXmlNode *child, wxXmlNode *before_node);
+    virtual bool InsertChild(wxXmlNode *child, wxXmlNode *followingNode);
+    virtual bool InsertChildAfter(wxXmlNode *child, wxXmlNode *precedingNode);

     virtual bool RemoveChild(wxXmlNode *child);
     virtual bool RemoveChild(wxXmlNode *child);

-    virtual void AddAttribute(const wxString& name, const wxString& value)
-        { AddProperty(name, value); }
-    virtual bool DeleteAttribute(const wxString& name)
-        { return DeleteProperty(name); }
+    virtual void AddAttribute(const wxString& name, const wxString& value);
+    virtual bool DeleteAttribute(const wxString& name);

 
     // access methods:
     wxXmlNodeType GetType() const { return m_type; }
 
     // access methods:
     wxXmlNodeType GetType() const { return m_type; }


@@ -156,7 +155,7 @@ public:
     wxXmlAttribute *GetAttributes() const { return m_attrs; }
     bool GetAttribute(const wxString& attrName, wxString *value) const;
     wxString GetAttribute(const wxString& attrName,
     wxXmlAttribute *GetAttributes() const { return m_attrs; }
     bool GetAttribute(const wxString& attrName, wxString *value) const;
     wxString GetAttribute(const wxString& attrName,

-                         const wxString& defaultVal) const;
+                          const wxString& defaultVal = wxEmptyString) const;

     bool HasAttribute(const wxString& attrName) const;
 
     int GetLineNumber() const { return m_lineNo; }
     bool HasAttribute(const wxString& attrName) const;
 
     int GetLineNumber() const { return m_lineNo; }


@@ -170,8 +169,7 @@ public:
     void SetChildren(wxXmlNode *child) { m_children = child; }
 
     void SetAttributes(wxXmlAttribute *attr) { m_attrs = attr; }
     void SetChildren(wxXmlNode *child) { m_children = child; }
 
     void SetAttributes(wxXmlAttribute *attr) { m_attrs = attr; }

-    virtual void AddAttribute(wxXmlAttribute *attr)
-        { AddProperty(attr); }
+    virtual void AddAttribute(wxXmlAttribute *attr);

 
 #if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED( inline wxXmlAttribute *GetProperties() const );
 
 #if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED( inline wxXmlAttribute *GetProperties() const );


@@ -211,7 +209,7 @@ private:
     wxString m_content;
     wxXmlAttribute *m_attrs;
     wxXmlNode *m_parent, *m_children, *m_next;
     wxString m_content;
     wxXmlAttribute *m_attrs;
     wxXmlNode *m_parent, *m_children, *m_next;

-    int m_lineNo; // line number in original file, or -1 
+    int m_lineNo; // line number in original file, or -1

 
     void DoCopy(const wxXmlNode& node);
 };
 
     void DoCopy(const wxXmlNode& node);
 };


@@ -265,7 +263,7 @@ public:
                       const wxString& encoding = wxT("UTF-8"), int flags = wxXMLDOC_NONE);
     virtual bool Load(wxInputStream& stream,
                       const wxString& encoding = wxT("UTF-8"), int flags = wxXMLDOC_NONE);
                       const wxString& encoding = wxT("UTF-8"), int flags = wxXMLDOC_NONE);
     virtual bool Load(wxInputStream& stream,
                       const wxString& encoding = wxT("UTF-8"), int flags = wxXMLDOC_NONE);

-    
+

     // Saves document as .xml file.
     virtual bool Save(const wxString& filename, int indentstep = 1) const;
     virtual bool Save(wxOutputStream& stream, int indentstep = 1) const;
     // Saves document as .xml file.
     virtual bool Save(const wxString& filename, int indentstep = 1) const;
     virtual bool Save(wxOutputStream& stream, int indentstep = 1) const;