X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e4952db837344e369ff9ccc7ece1f7b8c207cf1..43ff861df48f0837dac98005dd397c5f127ca136:/include/wx/osx/spinctrl.h diff --git a/include/wx/osx/spinctrl.h b/include/wx/osx/spinctrl.h index a2f0c6223a..c9bd5422a0 100644 --- a/include/wx/osx/spinctrl.h +++ b/include/wx/osx/spinctrl.h @@ -20,7 +20,7 @@ // without tons of #ifdefs. // ---------------------------------------------------------------------------- -#if wxUSE_SPINBTN +#if wxUSE_SPINBTN #include "wx/containr.h" @@ -43,9 +43,9 @@ public: const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxTE_RIGHT, + long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, int min = 0, int max = 100, int initial = 0, - const wxString& name = _T("wxSpinCtrl")) + const wxString& name = wxT("wxSpinCtrl")) { Init(); Create(parent, id, value, pos, size, style, min, max, initial, name); @@ -56,9 +56,9 @@ public: const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxTE_RIGHT, + long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, int min = 0, int max = 100, int initial = 0, - const wxString& name = _T("wxSpinCtrl")); + const wxString& name = wxT("wxSpinCtrl")); // wxTextCtrl-like method void SetSelection(long from, long to); @@ -78,8 +78,8 @@ public: // implementation from now on // forward these functions to all subcontrols - virtual bool Enable(bool enable = TRUE); - virtual bool Show(bool show = TRUE); + virtual bool Enable(bool enable = true); + virtual bool Show(bool show = true); // get the subcontrols wxTextCtrl *GetText() const { return m_text; } @@ -107,10 +107,10 @@ private: // the subcontrols wxTextCtrl *m_text; wxSpinButton *m_btn; - + friend class wxSpinCtrlText; friend class wxSpinCtrlButton; - + int m_oldValue; private: DECLARE_EVENT_TABLE() @@ -135,9 +135,9 @@ public: const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxTE_RIGHT, + long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, int min = 0, int max = 100, int initial = 0, - const wxString& name = _T("wxSpinCtrl")) + const wxString& name = wxT("wxSpinCtrl")) { Create(parent, id, value, pos, size, style, min, max, initial, name); } @@ -147,9 +147,9 @@ public: const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxTE_RIGHT, + long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, int min = 0, int max = 100, int initial = 0, - const wxString& name = _T("wxSpinCtrl")) + const wxString& name = wxT("wxSpinCtrl")) { SetRange(min, max);