AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

optimized <object_ref> handling for the common case of simple reference with no overwrites

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2009-05-03 07:10:23 +00:00
parent a1eeda0be2
commit 44108a078f
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/xrc/xmlres.cpp
View File

@ -844,14 +844,31 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent,
return NULL;
}
wxXmlNode copy(*refNode);
MergeNodesOver(copy, *node, GetFileNameFromNode(node, Data()));
if ( !node->GetChildren() )
{
// In the typical, simple case, <object_ref> is used to link
// to another node and doesn't have any content of its own that
// would overwrite linked object's properties. In this case,
// we can simply create the resource from linked node.
// remember referenced object's file, see GetFileNameFromNode()
copy.AddAttribute(ATTR_INPUT_FILENAME,
GetFileNameFromNode(refNode, Data()));
return CreateResFromNode(refNode, parent, instance);
}
else
{
// In the more complicated (but rare) case, <object_ref> has
// subnodes that partially overwrite content of the referenced
// object. In this case, we need to merge both XML trees and
// load the resource from result of the merge.
return CreateResFromNode(&copy, parent, instance);
wxXmlNode copy(*refNode);
MergeNodesOver(copy, *node, GetFileNameFromNode(node, Data()));
// remember referenced object's file, see GetFileNameFromNode()
copy.AddAttribute(ATTR_INPUT_FILENAME,
GetFileNameFromNode(refNode, Data()));
return CreateResFromNode(&copy, parent, instance);
}
}
if (handlerToUse)