Don't keep entries for XRC resources that failed to load in wxXmlResource.

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

diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index 5bec60c713171c1e495ed34820f1d14ec0e1beb9..dc7e178161af6638c0239091284a03bc0f1e8ec8 100644 (file)
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_tree.cpp
-// Purpose:     XML resource for wxTreeCtrl
+// Purpose:     XRC resource for wxTreeCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_tree.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,39 +15,58 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_TREECTRL
+
 #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_DEFAULT_STYLE);
+#if WXWIN_COMPATIBILITY_2_8
+    XRC_ADD_STYLE(wxTR_EXTENDED);
+#endif
     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(wxT("style"), wxTR_DEFAULT_STYLE),
+                wxDefaultValidator,
+                GetName());
+
+    wxImageList *imagelist = GetImageList();
+    if ( imagelist )
+        tree->AssignImageList(imagelist);
+
     SetupWindow(tree);
-    
+
     return tree;
 }
 
-
-
 bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTreeCtrl"));
 }
 
-
+#endif // wxUSE_XRC && wxUSE_TREECTRL