X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/854e189f90dac9ba5e0239bca79aed64e8d6f46c..de9a407728e5f47ed416365da9c07798ad0b0b26:/src/xrc/xh_slidr.cpp diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp index 10e16450cc..3a787c4283 100644 --- a/src/xrc/xh_slidr.cpp +++ b/src/xrc/xh_slidr.cpp @@ -7,8 +7,8 @@ // Copyright: (c) 2000 Bob Mitchell and Verant Interactive // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "xh_slidr.h" #endif @@ -19,15 +19,15 @@ #pragma hdrstop #endif +#if wxUSE_XRC && wxUSE_SLIDER + #include "wx/xrc/xh_slidr.h" #include "wx/slider.h" -#if wxUSE_SLIDER - IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler) -wxSliderXmlHandler::wxSliderXmlHandler() -: wxXmlResourceHandler() +wxSliderXmlHandler::wxSliderXmlHandler() +: wxXmlResourceHandler() { XRC_ADD_STYLE(wxSL_HORIZONTAL); XRC_ADD_STYLE(wxSL_VERTICAL); @@ -39,16 +39,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 +83,7 @@ wxObject *wxSliderXmlHandler::DoCreateResource() } SetupWindow(control); - + return control; } @@ -91,4 +92,4 @@ bool wxSliderXmlHandler::CanHandle(wxXmlNode *node) return IsOfClass(node, wxT("wxSlider")); } -#endif +#endif // wxUSE_XRC && wxUSE_SLIDER