X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0148745bb7a9b1e1046229577fbd802eb9f03e8f..a6982a3882f976f5764c0bac808cc3fd64c9a7f3:/src/xrc/xh_tree.cpp

diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index 5c892ebc77..ef66aa4334 100644
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_tree.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -41,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_EXTENDED);
     XRC_ADD_STYLE(wxTR_DEFAULT_STYLE);
+#if WXWIN_COMPATIBILITY_2_8
+    XRC_ADD_STYLE(wxTR_EXTENDED);
+#endif
     AddWindowStyles();
 }
 
@@ -57,6 +55,10 @@ wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
                 wxDefaultValidator,
                 GetName());
 
+    wxImageList *imagelist = GetImageList();
+    if ( imagelist )
+        tree->AssignImageList(imagelist);
+
     SetupWindow(tree);
 
     return tree;