reordering for CW compiles, setting control to opaque because of incorrect erases...

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

diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index 2307e3d3066a58a7417b7182d06de09dbeca3a42..d9ee3ad6d6cf1e655ef29e3d49dc4e14d9838fb9 100644 (file)
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xh_tree.h"
 #endif
 
 #pragma implementation "xh_tree.h"
 #endif
 


@@ -19,33 +19,46 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_TREECTRL
+

 #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();
 }
 
 wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
     AddWindowStyles();
 }
 
 wxObject *wxTreeCtrlXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(tree, wxTreeCtrl)
 
     tree->Create(m_parentAsWindow,
                 GetID(),
                 GetPosition(), GetSize(),
     XRC_MAKE_INSTANCE(tree, wxTreeCtrl)
 
     tree->Create(m_parentAsWindow,
                 GetID(),
                 GetPosition(), GetSize(),

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

                 wxDefaultValidator,
                 GetName());
 
     SetupWindow(tree);
                 wxDefaultValidator,
                 GetName());
 
     SetupWindow(tree);

-    
+

     return tree;
 }
 
     return tree;
 }
 


@@ -53,3 +66,5 @@ bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTreeCtrl"));
 }
 {
     return IsOfClass(node, wxT("wxTreeCtrl"));
 }

+
+#endif // wxUSE_XRC && wxUSE_TREECTRL