merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -494,8 +494,7 @@ void EditorFrame::OnTreeSel(wxTreeEvent& event)
}
RecursivelyExpand(m_TreeCtrl, event.GetItem());
PreviewFrame::Get()->Preview(node,m_Resource->GetRoot()->GetPropVal(
wxT("version"), wxT("0.0.0.0")));
PreviewFrame::Get()->Preview(node,m_Resource);
}
}
@@ -509,8 +508,7 @@ void EditorFrame::OnToolbar(wxCommandEvent& event)
{
XmlTreeData* dt = (XmlTreeData*)m_TreeCtrl->GetItemData(m_TreeCtrl->GetSelection());;
if (dt != NULL && dt->Node != NULL)
PreviewFrame::Get()->Preview(dt->Node,m_Resource->GetRoot()->GetPropVal(
wxT("version"), wxT("0.0.0.0")));
PreviewFrame::Get()->Preview(dt->Node, m_Resource);
break;
}