X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/854e189f90dac9ba5e0239bca79aed64e8d6f46c..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/xrc/xh_slidr.cpp diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp index 10e16450cc..c34926df31 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 @@ -7,10 +7,6 @@ // Copyright: (c) 2000 Bob Mitchell and Verant Interactive // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_slidr.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,15 +15,18 @@ #pragma hdrstop #endif +#if wxUSE_XRC && wxUSE_SLIDER + #include "wx/xrc/xh_slidr.h" -#include "wx/slider.h" -#if wxUSE_SLIDER +#ifndef WX_PRECOMP + #include "wx/slider.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler) -wxSliderXmlHandler::wxSliderXmlHandler() -: wxXmlResourceHandler() +wxSliderXmlHandler::wxSliderXmlHandler() + :wxXmlResourceHandler() { XRC_ADD_STYLE(wxSL_HORIZONTAL); XRC_ADD_STYLE(wxSL_VERTICAL); @@ -39,16 +38,17 @@ wxSliderXmlHandler::wxSliderXmlHandler() XRC_ADD_STYLE(wxSL_BOTTOM); XRC_ADD_STYLE(wxSL_BOTH); XRC_ADD_STYLE(wxSL_SELRANGE); + XRC_ADD_STYLE(wxSL_INVERSE); AddWindowStyles(); } wxObject *wxSliderXmlHandler::DoCreateResource() -{ +{ XRC_MAKE_INSTANCE(control, wxSlider) control->Create(m_parentAsWindow, GetID(), - GetLong(wxT("value"), wxSL_DEFAULT_VALUE), + GetLong(wxT("value"), wxSL_DEFAULT_VALUE), GetLong(wxT("min"), wxSL_DEFAULT_MIN), GetLong(wxT("max"), wxSL_DEFAULT_MAX), GetPosition(), GetSize(), @@ -82,7 +82,7 @@ wxObject *wxSliderXmlHandler::DoCreateResource() } SetupWindow(control); - + return control; } @@ -91,4 +91,4 @@ bool wxSliderXmlHandler::CanHandle(wxXmlNode *node) return IsOfClass(node, wxT("wxSlider")); } -#endif +#endif // wxUSE_XRC && wxUSE_SLIDER