diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-23 19:44:15 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-23 20:51:12 +0000 |
| commit | 0792e97bd7ea6f23c908bdebc4826b08c6265d55 (patch) | |
| tree | 894b40b13a5d9aff3ebb119dad6b06c6e275be7c /vcl/source/window/mouse.cxx | |
| parent | ba203843f5a209cb48e2d6f4ec4e3649982185ea (diff) | |
VclPtr - add compat methods for old-style focus / notification.
The previous code would only invoke Window:: methods by the time we
hit the destructor; do the same to avoid fixing more scattered
crashers for now.
Change-Id: Ibdcd1290309bb7fc31a44d534c52d357da022591
Reviewed-on: https://gerrit.libreoffice.org/15880
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/source/window/mouse.cxx')
| -rw-r--r-- | vcl/source/window/mouse.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index d4ebc94cbdfd..7a4a8262dfa6 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -356,7 +356,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) pOldFocusWindow->EndTracking( TrackingEventFlags::Cancel | TrackingEventFlags::Focus ); NotifyEvent aNEvt( MouseNotifyEvent::LOSEFOCUS, pOldFocusWindow ); if ( !ImplCallPreNotify( aNEvt ) ) - pOldFocusWindow->LoseFocus(); + pOldFocusWindow->CompatLoseFocus(); pOldFocusWindow->ImplCallDeactivateListeners( this ); } @@ -384,7 +384,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) mpWindowImpl->mnGetFocusFlags |= GETFOCUS_FLOATWIN_POPUPMODEEND_CANCEL; NotifyEvent aNEvt( MouseNotifyEvent::GETFOCUS, this ); if ( !ImplCallPreNotify( aNEvt ) && !aDogTag.IsDead() ) - GetFocus(); + CompatGetFocus(); if( !aDogTag.IsDead() ) ImplCallActivateListeners( (pOldFocusWindow && ! aOldFocusDel.IsDead()) ? pOldFocusWindow : NULL ); if( !aDogTag.IsDead() ) |