X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d6954b87d910969226ffade9714db7429211f3..859e65deb544f039ff4a889da0a8047a0b8c9ca2:/src/xrc/xh_tree.cpp?ds=sidebyside diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp index 2e6f9f64f2..2947852e4a 100644 --- a/src/xrc/xh_tree.cpp +++ b/src/xrc/xh_tree.cpp @@ -26,32 +26,29 @@ wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler() : wxXmlResourceHandler() { - ADD_STYLE(wxTR_HAS_BUTTONS); - ADD_STYLE(wxTR_EDIT_LABELS); - ADD_STYLE(wxTR_MULTIPLE); + XRC_ADD_STYLE(wxTR_HAS_BUTTONS); + XRC_ADD_STYLE(wxTR_EDIT_LABELS); + XRC_ADD_STYLE(wxTR_MULTIPLE); AddWindowStyles(); } - wxObject *wxTreeCtrlXmlHandler::DoCreateResource() { - wxTreeCtrl *tree = new wxTreeCtrl(m_parentAsWindow, - GetID(), - GetPosition(), GetSize(), - GetStyle(), - wxDefaultValidator, - GetName()); - + XRC_MAKE_INSTANCE(tree, wxTreeCtrl) + + tree->Create(m_parentAsWindow, + GetID(), + GetPosition(), GetSize(), + GetStyle(), + wxDefaultValidator, + GetName()); + SetupWindow(tree); return tree; } - - bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxTreeCtrl")); } - -