X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..7843d11bdca4860661bdb9b571373706c9f02456:/src/xrc/xh_tree.cpp

diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index cb0cde7e60..f3ee4c65a6 100644
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -22,28 +22,36 @@
 #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 = wxStaticCast(m_instance, wxTreeCtrl);
-
-   if (!tree)
-       tree = new wxTreeCtrl;
+    XRC_MAKE_INSTANCE(tree, wxTreeCtrl)
 
-   tree->Create( m_parentAsWindow,
+    tree->Create(m_parentAsWindow,
                 GetID(),
                 GetPosition(), GetSize(),
-                GetStyle(),
+                GetStyle(_T("style"), wxTR_DEFAULT_STYLE),
                 wxDefaultValidator,
                 GetName());
 
@@ -52,11 +60,7 @@ wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
     return tree;
 }
 
-
-
 bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTreeCtrl"));
 }
-
-