X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22a35096a0a9c3fe4d3d32b8d68a361126ef9677..21b5902b816cb65bcfe2629fb8b85deb0f14d807:/src/univ/spinbutt.cpp?ds=sidebyside diff --git a/src/univ/spinbutt.cpp b/src/univ/spinbutt.cpp index 93e674502a..499f53a1ec 100644 --- a/src/univ/spinbutt.cpp +++ b/src/univ/spinbutt.cpp @@ -38,9 +38,6 @@ // implementation of wxSpinButton // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) -IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) - // ---------------------------------------------------------------------------- // creation // ---------------------------------------------------------------------------- @@ -98,7 +95,7 @@ bool wxSpinButton::Create(wxWindow *parent, wxDefaultValidator, name) ) return false; - SetBestSize(size); + SetInitialSize(size); CreateInputHandler(wxINP_HANDLER_SPINBTN); @@ -324,7 +321,7 @@ void wxSpinButton::CalcArrowRects(wxRect *rect1, wxRect *rect2) const } } -wxScrollArrows::Arrow wxSpinButton::HitTest(const wxPoint& pt) const +wxScrollArrows::Arrow wxSpinButton::HitTestArrow(const wxPoint& pt) const { wxRect rectArrow1, rectArrow2; CalcArrowRects(&rectArrow1, &rectArrow2); @@ -355,6 +352,14 @@ bool wxSpinButton::PerformAction(const wxControlAction& action, return true; } +/* static */ +wxInputHandler *wxSpinButton::GetStdInputHandler(wxInputHandler *handlerDef) +{ + static wxStdSpinButtonInputHandler s_handler(handlerDef); + + return &s_handler; +} + // ---------------------------------------------------------------------------- // wxStdSpinButtonInputHandler // ----------------------------------------------------------------------------