X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..aae91497f6ac36a76d3313cf405cae0f098ea1d1:/contrib/src/xrc/xh_gauge.cpp?ds=sidebyside diff --git a/contrib/src/xrc/xh_gauge.cpp b/contrib/src/xrc/xh_gauge.cpp index 4c692b9cbf..a52b8075aa 100644 --- a/contrib/src/xrc/xh_gauge.cpp +++ b/contrib/src/xrc/xh_gauge.cpp @@ -27,52 +27,46 @@ wxGaugeXmlHandler::wxGaugeXmlHandler() : wxXmlResourceHandler() { - ADD_STYLE( wxGA_HORIZONTAL ); - ADD_STYLE( wxGA_VERTICAL ); - ADD_STYLE( wxGA_PROGRESSBAR ); - ADD_STYLE( wxGA_SMOOTH ); // windows only + XRC_ADD_STYLE(wxGA_HORIZONTAL); + XRC_ADD_STYLE(wxGA_VERTICAL); + XRC_ADD_STYLE(wxGA_PROGRESSBAR); + XRC_ADD_STYLE(wxGA_SMOOTH); // windows only AddWindowStyles(); } wxObject *wxGaugeXmlHandler::DoCreateResource() { - wxGauge *control = wxStaticCast(m_instance, wxGauge); - - if (!control) - control = new wxGauge; + XRC_MAKE_INSTANCE(control, wxGauge) control->Create(m_parentAsWindow, GetID(), - GetLong( wxT("range"), wxGAUGE_DEFAULT_RANGE), + GetLong(wxT("range"), wxGAUGE_DEFAULT_RANGE), GetPosition(), GetSize(), GetStyle(), wxDefaultValidator, GetName()); - if( HasParam( wxT("value") )) + if( HasParam(wxT("value"))) { - control->SetValue( GetLong( wxT("value") )); + control->SetValue(GetLong(wxT("value"))); } - if( HasParam( wxT("shadow") )) + if( HasParam(wxT("shadow"))) { - control->SetShadowWidth( GetDimension( wxT("shadow") )); + control->SetShadowWidth(GetDimension(wxT("shadow"))); } - if( HasParam( wxT("bezel") )) + if( HasParam(wxT("bezel"))) { - control->SetBezelFace( GetDimension( wxT("bezel") )); + control->SetBezelFace(GetDimension(wxT("bezel"))); } SetupWindow(control); - + return control; } - - bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxGauge")); } - #endif // wxUSE_GAUGE