X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d6954b87d910969226ffade9714db7429211f3..32b171bc0e6ba4b91c0c4b820b120a906c6dc646:/src/xrc/xh_scrol.cpp?ds=sidebyside diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp index 0171894f87..3916339bd5 100644 --- a/src/xrc/xh_scrol.cpp +++ b/src/xrc/xh_scrol.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_scrol.cpp +// Name: src/xrc/xh_scrol.cpp // Purpose: XRC resource for wxScrollBar // Author: Brian Gavin // Created: 2000/09/09 @@ -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,45 +15,49 @@ #pragma hdrstop #endif +#if wxUSE_XRC && wxUSE_SCROLLBAR + #include "wx/xrc/xh_scrol.h" -#include "wx/scrolbar.h" +#ifndef WX_PRECOMP + #include "wx/scrolbar.h" +#endif + +IMPLEMENT_DYNAMIC_CLASS(wxScrollBarXmlHandler, wxXmlResourceHandler) -wxScrollBarXmlHandler::wxScrollBarXmlHandler() -: wxXmlResourceHandler() +wxScrollBarXmlHandler::wxScrollBarXmlHandler() +: wxXmlResourceHandler() { - ADD_STYLE( wxSB_HORIZONTAL ); - ADD_STYLE( wxSB_VERTICAL ); + XRC_ADD_STYLE(wxSB_HORIZONTAL); + XRC_ADD_STYLE(wxSB_VERTICAL); AddWindowStyles(); } wxObject *wxScrollBarXmlHandler::DoCreateResource() -{ - wxScrollBar *control = new wxScrollBar(m_parentAsWindow, - GetID(), - GetPosition(), GetSize(), - GetStyle(), - wxDefaultValidator, - GetName() - ); - control->SetScrollbar(GetLong( wxT("value"), 0), +{ + XRC_MAKE_INSTANCE(control, wxScrollBar) + + control->Create(m_parentAsWindow, + GetID(), + GetPosition(), GetSize(), + GetStyle(), + wxDefaultValidator, + GetName()); + + control->SetScrollbar(GetLong( wxT("value"), 0), GetLong( wxT("thumbsize"),1), GetLong( wxT("range"), 10), - GetLong( wxT("pagesize"),1) - ); - - + GetLong( wxT("pagesize"),1)); + SetupWindow(control); - + CreateChildren(control); + return control; } - - bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxScrollBar")); } - - +#endif // wxUSE_XRC && wxUSE_SCROLLBAR