diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 09:59:27 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 12:05:38 +0200 |
commit | c9b4c5681194a1cd3297a36d4a1f4e4cc3aac55a (patch) | |
tree | 2cb864a67b556f807ba175507296f7dfc5254944 /vcl/source/window/dockmgr.cxx | |
parent | 8c4a1663f5d93380268365d35a5581d8065df897 (diff) |
Use typed Idle::SetIdleHdl Link
Change-Id: I189937950325dc4ef663f7f49cb45f38f8537de9
Diffstat (limited to 'vcl/source/window/dockmgr.cxx')
-rw-r--r-- | vcl/source/window/dockmgr.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 7d0f826c4406..89be3dbc1887 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -51,8 +51,8 @@ private: ImplSVEvent * mnLastUserEvent; DECL_LINK(DockingHdl, void *); - DECL_LINK(DockTimerHdl, void *); - DECL_LINK(EndDockTimerHdl, void *); + DECL_LINK_TYPED(DockTimerHdl, Idle *, void); + DECL_LINK_TYPED(EndDockTimerHdl, Idle *, void); public: ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ); @@ -108,7 +108,7 @@ void ImplDockFloatWin2::dispose() FloatingWindow::dispose(); } -IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) +IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, DockTimerHdl, Idle *, void) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" ); @@ -132,11 +132,9 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ShowTracking( maDockRect, SHOWTRACK_BIG | SHOWTRACK_WINDOW ); maDockIdle.Start(); } - - return 0; } -IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl) +IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, EndDockTimerHdl, Idle *, void) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "enddocktimer called but not floating" ); @@ -151,8 +149,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl) { maEndDockIdle.Start(); } - - return 0; } IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) @@ -215,13 +211,13 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) maDockRect.TopLeft() ) ); mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ShowTracking( maDockRect, SHOWTRACK_BIG | SHOWTRACK_WINDOW ); maEndDockIdle.Stop(); - DockTimerHdl( this ); + DockTimerHdl( nullptr ); } else { mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->HideTracking(); maDockIdle.Stop(); - EndDockTimerHdl( this ); + EndDockTimerHdl( nullptr ); } } mbInMove = false; |