fixed array tests compilation and a bug in obj array test

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

diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index cb0cde7e60ea273fe51ddfc7dd1ad9dba157e760..2947852e4a63426de7aec7f2e79a9f6e8cccc39e 100644 (file)
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -26,21 +26,17 @@
 wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler() 
 : wxXmlResourceHandler() 
 {
 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();
 }
 
     AddWindowStyles();
 }
 

-

 wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
 { 
 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(),
                 GetID(),
                 GetPosition(), GetSize(),
                 GetStyle(),


@@ -52,11 +48,7 @@ wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
     return tree;
 }
 
     return tree;
 }
 

-
-

 bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTreeCtrl"));
 }
 bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTreeCtrl"));
 }

-
-