summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-08-14 17:29:46 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-08-14 17:30:25 +0200
commitc1f456a4d212f6108220bb7c9712d584053c1e1e (patch)
treee4f58db5ecdf634e88d619e9de1c3cdacaa53041
parent0fd54995ef6a7c7914b6a133aef0c81de5fb20de (diff)
vcldemo: fix --widgets crash-on-exit
Window ( 7VclVBox()) with live children destroyed: 7ToolBox() 10PushButton(Click me; go on) Change-Id: I7b95198e24ea4d6ab085705096421219b3e16904
-rw-r--r--vcl/workben/vcldemo.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index a785ab90fbbe..33cb4f430d8e 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1460,7 +1460,7 @@ class DemoWidgets : public WorkWindow
public:
DemoWidgets() :
- WorkWindow(NULL, WB_STDWORK),
+ WorkWindow(NULL, WB_APP | WB_STDWORK),
mpBox(VclPtrInstance<VclVBox>(this, false, 3)),
mpToolbox(VclPtrInstance<ToolBox>(mpBox.get())),
mpButton(VclPtrInstance<PushButton>(mpBox.get()))
@@ -1489,9 +1489,9 @@ public:
virtual ~DemoWidgets() { disposeOnce(); }
virtual void dispose() SAL_OVERRIDE
{
- mpBox.disposeAndClear();
mpToolbox.disposeAndClear();
mpButton.disposeAndClear();
+ mpBox.disposeAndClear();
WorkWindow::dispose();
}
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE