Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid code duplication between wxSpinCtrl XRC handlers

Browse Source 
Extract styles initialization into a function reused by both
wxSpinCtrlXmlHandler and wxSpinCtrlDoubleXmlHandler.

No real changes, this is a pure refactoring.
This commit is contained in:
Vadim Zeitlin
2018-01-10 17:31:23 +01:00
parent 80f4c8cde3
commit 74cf8370ce
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/xrc/xh_spin.cpp
View File

@@ -69,18 +69,23 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
static const float DEFAULT_INC = 1.; static const float DEFAULT_INC = 1.;
static void AddSpinCtrlStyles(wxXmlResourceHandler& handler)
{
handler.XRC_ADD_STYLE(wxSP_HORIZONTAL);
handler.XRC_ADD_STYLE(wxSP_VERTICAL);
handler.XRC_ADD_STYLE(wxSP_ARROW_KEYS);
handler.XRC_ADD_STYLE(wxSP_WRAP);
handler.XRC_ADD_STYLE(wxALIGN_LEFT);
handler.XRC_ADD_STYLE(wxALIGN_CENTER);
handler.XRC_ADD_STYLE(wxALIGN_RIGHT);
}
wxIMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlXmlHandler, wxXmlResourceHandler); wxIMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlXmlHandler, wxXmlResourceHandler);
wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
XRC_ADD_STYLE(wxSP_HORIZONTAL); AddSpinCtrlStyles(*this);
XRC_ADD_STYLE(wxSP_VERTICAL);
XRC_ADD_STYLE(wxSP_ARROW_KEYS);
XRC_ADD_STYLE(wxSP_WRAP);
XRC_ADD_STYLE(wxALIGN_LEFT);
XRC_ADD_STYLE(wxALIGN_CENTER);
XRC_ADD_STYLE(wxALIGN_RIGHT);
} }
wxObject *wxSpinCtrlXmlHandler::DoCreateResource() wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
@@ -117,13 +122,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDoubleXmlHandler, wxXmlResourceHandler);
wxSpinCtrlDoubleXmlHandler::wxSpinCtrlDoubleXmlHandler() wxSpinCtrlDoubleXmlHandler::wxSpinCtrlDoubleXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
XRC_ADD_STYLE(wxSP_HORIZONTAL); AddSpinCtrlStyles(*this);
XRC_ADD_STYLE(wxSP_VERTICAL);
XRC_ADD_STYLE(wxSP_ARROW_KEYS);
XRC_ADD_STYLE(wxSP_WRAP);
XRC_ADD_STYLE(wxALIGN_LEFT);
XRC_ADD_STYLE(wxALIGN_CENTER);
XRC_ADD_STYLE(wxALIGN_RIGHT);
} }
wxObject *wxSpinCtrlDoubleXmlHandler::DoCreateResource() wxObject *wxSpinCtrlDoubleXmlHandler::DoCreateResource()