X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78d14f80e9a72041ede52c30d912ec5cef21b1b3..6a205442c40cd6e22efab15fd7170a0aeab99cae:/contrib/src/xrc/xh_spin.cpp?ds=inline diff --git a/contrib/src/xrc/xh_spin.cpp b/contrib/src/xrc/xh_spin.cpp index bda1eebf90..5748e7443a 100644 --- a/contrib/src/xrc/xh_spin.cpp +++ b/contrib/src/xrc/xh_spin.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_spin.cpp -// Purpose: XML resource for wxSpinButton +// Purpose: XRC resource for wxSpinButton // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ @@ -24,35 +24,36 @@ #if wxUSE_SPINBTN +IMPLEMENT_DYNAMIC_CLASS(wxSpinButtonXmlHandler, wxXmlResourceHandler) + wxSpinButtonXmlHandler::wxSpinButtonXmlHandler() : wxXmlResourceHandler() { - ADD_STYLE( wxSP_HORIZONTAL ); - ADD_STYLE( wxSP_VERTICAL ); - ADD_STYLE( wxSP_ARROW_KEYS ); - ADD_STYLE( wxSP_WRAP ); + XRC_ADD_STYLE(wxSP_HORIZONTAL); + XRC_ADD_STYLE(wxSP_VERTICAL); + XRC_ADD_STYLE(wxSP_ARROW_KEYS); + XRC_ADD_STYLE(wxSP_WRAP); AddWindowStyles(); } wxObject *wxSpinButtonXmlHandler::DoCreateResource() { - wxSpinButton *control = new wxSpinButton(m_parentAsWindow, - GetID(), - GetPosition(), GetSize(), - GetStyle( wxT("style"), wxSP_VERTICAL | wxSP_ARROW_KEYS ), - GetName() - ); - - control->SetValue( GetLong( wxT("value"), wxSP_DEFAULT_VALUE) ); - control->SetRange( GetLong( wxT("min"), wxSP_DEFAULT_MIN), - GetLong( wxT("max"), wxSP_DEFAULT_MAX) ); + XRC_MAKE_INSTANCE(control, wxSpinButton) + + control->Create(m_parentAsWindow, + GetID(), + GetPosition(), GetSize(), + GetStyle(wxT("style"), wxSP_VERTICAL | wxSP_ARROW_KEYS), + GetName()); + + control->SetValue(GetLong( wxT("value"), wxSP_DEFAULT_VALUE)); + control->SetRange(GetLong( wxT("min"), wxSP_DEFAULT_MIN), + GetLong(wxT("max"), wxSP_DEFAULT_MAX)); SetupWindow(control); return control; } - - bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxSpinButton")); @@ -62,35 +63,36 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node) #if wxUSE_SPINCTRL +IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlXmlHandler, wxXmlResourceHandler) + wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() : wxXmlResourceHandler() { - ADD_STYLE( wxSP_HORIZONTAL ); - ADD_STYLE( wxSP_VERTICAL ); - ADD_STYLE( wxSP_ARROW_KEYS ); - ADD_STYLE( wxSP_WRAP ); + XRC_ADD_STYLE(wxSP_HORIZONTAL); + XRC_ADD_STYLE(wxSP_VERTICAL); + XRC_ADD_STYLE(wxSP_ARROW_KEYS); + XRC_ADD_STYLE(wxSP_WRAP); } wxObject *wxSpinCtrlXmlHandler::DoCreateResource() { - wxSpinCtrl *control = new wxSpinCtrl(m_parentAsWindow, - GetID(), - GetText(wxT("value")), - GetPosition(), GetSize(), - GetStyle( wxT("style"), wxSP_ARROW_KEYS ), - GetLong( wxT("min"), wxSP_DEFAULT_MIN), - GetLong( wxT("max"), wxSP_DEFAULT_MAX), - GetLong( wxT("value"), wxSP_DEFAULT_VALUE), - GetName() - ); + XRC_MAKE_INSTANCE(control, wxSpinCtrl) + + control->Create(m_parentAsWindow, + GetID(), + GetText(wxT("value")), + GetPosition(), GetSize(), + GetStyle(wxT("style"), wxSP_ARROW_KEYS), + GetLong(wxT("min"), wxSP_DEFAULT_MIN), + GetLong(wxT("max"), wxSP_DEFAULT_MAX), + GetLong(wxT("value"), wxSP_DEFAULT_VALUE), + GetName()); SetupWindow(control); return control; } - - bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxSpinCtrl"));