X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c575e45a24711793f98959a1f394a9e528c3129a..8946ede10c2702c7acbb194fe8bd2793d7fb8358:/src/xrc/xh_slidr.cpp?ds=sidebyside diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp index 8e4b7e74a7..9f6e07cf31 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 @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "xh_slidr.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -22,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); @@ -39,6 +43,7 @@ wxSliderXmlHandler::wxSliderXmlHandler() XRC_ADD_STYLE(wxSL_BOTTOM); XRC_ADD_STYLE(wxSL_BOTH); XRC_ADD_STYLE(wxSL_SELRANGE); + XRC_ADD_STYLE(wxSL_INVERSE); AddWindowStyles(); } @@ -48,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,