From eac937de4267637d22d4c418a87e675c780e59a3 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 1 Sep 2020 14:47:08 +0100 Subject: IsCallHandlersOnInputDisabled newly always return false MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4abfab9a413e3e43e23839f2cf3b0c26dcdea3a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101853 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- vcl/source/window/window.cxx | 6 ------ vcl/source/window/winproc.cxx | 6 ------ 2 files changed, 12 deletions(-) (limited to 'vcl/source/window') diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index e06a8cf1e961..f581ce0850b4 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -725,7 +725,6 @@ WindowImpl::WindowImpl( WindowType nType ) mbDrawSelectionBackground = false; // true: draws transparent window background to indicate (toolbox) selection mbIsInTaskPaneList = false; // true: window was added to the taskpanelist in the topmost system window mnNativeBackground = ControlPart::NONE; // initialize later, depends on type - mbCallHandlersDuringInputDisabled = false; // true: call event handlers even if input is disabled mbHelpTextDynamic = false; // true: append help id in HELP_DEBUG case mbFakeFocusSet = false; // true: pretend as if the window has focus. mbHexpand = false; @@ -2484,11 +2483,6 @@ void Window::Enable( bool bEnable, bool bChild ) ImplGenerateMouseMove(); } -bool Window::IsCallHandlersOnInputDisabled() const -{ - return mpWindowImpl->mbCallHandlersDuringInputDisabled; -} - void Window::EnableInput( bool bEnable, bool bChild ) { if (!mpWindowImpl) diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index e0a4c16d18f7..eb2f917d0e50 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -389,12 +389,6 @@ bool ImplHandleMouseEvent( const VclPtr& xWindow, MouseNotifyEvent MouseEvent aMEvt( aChildPos, pWinFrameData->mnClickCount, nMode, nCode, nCode ); NotifyEvent aNEvt( nSVEvent, pChild, &aMEvt ); - if( pChild->IsCallHandlersOnInputDisabled() ) - { - pWinFrameData->mpMouseMoveWin = pChild; - pChild->ImplNotifyKeyMouseCommandEventListeners( aNEvt ); - } - if ( nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN ) return true; else -- cgit v1.2.3