use wxEmptyString as default value to return from GetAttribute()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/xml/xml.h b/include/wx/xml/xml.h
index d54d9c5735c4404473988a03ff3114f07e9e4f6b..37ffa2099c82698d65485d5e983385e4751f2017 100644 (file)
--- a/include/wx/xml/xml.h
+++ b/include/wx/xml/xml.h
@@ -154,7 +154,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; }


@@ -208,7 +208,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);
 };


@@ -262,7 +262,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;

diff --git a/interface/xml/xml.h b/interface/xml/xml.h
index 56305fd7499df64dd4c2e005b8c4f4da70b79452..c584e3e5eaa3a22039f1ad2476ee95b859ffdd55 100644 (file)
--- a/interface/xml/xml.h
+++ b/interface/xml/xml.h
@@ -77,7 +77,7 @@ public:
     */
     bool GetAttribute(const wxString& attrName, wxString* value) const;
     const wxString  GetAttribute(const wxString& attrName,
     */
     bool GetAttribute(const wxString& attrName, wxString* value) const;
     const wxString  GetAttribute(const wxString& attrName,

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

     //@}
 
     /**
     //@}
 
     /**


@@ -132,9 +132,9 @@ public:
         This function is very useful since the XML snippet @c
         "tagnametagcontent/tagname" is represented by
         expat with the following tag tree:
         This function is very useful since the XML snippet @c
         "tagnametagcontent/tagname" is represented by
         expat with the following tag tree:

-        
+

         or eventually:
         or eventually:

-        
+

         An empty string is returned if the node has no children of type @c
         wxXML_TEXT_NODE or @c wxXML_CDATA_SECTION_NODE, or if the content of the first child of such types is empty.
     */
         An empty string is returned if the node has no children of type @c
         wxXML_TEXT_NODE or @c wxXML_CDATA_SECTION_NODE, or if the content of the first child of such types is empty.
     */