implementation changes to closer follow MSW, crashes fixed

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

diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index cb0cde7e60ea273fe51ddfc7dd1ad9dba157e760..f3ee4c65a687b7a4d03e9aeaba2c27446fdff358 100644 (file)
--- 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"
 
 #include "wx/xrc/xh_tree.h"
 #include "wx/treectrl.h"
 

+IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrlXmlHandler, wxXmlResourceHandler)

 
 wxTreeCtrlXmlHandler::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();
 }
 
     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(),
                 GetID(),
                 GetPosition(), GetSize(),

-                GetStyle(),
+                GetStyle(_T("style"), wxTR_DEFAULT_STYLE),

                 wxDefaultValidator,
                 GetName());
 
                 wxDefaultValidator,
                 GetName());
 


@@ -52,11 +60,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"));
 }

-
-