Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxEmptyString as default value to return from GetAttribute()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-03-22 22:54:07 +00:00
parent feaa1ecb8c
commit b5cc5cbd66
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/xml/xml.h
View File

@@ -154,7 +154,7 @@ public:
wxXmlAttribute *GetAttributes() const { return m_attrs; } wxXmlAttribute *GetAttributes() const { return m_attrs; }
bool GetAttribute(const wxString& attrName, wxString *value) const; bool GetAttribute(const wxString& attrName, wxString *value) const;
wxString GetAttribute(const wxString& attrName, wxString GetAttribute(const wxString& attrName,
const wxString& defaultVal) const; const wxString& defaultVal = wxEmptyString) const;
bool HasAttribute(const wxString& attrName) const; bool HasAttribute(const wxString& attrName) const;
int GetLineNumber() const { return m_lineNo; } int GetLineNumber() const { return m_lineNo; }
@@ -208,7 +208,7 @@ private:
wxString m_content; wxString m_content;
wxXmlAttribute *m_attrs; wxXmlAttribute *m_attrs;
wxXmlNode *m_parent, *m_children, *m_next; 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); const wxString& encoding = wxT("UTF-8"), int flags = wxXMLDOC_NONE);
virtual bool Load(wxInputStream& stream, 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);
// Saves document as .xml file. // Saves document as .xml file.
virtual bool Save(const wxString& filename, int indentstep = 1) const; virtual bool Save(const wxString& filename, int indentstep = 1) const;
virtual bool Save(wxOutputStream& stream, int indentstep = 1) const; virtual bool Save(wxOutputStream& stream, int indentstep = 1) const;

6
interface/xml/xml.h
View File

@@ -77,7 +77,7 @@ public:
*/ */
bool GetAttribute(const wxString& attrName, wxString* value) const; bool GetAttribute(const wxString& attrName, wxString* value) const;
const wxString GetAttribute(const wxString& attrName, 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 This function is very useful since the XML snippet @c
"tagnametagcontent/tagname" is represented by "tagnametagcontent/tagname" is represented by
expat with the following tag tree: expat with the following tag tree:
or eventually: or eventually:
An empty string is returned if the node has no children of type @c 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. wxXML_TEXT_NODE or @c wxXML_CDATA_SECTION_NODE, or if the content of the first child of such types is empty.
*/ */