Updates to MIME-types and wxFileDialog code for better

[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 2307e3d3066a58a7417b7182d06de09dbeca3a42..f3ee4c65a687b7a4d03e9aeaba2c27446fdff358 100644 (file)
--- a/contrib/src/xrc/xh_tree.cpp
+++ b/contrib/src/xrc/xh_tree.cpp
@@ -22,14 +22,25 @@
 #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() 
 {

-    XRC_ADD_STYLE(wxTR_HIDE_ROOT);
-    XRC_ADD_STYLE(wxTR_HAS_BUTTONS);

     XRC_ADD_STYLE(wxTR_EDIT_LABELS);
     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_MULTIPLE);

+    XRC_ADD_STYLE(wxTR_EXTENDED);
+    XRC_ADD_STYLE(wxTR_DEFAULT_STYLE);

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 


@@ -40,7 +51,7 @@ wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
     tree->Create(m_parentAsWindow,
                 GetID(),
                 GetPosition(), GetSize(),
     tree->Create(m_parentAsWindow,
                 GetID(),
                 GetPosition(), GetSize(),

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

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