X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/544fee32eeac1a4f6ca3e0c7c1b13ee24f1d1c1c..9c112555198f51fcec71106530cddba95a17f3dc:/src/xrc/xh_spin.cpp?ds=sidebyside diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp index 6419ef5cca..616537b27c 100644 --- a/src/xrc/xh_spin.cpp +++ b/src/xrc/xh_spin.cpp @@ -7,8 +7,8 @@ // Copyright: (c) 2000 Bob Mitchell and Verant Interactive // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "xh_spin.h" #endif @@ -19,13 +19,18 @@ #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() { XRC_ADD_STYLE(wxSP_HORIZONTAL); XRC_ADD_STYLE(wxSP_VERTICAL); @@ -35,7 +40,7 @@ wxSpinButtonXmlHandler::wxSpinButtonXmlHandler() } wxObject *wxSpinButtonXmlHandler::DoCreateResource() -{ +{ XRC_MAKE_INSTANCE(control, wxSpinButton) control->Create(m_parentAsWindow, @@ -48,7 +53,7 @@ wxObject *wxSpinButtonXmlHandler::DoCreateResource() control->SetRange(GetLong( wxT("min"), wxSP_DEFAULT_MIN), GetLong(wxT("max"), wxSP_DEFAULT_MAX)); SetupWindow(control); - + return control; } @@ -61,8 +66,12 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node) #if wxUSE_SPINCTRL -wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() -: wxXmlResourceHandler() +#include "wx/spinctrl.h" + +IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlXmlHandler, wxXmlResourceHandler) + +wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() +: wxXmlResourceHandler() { XRC_ADD_STYLE(wxSP_HORIZONTAL); XRC_ADD_STYLE(wxSP_VERTICAL); @@ -71,9 +80,9 @@ wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() } wxObject *wxSpinCtrlXmlHandler::DoCreateResource() -{ +{ XRC_MAKE_INSTANCE(control, wxSpinCtrl) - + control->Create(m_parentAsWindow, GetID(), GetText(wxT("value")), @@ -85,7 +94,7 @@ wxObject *wxSpinCtrlXmlHandler::DoCreateResource() GetName()); SetupWindow(control); - + return control; } @@ -95,3 +104,5 @@ bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node) } #endif // wxUSE_SPINCTRL + +#endif // wxUSE_XRC