diff options
Diffstat (limited to 'vcl')
31 files changed, 55 insertions, 55 deletions
diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx index b2e620a25c1c..d419f249eb8c 100644 --- a/vcl/backendtest/VisualBackendTest.cxx +++ b/vcl/backendtest/VisualBackendTest.cxx @@ -117,7 +117,7 @@ public: , mbAnimate(mnTest % mnNumberOfTests == mnNumberOfTests - 1) , mpVDev(VclPtr<VirtualDevice>::Create()) { - maUpdateTimer.SetTimeoutHdl(LINK(this, VisualBackendTestWindow, updateHdl)); + maUpdateTimer.SetInvokeHandler(LINK(this, VisualBackendTestWindow, updateHdl)); maUpdateTimer.SetPriority(TaskPriority::REPAINT); if (mbAnimate) { diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index e3afd5bf1a8d..48d6ec9ef9bf 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -151,7 +151,7 @@ struct ImplSVAppData DECL_STATIC_LINK(ImplSVAppData, ImplEndAllDialogsMsg, void*, void); DECL_STATIC_LINK(ImplSVAppData, ImplEndAllPopupsMsg, void*, void); DECL_STATIC_LINK(ImplSVAppData, ImplVclEventTestingHdl, void*, void); - DECL_LINK(VclEventTestingHdl, Idle*, void); + DECL_LINK(VclEventTestingHdl, Timer*, void); }; struct ImplSVGDIData diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 368ff74c8c60..cf076675dea8 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -64,7 +64,7 @@ private: void ImplUpdate(bool bRecurse, bool bRemoveDisabledEntries); void ActivateAllSubmenus(Menu* pMenuBar); - DECL_LINK(MenuBarHierarchyChangeHandler, Idle*, void); + DECL_LINK(MenuBarHierarchyChangeHandler, Timer*, void); public: GtkSalMenu( bool bMenuBar ); diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 153abc29e371..2b185790314a 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -273,12 +273,12 @@ HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal pSVData->maHelpData.mbKeyboardHelp = true; - maShowTimer.SetTimeoutHdl( LINK( this, HelpTextWindow, TimerHdl ) ); + maShowTimer.SetInvokeHandler( LINK( this, HelpTextWindow, TimerHdl ) ); maShowTimer.SetDebugName( "vcl::HelpTextWindow maShowTimer" ); const HelpSettings& rHelpSettings = pParent->GetSettings().GetHelpSettings(); maHideTimer.SetTimeout( rHelpSettings.GetTipTimeout() ); - maHideTimer.SetTimeoutHdl( LINK( this, HelpTextWindow, TimerHdl ) ); + maHideTimer.SetInvokeHandler( LINK( this, HelpTextWindow, TimerHdl ) ); maHideTimer.SetDebugName( "vcl::HelpTextWindow maHideTimer" ); } diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index a7c35545e17c..67a1bcbeb847 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -407,7 +407,7 @@ namespace } } -IMPL_LINK_NOARG(ImplSVAppData, VclEventTestingHdl, Idle *, void) +IMPL_LINK_NOARG(ImplSVAppData, VclEventTestingHdl, Timer *, void) { if (Application::AnyInput()) { @@ -458,7 +458,7 @@ void Application::Execute() { pSVData->maAppData.mnEventTestLimit = 50; pSVData->maAppData.mpEventTestingIdle = new Idle("eventtesting"); - pSVData->maAppData.mpEventTestingIdle->SetIdleHdl(LINK(&(pSVData->maAppData), ImplSVAppData, VclEventTestingHdl)); + pSVData->maAppData.mpEventTestingIdle->SetInvokeHandler(LINK(&(pSVData->maAppData), ImplSVAppData, VclEventTestingHdl)); pSVData->maAppData.mpEventTestingIdle->SetPriority(TaskPriority::MEDIUM); pSVData->maAppData.mpEventTestInput = new SvFileStream("eventtesting", StreamMode::READ); pSVData->maAppData.mpEventTestingIdle->Start(); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 8ee93fb9b2c8..f6ca2cc0bcb0 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2389,7 +2389,7 @@ void Edit::EnableUpdateData( sal_uLong nTimeout ) if ( !mpUpdateDataTimer ) { mpUpdateDataTimer = new Timer("UpdateDataTimer"); - mpUpdateDataTimer->SetTimeoutHdl( LINK( this, Edit, ImplUpdateDataHdl ) ); + mpUpdateDataTimer->SetInvokeHandler( LINK( this, Edit, ImplUpdateDataHdl ) ); mpUpdateDataTimer->SetDebugName( "vcl::Edit mpUpdateDataTimer" ); } diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 7e01e09d1fd4..a6ae684ed545 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -118,7 +118,7 @@ void MenuButton::MouseButtonDown( const MouseEvent& rMEvt ) if ( !mpMenuTimer ) { mpMenuTimer = new Timer("MenuTimer"); - mpMenuTimer->SetTimeoutHdl( LINK( this, MenuButton, ImplMenuTimeoutHdl ) ); + mpMenuTimer->SetInvokeHandler( LINK( this, MenuButton, ImplMenuTimeoutHdl ) ); } mpMenuTimer->SetTimeout( GetSettings().GetMouseSettings().GetActionDelay() ); diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx index b4612ea52349..c980639a5627 100644 --- a/vcl/source/control/quickselectionengine.cxx +++ b/vcl/source/control/quickselectionengine.cxx @@ -43,7 +43,7 @@ namespace vcl ,aSearchTimeout() { aSearchTimeout.SetTimeout( 2500 ); - aSearchTimeout.SetTimeoutHdl( LINK( this, QuickSelectionEngine_Data, SearchStringTimeout ) ); + aSearchTimeout.SetInvokeHandler( LINK( this, QuickSelectionEngine_Data, SearchStringTimeout ) ); aSearchTimeout.SetDebugName( "vcl::QuickSelectionEngine_Data aSearchTimeout" ); } diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index c1a462fffd47..1237615b9de1 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -93,7 +93,7 @@ void ScrollBar::ImplInit( vcl::Window* pParent, WinBits nStyle ) if( !mpData ) // TODO: remove when maTrackRect is no longer in mpData { mpData = new ImplScrollBarData; - mpData->maTimer.SetTimeoutHdl( LINK( this, ScrollBar, ImplAutoTimerHdl ) ); + mpData->maTimer.SetInvokeHandler( LINK( this, ScrollBar, ImplAutoTimerHdl ) ); mpData->maTimer.SetDebugName( "vcl::ScrollBar mpData->maTimer" ); mpData->mbHide = false; } @@ -1156,7 +1156,7 @@ void ScrollBar::GetFocus() if( !mpData ) { mpData = new ImplScrollBarData; - mpData->maTimer.SetTimeoutHdl( LINK( this, ScrollBar, ImplAutoTimerHdl ) ); + mpData->maTimer.SetInvokeHandler( LINK( this, ScrollBar, ImplAutoTimerHdl ) ); mpData->mbHide = false; } ImplInvert(); // react immediately diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index 029c313219a8..1cea3469f31a 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -37,7 +37,7 @@ void SpinButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) mnValueStep = 1; maRepeatTimer.SetTimeout(GetSettings().GetMouseSettings().GetButtonStartRepeat()); - maRepeatTimer.SetTimeoutHdl(LINK(this, SpinButton, ImplTimeout)); + maRepeatTimer.SetInvokeHandler(LINK(this, SpinButton, ImplTimeout)); mbRepeat = 0 != (nStyle & WB_REPEAT); diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 45d4dffdfde2..2acd8fe128f6 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -329,7 +329,7 @@ void SpinField::ImplInit(vcl::Window* pParent, WinBits nWinStyle) SetSubEdit(mpEdit); - maRepeatTimer.SetTimeoutHdl(LINK( this, SpinField, ImplTimeout)); + maRepeatTimer.SetInvokeHandler(LINK( this, SpinField, ImplTimeout)); maRepeatTimer.SetTimeout(GetSettings().GetMouseSettings().GetButtonStartRepeat()); if (nWinStyle & WB_REPEAT) mbRepeat = true; diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index e6a8d91814ba..2a855e0902bf 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -48,7 +48,7 @@ Throbber::Throbber( vcl::Window* i_parentWindow, WinBits i_style ) ,meImageSet( ImageSet::Auto ) { maWaitTimer.SetTimeout( mnStepTime ); - maWaitTimer.SetTimeoutHdl( LINK( this, Throbber, TimeOutHdl ) ); + maWaitTimer.SetInvokeHandler( LINK( this, Throbber, TimeOutHdl ) ); SetScaleMode( ImageScaleMode::NONE ); initImages(); diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 008624b33b7d..c3c3c8561973 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -91,7 +91,7 @@ TextEngine::TextEngine() mpViews = new TextViews; mpIdleFormatter = new IdleFormatter; - mpIdleFormatter->SetIdleHdl( LINK( this, TextEngine, IdleFormatHdl ) ); + mpIdleFormatter->SetInvokeHandler( LINK( this, TextEngine, IdleFormatHdl ) ); mpIdleFormatter->SetDebugName( "vcl::TextEngine mpIdleFormatter" ); mpRefDev = VclPtr<VirtualDevice>::Create(); @@ -1498,7 +1498,7 @@ void TextEngine::UpdateViews( TextView* pCurView ) maInvalidRect = Rectangle(); } -IMPL_LINK_NOARG(TextEngine, IdleFormatHdl, Idle *, void) +IMPL_LINK_NOARG(TextEngine, IdleFormatHdl, Timer *, void) { FormatAndUpdate( mpIdleFormatter->GetView() ); } diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 82808783c2fa..ce778f293277 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -1122,7 +1122,7 @@ void VclMultiLineEdit::EnableUpdateData( sal_uLong nTimeout ) if ( !pUpdateDataTimer ) { pUpdateDataTimer = new Timer("MultiLineEditTimer"); - pUpdateDataTimer->SetTimeoutHdl( LINK( this, VclMultiLineEdit, ImpUpdateDataHdl ) ); + pUpdateDataTimer->SetInvokeHandler( LINK( this, VclMultiLineEdit, ImpUpdateDataHdl ) ); } pUpdateDataTimer->SetTimeout( nTimeout ); } diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 3b6422de69ba..72ea051ba2fe 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -68,7 +68,7 @@ Animation::Animation() : mbIsInAnimation ( false ), mbLoopTerminated ( false ) { - maTimer.SetTimeoutHdl( LINK( this, Animation, ImplTimeoutHdl ) ); + maTimer.SetInvokeHandler( LINK( this, Animation, ImplTimeoutHdl ) ); } Animation::Animation( const Animation& rAnimation ) : @@ -83,7 +83,7 @@ Animation::Animation( const Animation& rAnimation ) : for(const AnimationBitmap* i : rAnimation.maList) maList.push_back( new AnimationBitmap( *i ) ); - maTimer.SetTimeoutHdl( LINK( this, Animation, ImplTimeoutHdl ) ); + maTimer.SetInvokeHandler( LINK( this, Animation, ImplTimeoutHdl ) ); mnLoops = mbLoopTerminated ? 0 : mnLoopCount; } diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 2133f1821bfb..163c6b6289a4 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -184,7 +184,7 @@ void vcl::Cursor::ImplDoShow( bool bDrawDirect, bool bRestore ) { mpData = new ImplCursorData; mpData->mbCurVisible = false; - mpData->maTimer.SetTimeoutHdl( LINK( this, Cursor, ImplTimerHdl ) ); + mpData->maTimer.SetInvokeHandler( LINK( this, Cursor, ImplTimerHdl ) ); mpData->maTimer.SetDebugName( "vcl ImplCursorData maTimer" ); } diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 1f97adbb0114..ba168bd75ca1 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -51,8 +51,8 @@ private: ImplSVEvent * mnLastUserEvent; DECL_LINK(DockingHdl, void *, void); - DECL_LINK(DockTimerHdl, Idle *, void); - DECL_LINK(EndDockTimerHdl, Idle *, void); + DECL_LINK(DockTimerHdl, Timer *, void); + DECL_LINK(EndDockTimerHdl, Timer *, void); public: ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ); @@ -87,11 +87,11 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, SetBackground( GetSettings().GetStyleSettings().GetFaceColor() ); - maDockIdle.SetIdleHdl( LINK( this, ImplDockFloatWin2, DockTimerHdl ) ); + maDockIdle.SetInvokeHandler( LINK( this, ImplDockFloatWin2, DockTimerHdl ) ); maDockIdle.SetPriority( TaskPriority::MEDIUM ); maDockIdle.SetDebugName( "vcl::ImplDockFloatWin2 maDockIdle" ); - maEndDockIdle.SetIdleHdl( LINK( this, ImplDockFloatWin2, EndDockTimerHdl ) ); + maEndDockIdle.SetInvokeHandler( LINK( this, ImplDockFloatWin2, EndDockTimerHdl ) ); maEndDockIdle.SetPriority( TaskPriority::MEDIUM ); maEndDockIdle.SetDebugName( "vcl::ImplDockFloatWin2 maEndDockIdle" ); } @@ -108,7 +108,7 @@ void ImplDockFloatWin2::dispose() FloatingWindow::dispose(); } -IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl, Timer *, void) { SAL_WARN_IF( !mpDockWin->IsFloatingMode(), "vcl", "docktimer called but not floating" ); @@ -134,7 +134,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl, Idle *, void) } } -IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl, Timer *, void) { SAL_WARN_IF( !mpDockWin->IsFloatingMode(), "vcl", "enddocktimer called but not floating" ); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 4c21f4733487..f00bfdcbbbfe 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -68,7 +68,7 @@ private: ImplSVEvent * mnLastUserEvent; DECL_LINK(DockingHdl, void *, void); - DECL_LINK(DockTimerHdl, Idle *, void); + DECL_LINK(DockTimerHdl, Timer *, void); public: ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ); @@ -102,7 +102,7 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, SetBackground(); - maDockIdle.SetIdleHdl( LINK( this, ImplDockFloatWin, DockTimerHdl ) ); + maDockIdle.SetInvokeHandler( LINK( this, ImplDockFloatWin, DockTimerHdl ) ); maDockIdle.SetPriority( TaskPriority::MEDIUM ); maDockIdle.SetDebugName( "vcl::ImplDockFloatWin maDockIdle" ); } @@ -123,7 +123,7 @@ void ImplDockFloatWin::dispose() FloatingWindow::dispose(); } -IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl, Timer *, void) { SAL_WARN_IF( !mpDockWin->IsFloatingMode(), "vcl", "docktimer called but not floating" ); @@ -309,7 +309,7 @@ void DockingWindow::ImplInitDockingWindowData() //To-Do, reuse maResizeTimer maLayoutIdle.SetPriority(TaskPriority::RESIZE); - maLayoutIdle.SetIdleHdl( LINK( this, DockingWindow, ImplHandleLayoutTimerHdl ) ); + maLayoutIdle.SetInvokeHandler( LINK( this, DockingWindow, ImplHandleLayoutTimerHdl ) ); maLayoutIdle.SetDebugName( "vcl::DockingWindow maLayoutIdle" ); } @@ -1063,7 +1063,7 @@ void DockingWindow::queue_resize(StateChangedType eReason) vcl::Window::queue_resize(eReason); } -IMPL_LINK_NOARG(DockingWindow, ImplHandleLayoutTimerHdl, Idle*, void) +IMPL_LINK_NOARG(DockingWindow, ImplHandleLayoutTimerHdl, Timer*, void) { if (!isLayoutEnabled()) { diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 6ba76bfca6b4..4acbb06f1756 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -49,15 +49,15 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, vcl::Window* pParent, WinBit SetPopupModeEndHdl( LINK( this, MenuFloatingWindow, PopupEnd ) ); - aHighlightChangedTimer.SetTimeoutHdl( LINK( this, MenuFloatingWindow, HighlightChanged ) ); + aHighlightChangedTimer.SetInvokeHandler( LINK( this, MenuFloatingWindow, HighlightChanged ) ); aHighlightChangedTimer.SetTimeout( GetSettings().GetMouseSettings().GetMenuDelay() ); aHighlightChangedTimer.SetDebugName( "vcl::MenuFloatingWindow aHighlightChangedTimer" ); aSubmenuCloseTimer.SetTimeout( GetSettings().GetMouseSettings().GetMenuDelay() ); - aSubmenuCloseTimer.SetTimeoutHdl( LINK( this, MenuFloatingWindow, SubmenuClose ) ); + aSubmenuCloseTimer.SetInvokeHandler( LINK( this, MenuFloatingWindow, SubmenuClose ) ); aSubmenuCloseTimer.SetDebugName( "vcl::MenuFloatingWindow aSubmenuCloseTimer" ); - aScrollTimer.SetTimeoutHdl( LINK( this, MenuFloatingWindow, AutoScroll ) ); + aScrollTimer.SetInvokeHandler( LINK( this, MenuFloatingWindow, AutoScroll ) ); aScrollTimer.SetDebugName( "vcl::MenuFloatingWindow aScrollTimer" ); AddEventListener( LINK( this, MenuFloatingWindow, ShowHideListener ) ); diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 8e8dfcc64a5d..955153bc9ef7 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -631,7 +631,7 @@ void Window::ImplCallOverlapPaint() } } -IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Idle *, void) +IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void) { // save paint events until layout is done if (IsSystemWindow() && static_cast<const SystemWindow*>(this)->hasPendingLayout()) @@ -652,7 +652,7 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Idle *, void) } } -IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Idle *, void) +IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Timer *, void) { if( mpWindowImpl->mbReallyVisible ) { diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index d3fbe982acb8..7f377fcd7ae0 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -75,7 +75,7 @@ ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) : // init timer mpTimer = new Timer("WheelWindowTimer"); - mpTimer->SetTimeoutHdl( LINK( this, ImplWheelWindow, ImplScrollHdl ) ); + mpTimer->SetInvokeHandler( LINK( this, ImplWheelWindow, ImplScrollHdl ) ); mpTimer->SetTimeout( mnTimeout ); mpTimer->SetDebugName( "vcl::ImplWheelWindow mpTimer" ); mpTimer->Start(); diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index be1c909b91a1..ec6dab2d11d2 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -42,7 +42,7 @@ SelectionEngine::SelectionEngine( vcl::Window* pWindow, FunctionSet* pFuncSet ) nFlags = SelectionEngineFlags::EXPANDONMOVE; nLockedMods = 0; - aWTimer.SetTimeoutHdl( LINK( this, SelectionEngine, ImpWatchDog ) ); + aWTimer.SetInvokeHandler( LINK( this, SelectionEngine, ImpWatchDog ) ); aWTimer.SetTimeout( nUpdateInterval ); aWTimer.SetDebugName( "vcl::SelectionEngine aWTimer" ); } diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 82bd7ef6e13b..e5df5863b6de 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -86,7 +86,7 @@ SystemWindow::SystemWindow(WindowType nType) //To-Do, reuse maResizeTimer maLayoutIdle.SetPriority(TaskPriority::RESIZE); - maLayoutIdle.SetIdleHdl( LINK( this, SystemWindow, ImplHandleLayoutTimerHdl ) ); + maLayoutIdle.SetInvokeHandler( LINK( this, SystemWindow, ImplHandleLayoutTimerHdl ) ); maLayoutIdle.SetDebugName( "vcl::SystemWindow maLayoutIdle" ); } @@ -1092,7 +1092,7 @@ void SystemWindow::setPosSizeOnContainee(Size aSize, Window &rBox) VclContainer::setLayoutAllocation(rBox, aPos, CalcOutputSize(aSize)); } -IMPL_LINK_NOARG( SystemWindow, ImplHandleLayoutTimerHdl, Idle*, void ) +IMPL_LINK_NOARG( SystemWindow, ImplHandleLayoutTimerHdl, Timer*, void ) { if (!isLayoutEnabled()) { diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index c5a67244b5b6..495a5d2979a4 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1409,11 +1409,11 @@ void ToolBox::ImplInitToolBoxData() mpIdle = new Idle("vcl::ToolBox maIdle update"); mpIdle->SetPriority( TaskPriority::RESIZE ); - mpIdle->SetIdleHdl( LINK( this, ToolBox, ImplUpdateHdl ) ); + mpIdle->SetInvokeHandler( LINK( this, ToolBox, ImplUpdateHdl ) ); // set timeout and handler for dropdown items mpData->maDropdownTimer.SetTimeout( 250 ); - mpData->maDropdownTimer.SetTimeoutHdl( LINK( this, ToolBox, ImplDropdownLongClickHdl ) ); + mpData->maDropdownTimer.SetInvokeHandler( LINK( this, ToolBox, ImplDropdownLongClickHdl ) ); mpData->maDropdownTimer.SetDebugName( "vcl::ToolBox mpData->maDropdownTimer" ); } @@ -2706,7 +2706,7 @@ IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl, Timer *, void) } } -IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl, Idle *, void) +IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl, Timer *, void) { if( mbFormat && mpData ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 46d949ae611f..f7511f113a7f 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -815,10 +815,10 @@ ImplFrameData::ImplFrameData( vcl::Window *pWindow ) mbInSysObjToTopHdl = false; mbSysObjFocus = false; maPaintIdle.SetPriority( TaskPriority::REPAINT ); - maPaintIdle.SetIdleHdl( LINK( pWindow, vcl::Window, ImplHandlePaintHdl ) ); + maPaintIdle.SetInvokeHandler( LINK( pWindow, vcl::Window, ImplHandlePaintHdl ) ); maPaintIdle.SetDebugName( "vcl::Window maPaintIdle" ); maResizeIdle.SetPriority( TaskPriority::RESIZE ); - maResizeIdle.SetIdleHdl( LINK( pWindow, vcl::Window, ImplHandleResizeTimerHdl ) ); + maResizeIdle.SetInvokeHandler( LINK( pWindow, vcl::Window, ImplHandleResizeTimerHdl ) ); maResizeIdle.SetDebugName( "vcl::Window maResizeIdle" ); mbInternalDragGestureRecognizer = false; mbInBufferedPaint = false; diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 953efb67ab17..ed43771a8c0d 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -319,7 +319,7 @@ void Window::StartTracking( StartTrackingFlags nFlags ) pSVData->maWinData.mpTrackTimer->SetTimeout( GetSettings().GetMouseSettings().GetScrollRepeat() ); else pSVData->maWinData.mpTrackTimer->SetTimeout( GetSettings().GetMouseSettings().GetButtonStartRepeat() ); - pSVData->maWinData.mpTrackTimer->SetTimeoutHdl( LINK( this, Window, ImplTrackTimerHdl ) ); + pSVData->maWinData.mpTrackTimer->SetInvokeHandler( LINK( this, Window, ImplTrackTimerHdl ) ); pSVData->maWinData.mpTrackTimer->SetDebugName( "vcl::Window pSVData->maWinData.mpTrackTimer" ); pSVData->maWinData.mpTrackTimer->Start(); } diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index 56eaf8e3a9d7..4bf30b2488a3 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -136,7 +136,7 @@ PrintFontManager::PrintFontManager() , m_nNextDirAtom( 1 ) { #if ENABLE_DBUS - m_aFontInstallerTimer.SetTimeoutHdl(LINK(this, PrintFontManager, autoInstallFontLangSupport)); + m_aFontInstallerTimer.SetInvokeHandler(LINK(this, PrintFontManager, autoInstallFontLangSupport)); m_aFontInstallerTimer.SetTimeout(5000); #endif } diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index b95436c84522..13e0a0b36f36 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -1272,7 +1272,7 @@ class PrinterUpdate static int nActiveJobs; static void doUpdate(); - DECL_STATIC_LINK( PrinterUpdate, UpdateTimerHdl, Idle*, void ); + DECL_STATIC_LINK( PrinterUpdate, UpdateTimerHdl, Timer*, void ); public: static void update(SalGenericInstance &rInstance); static void jobStarted() { nActiveJobs++; } @@ -1290,7 +1290,7 @@ void PrinterUpdate::doUpdate() pInst->PostPrintersChanged(); } -IMPL_STATIC_LINK_NOARG( PrinterUpdate, UpdateTimerHdl, Idle*, void ) +IMPL_STATIC_LINK_NOARG( PrinterUpdate, UpdateTimerHdl, Timer*, void ) { if( nActiveJobs < 1 ) { @@ -1320,7 +1320,7 @@ void PrinterUpdate::update(SalGenericInstance &rInstance) { pPrinterUpdateIdle = new Idle("PrinterUpdateTimer"); pPrinterUpdateIdle->SetPriority( TaskPriority::LOWEST ); - pPrinterUpdateIdle->SetIdleHdl( LINK( nullptr, PrinterUpdate, UpdateTimerHdl ) ); + pPrinterUpdateIdle->SetInvokeHandler( LINK( nullptr, PrinterUpdate, UpdateTimerHdl ) ); pPrinterUpdateIdle->Start(); } } diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index a2b6903ae067..96b63e2c5092 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -807,7 +807,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle, mpInputContext = nullptr; mbInputFocus = False; - maAlwaysOnTopRaiseTimer.SetTimeoutHdl( LINK( this, X11SalFrame, HandleAlwaysOnTopRaise ) ); + maAlwaysOnTopRaiseTimer.SetInvokeHandler( LINK( this, X11SalFrame, HandleAlwaysOnTopRaise ) ); maAlwaysOnTopRaiseTimer.SetTimeout( 100 ); maAlwaysOnTopRaiseTimer.SetDebugName( "vcl::X11SalFrame maAlwaysOnTopRaiseTimer" ); diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index af26a10f22ed..a86d8072d697 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -504,11 +504,11 @@ GtkSalMenu::GtkSalMenu( bool bMenuBar ) : //next idle slot, in the normal case of a new menubar SetFrame is called //directly long before this idle would get called. maUpdateMenuBarIdle.SetPriority(TaskPriority::HIGHEST); - maUpdateMenuBarIdle.SetIdleHdl(LINK(this, GtkSalMenu, MenuBarHierarchyChangeHandler)); + maUpdateMenuBarIdle.SetInvokeHandler(LINK(this, GtkSalMenu, MenuBarHierarchyChangeHandler)); maUpdateMenuBarIdle.SetDebugName("Native Gtk Menu Update Idle"); } -IMPL_LINK_NOARG(GtkSalMenu, MenuBarHierarchyChangeHandler, Idle *, void) +IMPL_LINK_NOARG(GtkSalMenu, MenuBarHierarchyChangeHandler, Timer *, void) { SAL_WARN_IF(!mpFrame, "vcl.gtk", "MenuBar layout changed, but no frame for some reason!"); if (!mpFrame) diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 40e2e7d94e33..b3f365f1e116 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1600,7 +1600,7 @@ bool DemoRenderer::MouseButtonDown(const MouseEvent& rMEvt) mpButtonWin->SetPosSizePixel(Point(0,0), mpButton->GetOptimalSize()); mpButtonWin->Show(); mnBounceX = 1; mnBounceX = 1; - maBounce.SetTimeoutHdl(LINK(this,DemoRenderer,BounceTimerCb)); + maBounce.SetInvokeHandler(LINK(this,DemoRenderer,BounceTimerCb)); maBounce.SetTimeout(55); maBounce.Start(); } |