X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..2028c33ab5a39a12bd410ac953731a56ad6377ba:/src/xrc/xh_stlin.cpp?ds=sidebyside diff --git a/src/xrc/xh_stlin.cpp b/src/xrc/xh_stlin.cpp index 5f9889a929..4db3dc7c89 100644 --- a/src/xrc/xh_stlin.cpp +++ b/src/xrc/xh_stlin.cpp @@ -7,10 +7,6 @@ // Copyright: (c) 2000 Brian Gavin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_stlin.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,25 +15,24 @@ #pragma hdrstop #endif +#if wxUSE_XRC && wxUSE_STATLINE + #include "wx/xrc/xh_stlin.h" #include "wx/statline.h" -#if wxUSE_STATLINE +IMPLEMENT_DYNAMIC_CLASS(wxStaticLineXmlHandler, wxXmlResourceHandler) -wxStaticLineXmlHandler::wxStaticLineXmlHandler() -: wxXmlResourceHandler() +wxStaticLineXmlHandler::wxStaticLineXmlHandler() +: wxXmlResourceHandler() { - ADD_STYLE(wxLI_HORIZONTAL); - ADD_STYLE(wxLI_VERTICAL); + XRC_ADD_STYLE(wxLI_HORIZONTAL); + XRC_ADD_STYLE(wxLI_VERTICAL); AddWindowStyles(); } wxObject *wxStaticLineXmlHandler::DoCreateResource() -{ - wxStaticLine *line = wxStaticCast(m_instance, wxStaticLine); - - if (!line) - line = new wxStaticLine; +{ + XRC_MAKE_INSTANCE(line, wxStaticLine) line->Create(m_parentAsWindow, GetID(), @@ -46,15 +41,13 @@ wxObject *wxStaticLineXmlHandler::DoCreateResource() GetName()); SetupWindow(line); - + return line; } - - bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxStaticLine")); } -#endif +#endif // wxUSE_XRC && wxUSE_STATLINE