commit 0cde74f788a054fa2b65107a030dd463b8d11c7a
author Michael Meeks <michael.meeks@collabora.com> Sat Apr 25 12:16:28 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Sat Apr 25 12:16:28 2015 +0100
tree 0f14ea55c6e87fa623fd27153eaa39ad80e5ba00
parent ca7c519c6e95890deb047ea6137303b8ec55c491

Make Window's inDispose map more precisely to mbInDtor.

Change-Id: I545aa03d46b0673aafe73daa23047d2a4b6936dd

vcl/source/window/window.cxx

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index cb457e4c..a280209 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -139,9 +139,8 @@ bool Window::IsDisposed() const

void Window::dispose()
{
    mpWindowImpl->mbInDispose = true;

    assert( mpWindowImpl && mpWindowImpl->mbInDispose ); // should only be called from disposeOnce()
    assert( mpWindowImpl );
    assert( !mpWindowImpl->mbInDispose ); // should only be called from disposeOnce()
    assert( !mpWindowImpl->mpParent ||
            !mpWindowImpl->mpParent->IsDisposed() ||
            "vcl::Window child should have its parent disposed first" );
@@ -159,6 +158,8 @@ void Window::dispose()
            xCanvasComponent->dispose();
    }

    mpWindowImpl->mbInDispose = true;

    CallEventListeners( VCLEVENT_OBJECT_DYING );

    // do not send child events for frames that were registered as native frames
@@ -576,6 +577,7 @@ void Window::dispose()

Window::~Window()
{
    // FIXME: we should kill all LazyDeletor usage.
    vcl::LazyDeletor<vcl::Window>::Undelete( this );
    disposeOnce();
}