X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80fdcdb90ef779185492dab676d461fc34933312..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/msw/spinctrl.h diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h index fcc3a80fb1..a9163a3901 100644 --- a/include/wx/msw/spinctrl.h +++ b/include/wx/msw/spinctrl.h @@ -30,7 +30,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins); class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton { public: - wxSpinCtrl() { } + wxSpinCtrl() { Init(); } wxSpinCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, @@ -41,6 +41,8 @@ public: int min = 0, int max = 100, int initial = 0, const wxString& name = wxT("wxSpinCtrl")) { + Init(); + Create(parent, id, value, pos, size, style, min, max, initial, name); } @@ -60,6 +62,11 @@ public: // another wxTextCtrl-like method void SetSelection(long from, long to); + // wxSpinCtrlBase methods + virtual int GetBase() const; + virtual bool SetBase(int base); + + // implementation only from now on // ------------------------------- @@ -109,6 +116,7 @@ protected: virtual void DoGetPosition(int *x, int *y) const; virtual void DoMoveWindow(int x, int y, int width, int height); virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; virtual void DoGetSize(int *width, int *height) const; virtual void DoGetClientSize(int *x, int *y) const; #if wxUSE_TOOLTIPS @@ -143,6 +151,15 @@ protected: bool m_blockEvent; private: + // Common part of all ctors. + void Init(); + + // Adjust the text control style depending on whether we need to enter only + // digits or may need to enter something else (e.g. "-" sign, "x" + // hexadecimal prefix, ...) in it. + void UpdateBuddyStyle(); + + DECLARE_DYNAMIC_CLASS(wxSpinCtrl) DECLARE_EVENT_TABLE() wxDECLARE_NO_COPY_CLASS(wxSpinCtrl);