X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..0be027c45bc1890ca714552b8571500278e620e5:/src/xrc/xh_slidr.cpp diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp index 3aa21bd9f2..b888d71de9 100644 --- a/src/xrc/xh_slidr.cpp +++ b/src/xrc/xh_slidr.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_slidr.cpp +// Name: src/xrc/xh_slidr.cpp // Purpose: XRC resource for wxSlider // Author: Bob Mitchell // Created: 2000/03/21 @@ -18,12 +18,20 @@ #if wxUSE_XRC && wxUSE_SLIDER #include "wx/xrc/xh_slidr.h" -#include "wx/slider.h" + +#ifndef WX_PRECOMP + #include "wx/slider.h" +#endif + +static const long DEFAULT_VALUE = 0; +static const long DEFAULT_MIN = 0; +static const long DEFAULT_MAX = 100; + IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler) wxSliderXmlHandler::wxSliderXmlHandler() -: wxXmlResourceHandler() + :wxXmlResourceHandler() { XRC_ADD_STYLE(wxSL_HORIZONTAL); XRC_ADD_STYLE(wxSL_VERTICAL); @@ -45,9 +53,9 @@ wxObject *wxSliderXmlHandler::DoCreateResource() control->Create(m_parentAsWindow, GetID(), - GetLong(wxT("value"), wxSL_DEFAULT_VALUE), - GetLong(wxT("min"), wxSL_DEFAULT_MIN), - GetLong(wxT("max"), wxSL_DEFAULT_MAX), + GetLong(wxT("value"), DEFAULT_VALUE), + GetLong(wxT("min"), DEFAULT_MIN), + GetLong(wxT("max"), DEFAULT_MAX), GetPosition(), GetSize(), GetStyle(), wxDefaultValidator, @@ -55,7 +63,7 @@ wxObject *wxSliderXmlHandler::DoCreateResource() if( HasParam(wxT("tickfreq"))) { - control->SetTickFreq(GetLong(wxT("tickfreq")), 0); + control->SetTickFreq(GetLong(wxT("tickfreq"))); } if( HasParam(wxT("pagesize"))) {