X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d6954b87d910969226ffade9714db7429211f3..6636ac1ea9f6f716dc51ca17c72516ebb08eb972:/src/xrc/xh_spin.cpp?ds=inline diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp index 3888c6daa3..3398ffaad1 100644 --- a/src/xrc/xh_spin.cpp +++ b/src/xrc/xh_spin.cpp @@ -7,7 +7,7 @@ // Copyright: (c) 2000 Bob Mitchell and Verant Interactive // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - + #ifdef __GNUG__ #pragma implementation "xh_spin.h" #endif @@ -19,40 +19,44 @@ #pragma hdrstop #endif +#if wxUSE_XRC + #include "wx/xrc/xh_spin.h" -#include "wx/spinctrl.h" #if wxUSE_SPINBTN -wxSpinButtonXmlHandler::wxSpinButtonXmlHandler() -: wxXmlResourceHandler() +#include "wx/spinbutt.h" + +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,38 +66,43 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node) #if wxUSE_SPINCTRL -wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() -: wxXmlResourceHandler() +#include "wx/spinctrl.h" + +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")); } #endif // wxUSE_SPINCTRL + +#endif // wxUSE_XRC