X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86118733afe2f6539c21a3e9b3c1836eddf058e5..9d8fe14a97d1092989eecbe43c4e1f730fba17ad:/src/xrc/xh_tree.cpp diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp index ada2a31489..1591d626a7 100644 --- a/src/xrc/xh_tree.cpp +++ b/src/xrc/xh_tree.cpp @@ -7,10 +7,6 @@ // 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" @@ -19,12 +15,15 @@ #pragma hdrstop #endif +#if wxUSE_XRC && wxUSE_TREECTRL + #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); @@ -38,13 +37,15 @@ 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(); } wxObject *wxTreeCtrlXmlHandler::DoCreateResource() -{ +{ XRC_MAKE_INSTANCE(tree, wxTreeCtrl) tree->Create(m_parentAsWindow, @@ -55,7 +56,7 @@ wxObject *wxTreeCtrlXmlHandler::DoCreateResource() GetName()); SetupWindow(tree); - + return tree; } @@ -63,3 +64,5 @@ bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxTreeCtrl")); } + +#endif // wxUSE_XRC && wxUSE_TREECTRL