Patch 559673 and 561053

[wxWidgets.git] / contrib / src / xrc / xh_tree.cpp

diff --git a/contrib/src/xrc/xh_tree.cpp b/contrib/src/xrc/xh_tree.cpp
index 2e6f9f64f2aeb3913abeff4d32dd0f18a0cf115e..2947852e4a63426de7aec7f2e79a9f6e8cccc39e 100644 (file)
--- a/contrib/src/xrc/xh_tree.cpp
+++ b/contrib/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"));
 }
-
-