X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56d2f75071fc2a29ec10abe97c5a908bb35f30f4..219a5f10c0e5efc3aad7ff3d050a92e7fed88806:/contrib/src/xml/xh_spin.cpp?ds=inline diff --git a/contrib/src/xml/xh_spin.cpp b/contrib/src/xml/xh_spin.cpp index 320813c999..689fe6f21a 100644 --- a/contrib/src/xml/xh_spin.cpp +++ b/contrib/src/xml/xh_spin.cpp @@ -31,20 +31,21 @@ wxSpinButtonXmlHandler::wxSpinButtonXmlHandler() ADD_STYLE( wxSP_VERTICAL ); ADD_STYLE( wxSP_ARROW_KEYS ); ADD_STYLE( wxSP_WRAP ); + AddWindowStyles(); } wxObject *wxSpinButtonXmlHandler::DoCreateResource() { - wxSpinButton *control = new wxSpinButton(m_ParentAsWindow, + wxSpinButton *control = new wxSpinButton(m_parentAsWindow, GetID(), GetPosition(), GetSize(), - GetStyle( _T("style"), wxSP_VERTICAL | wxSP_ARROW_KEYS ), + GetStyle( wxT("style"), wxSP_VERTICAL | wxSP_ARROW_KEYS ), GetName() ); - control->SetValue( GetLong( _T("value"), wxSP_DEFAULT_VALUE) ); - control->SetRange( GetLong( _T("min"), wxSP_DEFAULT_MIN), - GetLong( _T("max"), wxSP_DEFAULT_MAX) ); + 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; @@ -54,7 +55,7 @@ wxObject *wxSpinButtonXmlHandler::DoCreateResource() bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node) { - return node->GetName() == _T("spinbutton"); + return node->GetName() == wxT("spinbutton"); } #endif // wxUSE_SPINBTN @@ -72,14 +73,14 @@ wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() wxObject *wxSpinCtrlXmlHandler::DoCreateResource() { - wxSpinCtrl *control = new wxSpinCtrl(m_ParentAsWindow, + wxSpinCtrl *control = new wxSpinCtrl(m_parentAsWindow, GetID(), - GetText(_T("label")), + GetText(wxT("value")), GetPosition(), GetSize(), - GetStyle( _T("style"), wxSP_ARROW_KEYS ), - GetLong( _T("min"), wxSP_DEFAULT_MIN), - GetLong( _T("max"), wxSP_DEFAULT_MAX), - GetLong( _T("value"), wxSP_DEFAULT_VALUE), + 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() ); @@ -92,7 +93,7 @@ wxObject *wxSpinCtrlXmlHandler::DoCreateResource() bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node) { - return node->GetName() == _T("spinctrl"); + return IsOfClass(node, wxT("wxSpinCtrl")); } #endif // wxUSE_SPINCTRL