X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd47af27e12ee66b3e9eed6f1711e516f36dc837..da2f117200f2933478d571d2d9e6d636dbbd0e4c:/src/xrc/xh_spin.cpp diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp index 15e878c3d3..5684e74777 100644 --- a/src/xrc/xh_spin.cpp +++ b/src/xrc/xh_spin.cpp @@ -15,7 +15,7 @@ #pragma hdrstop #endif -#if wxUSE_XRC +#if wxUSE_XRC #include "wx/xrc/xh_spin.h" @@ -23,6 +23,10 @@ #include "wx/spinbutt.h" +static const long DEFAULT_VALUE = 0; +static const long DEFAULT_MIN = 0; +static const long DEFAULT_MAX = 100; + IMPLEMENT_DYNAMIC_CLASS(wxSpinButtonXmlHandler, wxXmlResourceHandler) wxSpinButtonXmlHandler::wxSpinButtonXmlHandler() @@ -45,9 +49,9 @@ 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"), DEFAULT_VALUE)); + control->SetRange(GetLong( wxT("min"), DEFAULT_MIN), + GetLong(wxT("max"), DEFAULT_MAX)); SetupWindow(control); return control; @@ -73,6 +77,9 @@ wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() 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() @@ -83,10 +90,10 @@ wxObject *wxSpinCtrlXmlHandler::DoCreateResource() 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), + GetStyle(wxT("style"), wxSP_ARROW_KEYS | wxALIGN_RIGHT), + GetLong(wxT("min"), DEFAULT_MIN), + GetLong(wxT("max"), DEFAULT_MAX), + GetLong(wxT("value"), DEFAULT_VALUE), GetName()); SetupWindow(control);