X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..99c4be680622f58a48a04dfe0835b59d2c41afea:/include/wx/msw/spinctrl.h diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h index 528ff7dcbf..8f200c0267 100644 --- a/include/wx/msw/spinctrl.h +++ b/include/wx/msw/spinctrl.h @@ -18,7 +18,7 @@ #include "wx/dynarray.h" -class WXDLLEXPORT wxSpinCtrl; +class WXDLLIMPEXP_FWD_CORE wxSpinCtrl; WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins); // ---------------------------------------------------------------------------- @@ -27,7 +27,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins); // control is clicked. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinCtrl : public wxSpinButton +class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton { public: wxSpinCtrl() { } @@ -65,7 +65,7 @@ public: virtual ~wxSpinCtrl(); - virtual void SetValue(int val) { wxSpinButton::SetValue(val); } + virtual void SetValue(int val); virtual int GetValue() const; virtual bool SetFont(const wxFont &font); virtual void SetFocus(); @@ -73,6 +73,8 @@ public: virtual bool Enable(bool enable = true); virtual bool Show(bool show = true); + virtual bool Reparent(wxWindowBase *newParent); + // wxSpinButton doesn't accept focus, but we do virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); } @@ -92,21 +94,38 @@ protected: virtual void DoMoveWindow(int x, int y, int width, int height); virtual wxSize DoGetBestSize() const; virtual void DoGetSize(int *width, int *height) const; + virtual void DoGetClientSize(int *x, int *y) const; #if wxUSE_TOOLTIPS virtual void DoSetToolTip( wxToolTip *tip ); #endif // wxUSE_TOOLTIPS - // the handler for wxSpinButton events - void OnSpinChange(wxSpinEvent& event); + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); + virtual bool MSWOnScroll(int orientation, WXWORD wParam, + WXWORD pos, WXHWND control); - // Handle processing of special keys + // handle processing of special keys void OnChar(wxKeyEvent& event); void OnSetFocus(wxFocusEvent& event); + void OnKillFocus(wxFocusEvent& event); + + // generate spin control update event with the given value + void SendSpinUpdate(int value); + + // called to ensure that the value is in the correct range + virtual void NormalizeValue(); + + + // the value of the control before the latest change (which might not have + // changed anything in fact -- this is why we need this field) + int m_oldValue; // the data for the "buddy" text ctrl WXHWND m_hwndBuddy; WXFARPROC m_wndProcBuddy; + // Block text update event after SetValue() + bool m_blockEvent; + // all existing wxSpinCtrls - this allows to find the one corresponding to // the given buddy window in GetSpinForTextCtrl() static wxArraySpins ms_allSpins;