X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/xrc/xh_gauge.cpp diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp index 832c7e3960..99ce99a363 100644 --- a/src/xrc/xh_gauge.cpp +++ b/src/xrc/xh_gauge.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_gauge.cpp +// Name: src/xrc/xh_gauge.cpp // Purpose: XRC resource for wxGauge // Author: Bob Mitchell // Created: 2000/03/21 @@ -18,16 +18,23 @@ #if wxUSE_XRC && wxUSE_GAUGE #include "wx/xrc/xh_gauge.h" -#include "wx/gauge.h" + +#ifndef WX_PRECOMP + #include "wx/gauge.h" +#endif + +static const long DEFAULT_RANGE = 100; IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler) wxGaugeXmlHandler::wxGaugeXmlHandler() -: wxXmlResourceHandler() + :wxXmlResourceHandler() { XRC_ADD_STYLE(wxGA_HORIZONTAL); XRC_ADD_STYLE(wxGA_VERTICAL); +#if WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxGA_PROGRESSBAR); +#endif // WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxGA_SMOOTH); // windows only AddWindowStyles(); } @@ -38,7 +45,7 @@ wxObject *wxGaugeXmlHandler::DoCreateResource() control->Create(m_parentAsWindow, GetID(), - GetLong(wxT("range"), wxGAUGE_DEFAULT_RANGE), + GetLong(wxT("range"), DEFAULT_RANGE), GetPosition(), GetSize(), GetStyle(), wxDefaultValidator,