renamed wxXmlProperty to wxXmlAttribute, plus implied method names changes (bug #1751761)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-07-14 10:07:41 +00:00
parent ab0f37b97b
commit 288b6107e1
16 changed files with 291 additions and 232 deletions

View File

@@ -648,7 +648,7 @@ used internally by the HTML classes.
\begin{twocollist}\itemsep=0pt
\twocolitem{\helpref{wxXmlDocument}{wxxmldocument}}{A class to parse XML files.}
\twocolitem{\helpref{wxXmlNode}{wxxmlnode}}{A class which represents XML nodes.}
\twocolitem{\helpref{wxXmlProperty}{wxxmlproperty}}{A class which represents XML properties.}
\twocolitem{\helpref{wxXmlAttribute}{wxxmlattribute}}{A class which represents XML properties.}
\end{twocollist}
{\large {\bf XML-based resource system classes}}

View File

@@ -453,7 +453,7 @@
\input wizpage.tex
\input xmldocument.tex
\input xmlnode.tex
\input xmlproperty.tex
\input xmlattr.tex
\input xmlres.tex
\input xmlresh.tex
\input zipstrm.tex

View File

@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Name: xmlnode.tex
%% Purpose: wxXmlProperty documentation
%% Purpose: wxXmlAttribute documentation
%% Author: Francesco Montorsi
%% Created: 2006-04-18
%% RCS-ID: $Id$
@@ -8,7 +8,7 @@
%% License: wxWindows license
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{\class{wxXmlProperty}}\label{wxxmlproperty}
\section{\class{wxXmlAttribute}}\label{wxxmlattribute}
Represents a node property.
@@ -30,53 +30,53 @@ No base class
\latexignore{\rtfignore{\wxheading{Members}}}
\membersection{wxXmlProperty::wxXmlProperty}\label{wxxmlpropertywxxmlproperty}
\membersection{wxXmlAttribute::wxXmlAttribute}\label{wxxmlattributewxxmlattribute}
\func{}{wxXmlProperty}{\void}
\func{}{wxXmlAttribute}{\void}
\func{}{wxXmlProperty}{\param{const wxString\& }{name}, \param{const wxString\& }{value}, \param{wxXmlProperty* }{next = NULL}}
\func{}{wxXmlAttribute}{\param{const wxString\& }{name}, \param{const wxString\& }{value}, \param{wxXmlAttribute* }{next = NULL}}
Creates the property with given {\it name} and {\it value}.
If {\it next} is not NULL, then sets it as sibling of this property.
\membersection{wxXmlProperty::\destruct{wxXmlProperty}}\label{wxxmlpropertydtor}
\membersection{wxXmlAttribute::\destruct{wxXmlAttribute}}\label{wxxmlattributedtor}
\func{}{\destruct{wxXmlProperty}}{\void}
\func{}{\destruct{wxXmlAttribute}}{\void}
The virtual destructor.
\membersection{wxXmlProperty::GetName}\label{wxxmlpropertygetname}
\membersection{wxXmlAttribute::GetName}\label{wxxmlattributegetname}
\constfunc{wxString}{GetName}{\void}
Returns the name of this property.
\membersection{wxXmlProperty::GetNext}\label{wxxmlpropertygetnext}
\membersection{wxXmlAttribute::GetNext}\label{wxxmlattributegetnext}
\constfunc{wxXmlProperty*}{GetNext}{\void}
\constfunc{wxXmlAttribute*}{GetNext}{\void}
Returns the sibling of this property or NULL if there are no siblings.
\membersection{wxXmlProperty::GetValue}\label{wxxmlpropertygetvalue}
\membersection{wxXmlAttribute::GetValue}\label{wxxmlattributegetvalue}
\constfunc{wxString}{GetValue}{\void}
Returns the value of this property.
\membersection{wxXmlProperty::SetName}\label{wxxmlpropertysetname}
\membersection{wxXmlAttribute::SetName}\label{wxxmlattributesetname}
\func{void}{SetName}{\param{const wxString\& }{name}}
Sets the name of this property.
\membersection{wxXmlProperty::SetNext}\label{wxxmlpropertysetnext}
\membersection{wxXmlAttribute::SetNext}\label{wxxmlattributesetnext}
\func{void}{SetNext}{\param{wxXmlProperty* }{next}}
\func{void}{SetNext}{\param{wxXmlAttribute* }{next}}
Sets the sibling of this property.
\membersection{wxXmlProperty::SetValue}\label{wxxmlpropertysetvalue}
\membersection{wxXmlAttribute::SetValue}\label{wxxmlattributesetvalue}
\func{void}{SetValue}{\param{const wxString\& }{value}}

View File

@@ -36,12 +36,12 @@ while (child) {
...
// process properties of <tag1>
wxString propvalue1 =
child->GetPropVal(wxT("prop1"),
// process attributes of <tag1>
wxString attrvalue1 =
child->GetAttribute(wxT("attr1"),
wxT("default-value"));
wxString propvalue2 =
child->GetPropVal(wxT("prop2"),
wxString attrvalue2 =
child->GetAttribute(wxT("attr2"),
wxT("default-value"));
...
@@ -86,7 +86,7 @@ doc.Save(wxT("myfile2.xml")); // myfile2.xml != myfile.xml
\wxheading{See also}
\helpref{wxXmlNode}{wxxmlnode}, \helpref{wxXmlProperty}{wxxmlproperty}
\helpref{wxXmlNode}{wxxmlnode}, \helpref{wxXmlAttribute}{wxxmlattribute}
\latexignore{\rtfignore{\wxheading{Members}}}
@@ -166,7 +166,7 @@ Returns the root node of the document.
Returns the version of document.
This is the value in the {\tt <?xml version="1.0"?>} header of the XML document.
If the version property was not explicitely given in the header, this function
If the version attribute was not explicitely given in the header, this function
returns an empty string.

View File

@@ -12,8 +12,8 @@
Represents a node in an XML document. See \helpref{wxXmlDocument}{wxxmldocument}.
Node has a name and may have content and properties. Most common node types are
{\tt wxXML\_TEXT\_NODE} (name and properties are irrelevant) and
Node has a name and may have content and attributes. Most common node types are
{\tt wxXML\_TEXT\_NODE} (name and attributes are irrelevant) and
{\tt wxXML\_ELEMENT\_NODE} (e.g. in {\tt <title>hi</title>} there is an element
with name="title", irrelevant content and one child ({\tt wxXML\_TEXT\_NODE}
with content="hi").
@@ -57,7 +57,7 @@ enum wxXmlNodeType
\wxheading{See also}
\helpref{wxXmlDocument}{wxxmldocument}, \helpref{wxXmlProperty}{wxxmlproperty}
\helpref{wxXmlDocument}{wxxmldocument}, \helpref{wxXmlAttribute}{wxxmlattribute}
\latexignore{\rtfignore{\wxheading{Members}}}
@@ -65,7 +65,7 @@ enum wxXmlNodeType
\membersection{wxXmlNode::wxXmlNode}\label{wxxmlnodewxxmlnode}
\func{}{wxXmlNode}{\param{wxXmlNode* }{parent}, \param{wxXmlNodeType }{type}, \param{const wxString\& }{name}, \param{const wxString\& }{content = wxEmptyString}, \param{wxXmlProperty* }{props = \NULL}, \param{wxXmlNode* }{next = \NULL}}
\func{}{wxXmlNode}{\param{wxXmlNode* }{parent}, \param{wxXmlNodeType }{type}, \param{const wxString\& }{name}, \param{const wxString\& }{content = wxEmptyString}, \param{wxXmlAttribute* }{attrs = \NULL}, \param{wxXmlNode* }{next = \NULL}}
\wxheading{Parameters}
@@ -78,7 +78,7 @@ constructor and it shouldn't be done again.}
\docparam{name}{The name of the node. This is the string which appears between angular brackets.}
\docparam{content}{The content of the node. Only meaningful when {\it type} is
{\tt wxXML\_TEXT\_NODE} or {\tt wxXML\_CDATA\_SECTION\_NODE}.}
\docparam{props}{If not \NULL, this \helpref{wxXmlProperty}{wxxmlproperty} object
\docparam{attrs}{If not \NULL, this \helpref{wxXmlAttribute}{wxxmlattribute} object
and its eventual siblings are attached to the node.}
\docparam{next}{If not \NULL, this node and its eventual siblings are attached to
the node.}
@@ -92,7 +92,7 @@ and parent pointer, i.e. \helpref{GetParent()}{wxxmlnodegetparent} and
\helpref{GetNext()}{wxxmlnodegetnext} will return \NULL
after using copy ctor and are never unmodified by operator=.
On the other hand, it DOES copy children and properties.
On the other hand, it DOES copy children and attributes.
\func{}{wxXmlNode}{\param{wxXmlNodeType }{type}, \param{const wxString\& }{name}, \param{const wxString\& }{content = wxEmptyString}}
@@ -104,7 +104,7 @@ A simplified version of the first constructor form, assuming a \NULL parent.
\func{}{\destruct{wxXmlNode}}{\void}
The virtual destructor. Deletes attached children and properties.
The virtual destructor. Deletes attached children and attributes.
\membersection{wxXmlNode::AddChild}\label{wxxmlnodeaddchild}
@@ -113,21 +113,21 @@ The virtual destructor. Deletes attached children and properties.
Adds the given node as child of this node. To attach a second children to this node, use the
\helpref{SetNext()}{wxxmlnodesetnext} function of the {\it child} node.
\membersection{wxXmlNode::AddProperty}\label{wxxmlnodeaddproperty}
\membersection{wxXmlNode::AddAttribute}\label{wxxmlnodeaddattribute}
\func{void}{AddProperty}{\param{const wxString\& }{name}, \param{const wxString\& }{value}}
\func{void}{AddAttribute}{\param{const wxString\& }{name}, \param{const wxString\& }{value}}
Appends a property with given {\it name} and {\it value} to the list of properties for this node.
Appends a attribute with given {\it name} and {\it value} to the list of attributes for this node.
\func{void}{AddProperty}{\param{wxXmlProperty* }{prop}}
\func{void}{AddAttribute}{\param{wxXmlAttribute* }{attr}}
Appends the given property to the list of properties for this node.
Appends given attribute to the list of attributes for this node.
\membersection{wxXmlNode::DeleteProperty}\label{wxxmlnodedeleteproperty}
\membersection{wxXmlNode::DeleteAttribute}\label{wxxmlnodedeleteattribute}
\func{bool}{DeleteProperty}{\param{const wxString\& }{name}}
\func{bool}{DeleteAttribute}{\param{const wxString\& }{name}}
Removes the first properties which has the given {\it name} from the list of properties for this node.
Removes the first attributes which has the given {\it name} from the list of attributes for this node.
\membersection{wxXmlNode::GetChildren}\label{wxxmlnodegetchildren}
@@ -198,23 +198,23 @@ Returns a pointer to the sibling of this node or \NULL if there are no siblings.
Returns a pointer to the parent of this node or \NULL if this node has no parent.
\membersection{wxXmlNode::GetPropVal}\label{wxxmlnodegetpropval}
\membersection{wxXmlNode::GetAttribute}\label{wxxmlnodegetattribute}
\constfunc{bool}{GetPropVal}{\param{const wxString\& }{propName}, \param{wxString* }{value}}
\constfunc{bool}{GetAttribute}{\param{const wxString\& }{attrName}, \param{wxString* }{value}}
Returns \true if a property named {\it propName} could be found.
If the {\it value} pointer is not \NULL, the value of that property is saved there.
Returns \true if a attribute named {\it attrName} could be found.
If the {\it value} pointer is not \NULL, the value of that attribute is saved there.
\constfunc{wxString}{GetPropVal}{\param{const wxString\& }{propName}, \param{const wxString\& }{defaultVal}}
\constfunc{wxString}{GetAttribute}{\param{const wxString\& }{attrName}, \param{const wxString\& }{defaultVal}}
Returns the value of the property named {\it propName} if it does exist.
Returns the value of the attribute named {\it attrName} if it does exist.
If it does not exist, the {\it defaultVal} is returned.
\membersection{wxXmlNode::GetProperties}\label{wxxmlnodegetproperties}
\membersection{wxXmlNode::GetAttributes}\label{wxxmlnodegetattributes}
\constfunc{wxXmlProperty *}{GetProperties}{\void}
\constfunc{wxXmlAttribute *}{GetAttributes}{\void}
Return a pointer to the first property of this node.
Return a pointer to the first attribute of this node.
\membersection{wxXmlNode::GetType}\label{wxxmlnodegettype}
@@ -223,11 +223,11 @@ Return a pointer to the first property of this node.
Returns the type of this node.
\membersection{wxXmlNode::HasProp}\label{wxxmlnodehasprop}
\membersection{wxXmlNode::HasAttribute}\label{wxxmlnodehasattribute}
\constfunc{bool}{HasProp}{\param{const wxString\& }{propName}}
\constfunc{bool}{HasAttribute}{\param{const wxString\& }{attrName}}
Returns \true if this node has a property named {\it propName}.
Returns \true if this node has a attribute named {\it attrName}.
\membersection{wxXmlNode::InsertChild}\label{wxxmlnodeinsertchild}
@@ -288,12 +288,12 @@ sibling node.
Sets as parent the given node. The caller is responsible to delete any previously present
parent node.
\membersection{wxXmlNode::SetProperties}\label{wxxmlnodesetproperties}
\membersection{wxXmlNode::SetAttributes}\label{wxxmlnodesetattributes}
\func{void}{SetProperties}{\param{wxXmlProperty* }{prop}}
\func{void}{SetAttributes}{\param{wxXmlAttribute* }{attr}}
Sets as first property the given wxXmlProperty object.
The caller is responsible to delete any previously present properties attached to this node.
Sets as first attribute the given wxXmlAttribute object.
The caller is responsible to delete any previously present attributes attached to this node.
\membersection{wxXmlNode::SetType}\label{wxxmlnodesettype}