Fix compilation with MinGW -std=c++11 option.

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

diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index 5c3e346f785394c44f3656693043084178f71970..b2db5a257ec0439976db6eb061c7412a0a0c2c9a 100644 (file)
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_tree.cpp
+// Name:        src/xrc/xh_tree.cpp

 // Purpose:     XRC resource for wxTreeCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // Purpose:     XRC resource for wxTreeCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09


@@ -37,8 +37,10 @@ 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();
 }
 
     AddWindowStyles();
 }
 


@@ -49,10 +51,14 @@ wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
     tree->Create(m_parentAsWindow,
                 GetID(),
                 GetPosition(), GetSize(),
     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);
 
     return tree;
     SetupWindow(tree);
 
     return tree;