added insert_at property for the object nodes (patch 1185138)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -625,7 +625,18 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
|
||||
}
|
||||
|
||||
if ( !dnode )
|
||||
dest.AddChild(new wxXmlNode(*node));
|
||||
{
|
||||
static const wxChar *AT_END = wxT("end");
|
||||
wxString insert_pos = node->GetPropVal(wxT("insert_at"), AT_END);
|
||||
if ( insert_pos == AT_END )
|
||||
{
|
||||
dest.AddChild(new wxXmlNode(*node));
|
||||
}
|
||||
else if ( insert_pos == wxT("begin") )
|
||||
{
|
||||
dest.InsertChild(new wxXmlNode(*node), dest.GetChildren());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().Length() )
|
||||
|
Reference in New Issue
Block a user