X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6cc78259af5f54b52b53523e8c9a22ec33a46060..033a5ff5c71ee7e787a3bc7e9be55ca0f5d80fa1:/src/xrc/xh_scrol.cpp diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp index ac99ba1b40..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,13 +15,18 @@ #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() { XRC_ADD_STYLE(wxSB_HORIZONTAL); XRC_ADD_STYLE(wxSB_VERTICAL); @@ -33,7 +34,7 @@ wxScrollBarXmlHandler::wxScrollBarXmlHandler() } wxObject *wxScrollBarXmlHandler::DoCreateResource() -{ +{ XRC_MAKE_INSTANCE(control, wxScrollBar) control->Create(m_parentAsWindow, @@ -43,14 +44,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; } @@ -58,3 +59,5 @@ bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxScrollBar")); } + +#endif // wxUSE_XRC && wxUSE_SCROLLBAR