summaryrefslogtreecommitdiff
path: root/vcl/source/window/dlgctrl.cxx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-05-23 19:44:15 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-05-23 20:51:12 +0000
commit0792e97bd7ea6f23c908bdebc4826b08c6265d55 (patch)
tree894b40b13a5d9aff3ebb119dad6b06c6e275be7c /vcl/source/window/dlgctrl.cxx
parentba203843f5a209cb48e2d6f4ec4e3649982185ea (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/dlgctrl.cxx')
-rw-r--r--vcl/source/window/dlgctrl.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 2ce7843caf93..ef47cd059059 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -689,11 +689,11 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
{
NotifyEvent aNEvt1( MouseNotifyEvent::LOSEFOCUS, pSWindow );
if ( !ImplCallPreNotify( aNEvt1 ) )
- pSWindow->LoseFocus();
+ pSWindow->CompatLoseFocus();
pSWindow->mpWindowImpl->mnGetFocusFlags = nGetFocusFlags | GETFOCUS_AROUND;
NotifyEvent aNEvt2( MouseNotifyEvent::GETFOCUS, pSWindow );
if ( !ImplCallPreNotify( aNEvt2 ) )
- pSWindow->GetFocus();
+ pSWindow->CompatGetFocus();
pSWindow->mpWindowImpl->mnGetFocusFlags = 0;
return true;
}
@@ -821,11 +821,11 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
{
NotifyEvent aNEvt1( MouseNotifyEvent::LOSEFOCUS, pSWindow );
if ( !ImplCallPreNotify( aNEvt1 ) )
- pSWindow->LoseFocus();
+ pSWindow->CompatLoseFocus();
pSWindow->mpWindowImpl->mnGetFocusFlags = nGetFocusFlags | GETFOCUS_AROUND;
NotifyEvent aNEvt2( MouseNotifyEvent::GETFOCUS, pSWindow );
if ( !ImplCallPreNotify( aNEvt2 ) )
- pSWindow->GetFocus();
+ pSWindow->CompatGetFocus();
pSWindow->mpWindowImpl->mnGetFocusFlags = 0;
return true;
}