X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..9d8fe14a97d1092989eecbe43c4e1f730fba17ad:/src/xrc/xh_spin.cpp?ds=sidebyside diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp index 3940024ef0..15e878c3d3 100644 --- a/src/xrc/xh_spin.cpp +++ b/src/xrc/xh_spin.cpp @@ -7,10 +7,6 @@ // Copyright: (c) 2000 Bob Mitchell and Verant Interactive // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_spin.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,27 +15,29 @@ #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 = wxStaticCast(m_instance, wxSpinButton); - - if (!control) - control = new wxSpinButton; +{ + XRC_MAKE_INSTANCE(control, wxSpinButton) control->Create(m_parentAsWindow, GetID(), @@ -47,16 +45,14 @@ wxObject *wxSpinButtonXmlHandler::DoCreateResource() 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) ); + 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")); @@ -66,38 +62,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