more 64 bit correctness fixes

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

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

- 
+

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


@@ -19,44 +19,52 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #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());
 
     SetupWindow(tree);
                 wxDefaultValidator,
                 GetName());
 
     SetupWindow(tree);

-    
+

     return tree;
 }
 
     return tree;
 }
 

-
-

 bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTreeCtrl"));
 }
 
 bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTreeCtrl"));
 }
 

-
+#endif // wxUSE_XRC