diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-13 15:51:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-15 10:32:29 +0200 |
| commit | 74dbe58f1e5b6f4f281e13f348c8952b1086877a (patch) | |
| tree | fda8bd8374592491d3e64b02e4f3ca13879cf2d4 /vcl | |
| parent | fa21f301ddef575baad9a3aa8564199285e6d90b (diff) | |
convert Link<> to typed
Change-Id: I2ef1e5fe5c6dc65c254b3a16b0b12fca5caba16e
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/slider.cxx | 13 | ||||
| -rw-r--r-- | vcl/source/control/spinfld.cxx | 8 |
2 files changed, 13 insertions, 8 deletions
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 62a331c73adf..dd95df121deb 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -842,13 +842,18 @@ void Slider::ImplSetFieldLink(const Link<>& rLink) if (mpLinkedField != nullptr) { mpLinkedField->SetModifyHdl(rLink); - mpLinkedField->SetUpHdl(rLink); - mpLinkedField->SetDownHdl(rLink); - mpLinkedField->SetFirstHdl(rLink); - mpLinkedField->SetLastHdl(rLink); + mpLinkedField->SetUpHdl(LINK(this, Slider, LinkedFieldSpinnerHdl)); + mpLinkedField->SetDownHdl(LINK(this, Slider, LinkedFieldSpinnerHdl)); + mpLinkedField->SetFirstHdl(LINK(this, Slider, LinkedFieldSpinnerHdl)); + mpLinkedField->SetLastHdl(LINK(this, Slider, LinkedFieldSpinnerHdl)); } } +IMPL_LINK_NOARG_TYPED(Slider, LinkedFieldSpinnerHdl, SpinField&, void) +{ + if (mpLinkedField) + mpLinkedField->GetModifyHdl().Call(&mpLinkedField); +} IMPL_LINK_NOARG_TYPED(Slider, LinkedFieldLoseFocusHdl, Control&, void) { if (mpLinkedField) diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 1eb0fa39bf8d..b541b341c500 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -383,22 +383,22 @@ void SpinField::dispose() void SpinField::Up() { - ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_UP, [this] () { maUpHdlLink.Call(this); } ); + ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_UP, [this] () { maUpHdlLink.Call(*this); } ); } void SpinField::Down() { - ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_DOWN, [this] () { maDownHdlLink.Call(this); } ); + ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_DOWN, [this] () { maDownHdlLink.Call(*this); } ); } void SpinField::First() { - ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_FIRST, [this] () { maFirstHdlLink.Call(this); } ); + ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_FIRST, [this] () { maFirstHdlLink.Call(*this); } ); } void SpinField::Last() { - ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_LAST, [this] () { maLastHdlLink.Call(this); } ); + ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_LAST, [this] () { maLastHdlLink.Call(*this); } ); } void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) |