diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-17 15:13:34 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:40:50 +0100 |
| commit | 6d0c89123f353aed80d3a8a08ef5cd1ffaa1eea9 (patch) | |
| tree | 59b3f214e068d3df6b08b2acd7647002946a6847 /vcl | |
| parent | 2269fd1d751d9b198cf9189125bd177151559596 (diff) | |
vclwidget: fix more places that should be wrapping in VclPtr
Change-Id: I31c9115662da2f81e1b22be91ee58e2862076b8e
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/a11y/atkutil.cxx | 2 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 8344b71b5dca..13e21cb5b00c 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -177,7 +177,7 @@ struct ImplPostEventData ~ImplPostEventData() {} }; -typedef ::std::pair< vcl::Window*, ImplPostEventData* > ImplPostEventPair; +typedef ::std::pair< VclPtr<vcl::Window>, ImplPostEventData* > ImplPostEventPair; static ::std::list< ImplPostEventPair > aPostedEventList; diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index 5ffa45a4c03c..ac032012c05d 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -497,7 +497,7 @@ static void handle_toolbox_buttonchange(VclWindowEvent const *pEvent) /*****************************************************************************/ -static std::set< vcl::Window * > g_aWindowList; +static std::set< VclPtr<vcl::Window> > g_aWindowList; static void handle_get_focus(::VclWindowEvent const * pEvent) { diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 18fb1c69d651..23daa29a1c87 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1617,8 +1617,8 @@ public: } VclPtr<DemoWin> aMainWin(new DemoWin(aRenderer, bThreads)); - std::unique_ptr<DemoWidgets> xWidgets; - std::unique_ptr<DemoPopup> xPopup; + VclPtr<DemoWidgets> aWidgets; + VclPtr<DemoPopup> xPopup; aMainWin->SetText("Interactive VCL demo #1"); |