diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-07 22:08:21 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-08 17:37:41 +0100 |
| commit | a738606d48d6678aaabf68a6ba748f79d5c6b9b8 (patch) | |
| tree | 38f8184d4691c43e3a9e4beb7a1989ec1e7c1b4d /vcl/source/window/event.cxx | |
| parent | 5c430093a301b31174a81ad4437f0361c86cfe3c (diff) | |
PostUserEvent - instrument to allow holding a VclPtr reference.
This helps avoid things dying during emission in a robust manner.
Bit of an unpleasant 3rd optional parameter; better names appreciated.
Change-Id: I27571823f9d96caef1d07602785a02390d3a3591
Diffstat (limited to 'vcl/source/window/event.cxx')
| -rw-r--r-- | vcl/source/window/event.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 162f3572d8cc..4a8d7e2a9633 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -263,13 +263,22 @@ void Window::RemoveChildEventListener( const Link<>& rEventListener ) mpWindowImpl->maChildEventListeners.removeListener( rEventListener ); } -ImplSVEvent * Window::PostUserEvent( const Link<>& rLink, void* pCaller ) +ImplSVEvent * Window::PostUserEvent( const Link<>& rLink, void* pCaller, bool bReferenceLink ) { ImplSVEvent* pSVEvent = new ImplSVEvent; pSVEvent->mpData = pCaller; pSVEvent->mpLink = new Link<>( rLink ); pSVEvent->mpWindow = this; pSVEvent->mbCall = true; + if (bReferenceLink) + { + // Double check that this is indeed a vcl::Window instance. + assert(dynamic_cast<vcl::Window *>( + reinterpret_cast<vcl::Window *>(rLink.GetInstance())) == + reinterpret_cast<vcl::Window *>(rLink.GetInstance())); + pSVEvent->mpInstanceRef = reinterpret_cast<vcl::Window *>(rLink.GetInstance()); + } + ImplAddDel( &(pSVEvent->maDelData) ); if ( !mpWindowImpl->mpFrame->PostEvent( pSVEvent ) ) { |