From ed4d8c89ee954b3c9340583c95e8622a6cb47b3b Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 26 Nov 2015 11:15:11 +0000 Subject: vcl: reduce pointless timer / scheduler / idle includes. Change-Id: I8bf7f8d6ba1a54f2969e055956fadc52ff6c8673 --- vcl/source/control/edit.cxx | 6 ++++++ vcl/source/window/toolbox.cxx | 9 +++++++-- vcl/source/window/toolbox2.cxx | 5 +++-- 3 files changed, 16 insertions(+), 4 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index dbd8233b0040..4b1056c55fc7 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2463,6 +2463,12 @@ void Edit::EnableUpdateData( sal_uLong nTimeout ) } } +void Edit::DisableUpdateData() +{ + delete mpUpdateDataTimer; + mpUpdateDataTimer = nullptr; +} + void Edit::SetEchoChar( sal_Unicode c ) { mcEchoChar = c; diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 6b4db051f61e..4105b586a40e 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1398,8 +1398,9 @@ void ToolBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) mnKeyModifier = 0; mnActivateCount = 0; - maIdle.SetPriority( SchedulerPriority::RESIZE ); - maIdle.SetIdleHdl( LINK( this, ToolBox, ImplUpdateHdl ) ); + mpIdle = new Idle("toolbox update"); + mpIdle->SetPriority( SchedulerPriority::RESIZE ); + mpIdle->SetIdleHdl( LINK( this, ToolBox, ImplUpdateHdl ) ); // set timeout and handler for dropdown items mpData->maDropdownTimer.SetTimeout( 250 ); @@ -1657,6 +1658,10 @@ void ToolBox::dispose() } } mpFloatWin.clear(); + + delete mpIdle; + mpIdle = nullptr; + DockingWindow::dispose(); } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 72a3b58bef55..dddb65fba628 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -357,7 +358,7 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool bFullPaint ) { Invalidate( Rectangle( mnLeftBorder, mnTopBorder, mnDX-mnRightBorder-1, mnDY-mnBottomBorder-1 ) ); - maIdle.Stop(); + mpIdle->Stop(); } } else @@ -368,7 +369,7 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool bFullPaint ) // do we need to redraw? if ( IsReallyVisible() && IsUpdateMode() ) - maIdle.Start(); + mpIdle->Start(); } } -- cgit v1.2.1