Kaydet (Commit) 3f1682f3 authored tarafından Caolán McNamara's avatar Caolán McNamara

check internal children against prefix rather than equality

Change-Id: I972a0fb4eb86dcafa230f82251d3f9c3cbed7f2b
üst 2056f93f
...@@ -1867,12 +1867,12 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) ...@@ -1867,12 +1867,12 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader)
if (VclFrame *pFrameParent = dynamic_cast<VclFrame*>(pParent)) if (VclFrame *pFrameParent = dynamic_cast<VclFrame*>(pParent))
pFrameParent->designate_label(pCurrentChild); pFrameParent->designate_label(pCurrentChild);
} }
if (sInternalChild.equals("vbox") || sInternalChild.equals("messagedialog-vbox")) if (sInternalChild.startsWith("vbox") || sInternalChild.startsWith("messagedialog-vbox"))
{ {
if (Dialog *pBoxParent = dynamic_cast<Dialog*>(pParent)) if (Dialog *pBoxParent = dynamic_cast<Dialog*>(pParent))
pBoxParent->set_content_area(static_cast<VclBox*>(pCurrentChild)); pBoxParent->set_content_area(static_cast<VclBox*>(pCurrentChild));
} }
else if (sInternalChild.equals("action_area") || sInternalChild.equals("messagedialog-action_area")) else if (sInternalChild.startsWith("action_area") || sInternalChild.startsWith("messagedialog-action_area"))
{ {
Window *pContentArea = pCurrentChild->GetParent(); Window *pContentArea = pCurrentChild->GetParent();
assert(pContentArea && pContentArea->GetType() == WINDOW_CONTAINER); assert(pContentArea && pContentArea->GetType() == WINDOW_CONTAINER);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment