diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-01 14:47:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-02 09:35:58 +0200 |
| commit | eac937de4267637d22d4c418a87e675c780e59a3 (patch) | |
| tree | 1b0d1f76da85d45cc60d83ccf9ce1c9a41f09dff /vcl | |
| parent | e2da259b5733a36f8b4f934869f02ea7ee5163db (diff) | |
IsCallHandlersOnInputDisabled newly always return false
Change-Id: I4abfab9a413e3e43e23839f2cf3b0c26dcdea3a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101853
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/window.h | 1 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 6 |
3 files changed, 0 insertions, 13 deletions
diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 81d93375d2e7..52993ffa930b 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -379,7 +379,6 @@ public: mbDrawSelectionBackground:1, mbIsInTaskPaneList:1, mbToolbarFloatingWindow:1, - mbCallHandlersDuringInputDisabled:1, mbHelpTextDynamic:1, mbFakeFocusSet:1, mbHexpand:1, 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<vcl::Window>& 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 |