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

move Add/DeleteAttribute() implementations out of line to avoid deprecation warnings when including xml.h from user code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-16 23:34:21 +00:00
parent f35fdf7e4a
commit e13ce4a3d0
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,10 +129,8 @@ public:
virtual void AddChild(wxXmlNode *child); virtual void AddChild(wxXmlNode *child);
virtual bool InsertChild(wxXmlNode *child, wxXmlNode *before_node); virtual bool InsertChild(wxXmlNode *child, wxXmlNode *before_node);
virtual bool RemoveChild(wxXmlNode *child); virtual bool RemoveChild(wxXmlNode *child);
virtual void AddAttribute(const wxString& name, const wxString& value) virtual void AddAttribute(const wxString& name, const wxString& value);
{ AddProperty(name, value); } virtual bool DeleteAttribute(const wxString& name);
virtual bool DeleteAttribute(const wxString& name)
{ return DeleteProperty(name); }
// access methods: // access methods:
wxXmlNodeType GetType() const { return m_type; } wxXmlNodeType GetType() const { return m_type; }
@@ -170,8 +168,7 @@ public:
void SetChildren(wxXmlNode *child) { m_children = child; } void SetChildren(wxXmlNode *child) { m_children = child; }
void SetAttributes(wxXmlAttribute *attr) { m_attrs = attr; } void SetAttributes(wxXmlAttribute *attr) { m_attrs = attr; }
virtual void AddAttribute(wxXmlAttribute *attr) virtual void AddAttribute(wxXmlAttribute *attr);
{ AddProperty(attr); }
#if WXWIN_COMPATIBILITY_2_8 #if WXWIN_COMPATIBILITY_2_8
wxDEPRECATED( inline wxXmlAttribute *GetProperties() const ); wxDEPRECATED( inline wxXmlAttribute *GetProperties() const );

15
src/xml/xml.cpp
View File

@@ -252,6 +252,21 @@ bool wxXmlNode::RemoveChild(wxXmlNode *child)
} }
} }
void wxXmlNode::AddAttribute(const wxString& name, const wxString& value)
{
AddProperty(name, value);
}
void wxXmlNode::AddAttribute(wxXmlAttribute *attr)
{
AddProperty(attr);
}
bool wxXmlNode::DeleteAttribute(const wxString& name)
{
return DeleteProperty(name);
}
void wxXmlNode::AddProperty(const wxString& name, const wxString& value) void wxXmlNode::AddProperty(const wxString& name, const wxString& value)
{ {
AddProperty(new wxXmlAttribute(name, value, NULL)); AddProperty(new wxXmlAttribute(name, value, NULL));