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/event.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/event.cxx')
| -rw-r--r-- | vcl/source/window/event.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 3e729fd738f4..61c11ab20bdd 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -38,8 +38,7 @@ void Window::DataChanged( const DataChangedEvent& ) void Window::NotifyAllChildren( DataChangedEvent& rDCEvt ) { - - DataChanged( rDCEvt ); + CompatDataChanged( rDCEvt ); vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) @@ -53,7 +52,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt ) { bool bDone = false; if ( mpWindowImpl->mpParent && !ImplIsOverlapWindow() ) - bDone = mpWindowImpl->mpParent->PreNotify( rNEvt ); + bDone = mpWindowImpl->mpParent->CompatPreNotify( rNEvt ); if ( !bDone ) { @@ -194,7 +193,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) if ( !nRet ) { if ( mpWindowImpl->mpParent && !ImplIsOverlapWindow() ) - nRet = mpWindowImpl->mpParent->Notify( rNEvt ); + nRet = mpWindowImpl->mpParent->CompatNotify( rNEvt ); } return nRet; @@ -427,7 +426,7 @@ void Window::ImplCallInitShow() { mpWindowImpl->mbReallyShown = true; mpWindowImpl->mbInInitShow = true; - StateChanged( StateChangedType::InitShow ); + CompatStateChanged( StateChangedType::InitShow ); mpWindowImpl->mbInInitShow = false; vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; |