Correctly determine best wxPropertyGrid width.

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

diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index f3ee4c65a687b7a4d03e9aeaba2c27446fdff358..dc7e178161af6638c0239091284a03bc0f1e8ec8 100644 (file)
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -19,13 +15,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_TREECTRL
+

 #include "wx/xrc/xh_tree.h"
 #include "wx/treectrl.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrlXmlHandler, wxXmlResourceHandler)
 
 #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_EDIT_LABELS);
     XRC_ADD_STYLE(wxTR_NO_BUTTONS);
 {
     XRC_ADD_STYLE(wxTR_EDIT_LABELS);
     XRC_ADD_STYLE(wxTR_NO_BUTTONS);


@@ -39,24 +37,30 @@ wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler()
     XRC_ADD_STYLE(wxTR_HAS_VARIABLE_ROW_HEIGHT);
     XRC_ADD_STYLE(wxTR_SINGLE);
     XRC_ADD_STYLE(wxTR_MULTIPLE);
     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);
     XRC_ADD_STYLE(wxTR_DEFAULT_STYLE);

+#if WXWIN_COMPATIBILITY_2_8
+    XRC_ADD_STYLE(wxTR_EXTENDED);
+#endif

     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(_T("style"), wxTR_DEFAULT_STYLE),
+                GetStyle(wxT("style"), wxTR_DEFAULT_STYLE),

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

+    wxImageList *imagelist = GetImageList();
+    if ( imagelist )
+        tree->AssignImageList(imagelist);
+

     SetupWindow(tree);
     SetupWindow(tree);

-    
+

     return tree;
 }
 
     return tree;
 }
 


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

+
+#endif // wxUSE_XRC && wxUSE_TREECTRL