X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d6954b87d910969226ffade9714db7429211f3..1d529ef7eed851db9d007821decb9639e4e7fc16:/contrib/src/xrc/xh_tree.cpp diff --git a/contrib/src/xrc/xh_tree.cpp b/contrib/src/xrc/xh_tree.cpp index 2e6f9f64f2..f3ee4c65a6 100644 --- a/contrib/src/xrc/xh_tree.cpp +++ b/contrib/src/xrc/xh_tree.cpp @@ -22,36 +22,45 @@ #include "wx/xrc/xh_tree.h" #include "wx/treectrl.h" +IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrlXmlHandler, wxXmlResourceHandler) wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler() : wxXmlResourceHandler() { - ADD_STYLE(wxTR_HAS_BUTTONS); - ADD_STYLE(wxTR_EDIT_LABELS); - ADD_STYLE(wxTR_MULTIPLE); + XRC_ADD_STYLE(wxTR_EDIT_LABELS); + XRC_ADD_STYLE(wxTR_NO_BUTTONS); + XRC_ADD_STYLE(wxTR_HAS_BUTTONS); + XRC_ADD_STYLE(wxTR_TWIST_BUTTONS); + XRC_ADD_STYLE(wxTR_NO_LINES); + XRC_ADD_STYLE(wxTR_FULL_ROW_HIGHLIGHT); + XRC_ADD_STYLE(wxTR_LINES_AT_ROOT); + XRC_ADD_STYLE(wxTR_HIDE_ROOT); + XRC_ADD_STYLE(wxTR_ROW_LINES); + XRC_ADD_STYLE(wxTR_HAS_VARIABLE_ROW_HEIGHT); + XRC_ADD_STYLE(wxTR_SINGLE); + XRC_ADD_STYLE(wxTR_MULTIPLE); + XRC_ADD_STYLE(wxTR_EXTENDED); + XRC_ADD_STYLE(wxTR_DEFAULT_STYLE); 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(_T("style"), wxTR_DEFAULT_STYLE), + wxDefaultValidator, + GetName()); + SetupWindow(tree); return tree; } - - bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxTreeCtrl")); } - -