X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/544fee32eeac1a4f6ca3e0c7c1b13ee24f1d1c1c..2b0246530d08cf7724d94c70d631c166f9717c2c:/src/xrc/xh_scrol.cpp?ds=sidebyside diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp index 8077a49101..2d46ddb697 100644 --- a/src/xrc/xh_scrol.cpp +++ b/src/xrc/xh_scrol.cpp @@ -7,10 +7,6 @@ // Copyright: (c) 2000 Brian Gavin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_scrol.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_SCROLLBAR + #include "wx/xrc/xh_scrol.h" #include "wx/scrolbar.h" +IMPLEMENT_DYNAMIC_CLASS(wxScrollBarXmlHandler, wxXmlResourceHandler) -wxScrollBarXmlHandler::wxScrollBarXmlHandler() -: wxXmlResourceHandler() +wxScrollBarXmlHandler::wxScrollBarXmlHandler() +: wxXmlResourceHandler() { XRC_ADD_STYLE(wxSB_HORIZONTAL); XRC_ADD_STYLE(wxSB_VERTICAL); @@ -32,7 +31,7 @@ wxScrollBarXmlHandler::wxScrollBarXmlHandler() } wxObject *wxScrollBarXmlHandler::DoCreateResource() -{ +{ XRC_MAKE_INSTANCE(control, wxScrollBar) control->Create(m_parentAsWindow, @@ -42,13 +41,14 @@ wxObject *wxScrollBarXmlHandler::DoCreateResource() wxDefaultValidator, GetName()); - control->SetScrollbar(GetLong( wxT("value"), 0), + control->SetScrollbar(GetLong( wxT("value"), 0), GetLong( wxT("thumbsize"),1), GetLong( wxT("range"), 10), GetLong( wxT("pagesize"),1)); SetupWindow(control); - + CreateChildren(control); + return control; } @@ -56,3 +56,5 @@ bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxScrollBar")); } + +#endif // wxUSE_XRC && wxUSE_SCROLLBAR