X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0148745bb7a9b1e1046229577fbd802eb9f03e8f..f239a20092359e3c914adb79bd39f3f5d2b2e06f:/src/xrc/xh_tree.cpp diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp index 5c892ebc77..b2db5a257e 100644 --- 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 @@ -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(); } @@ -53,10 +51,14 @@ wxObject *wxTreeCtrlXmlHandler::DoCreateResource() tree->Create(m_parentAsWindow, GetID(), GetPosition(), GetSize(), - GetStyle(_T("style"), wxTR_DEFAULT_STYLE), + GetStyle(wxT("style"), wxTR_DEFAULT_STYLE), wxDefaultValidator, GetName()); + wxImageList *imagelist = GetImageList(); + if ( imagelist ) + tree->AssignImageList(imagelist); + SetupWindow(tree); return tree;