updated wxTreeCtrl styles in XRC

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/xrc/xh_tree.cpp b/contrib/src/xrc/xh_tree.cpp
index 2307e3d3066a58a7417b7182d06de09dbeca3a42..ada2a31489f3d35c97ed8344051261e9bff67a88 100644 (file)
--- a/contrib/src/xrc/xh_tree.cpp
+++ b/contrib/src/xrc/xh_tree.cpp
@@ -26,10 +26,20 @@
 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 +50,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());
 

diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index 2307e3d3066a58a7417b7182d06de09dbeca3a42..ada2a31489f3d35c97ed8344051261e9bff67a88 100644 (file)
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -26,10 +26,20 @@
 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 +50,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());