include/vcl/listctrl.hxx | 4 ++-- vcl/source/control/listctrl.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit fb584d4fd3da60589ddcc3a0a712cdedfd4c75de Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sun Oct 8 01:30:04 2017 +0200 store vcl::Window in ListControl to allow adding VclContainer Change-Id: Ib7f145ae1137ec29749e0a60a21e84dd747ac5c1 Reviewed-on: https://gerrit.libreoffice.org/43253 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com> diff --git a/include/vcl/listctrl.hxx b/include/vcl/listctrl.hxx index 4d56e2685e79..db6dcbe0c08b 100644 --- a/include/vcl/listctrl.hxx +++ b/include/vcl/listctrl.hxx @@ -31,7 +31,7 @@ class VCL_DLLPUBLIC ListControl : public Control { private: - std::vector<VclPtr<Control>> maEntries; + std::vector<VclPtr<vcl::Window>> maEntries; bool mbHasScrollBar; VclPtr<ScrollBar> mpScrollBar; @@ -43,7 +43,7 @@ public: virtual ~ListControl() override; virtual void dispose() override; - void addEntry(VclPtr<Control> xEntry, sal_uInt32 nPos = std::numeric_limits<sal_uInt16>::max()); + void addEntry(VclPtr<vcl::Window> xEntry, sal_uInt32 nPos = std::numeric_limits<sal_uInt16>::max()); void deleteEntry(sal_uInt32 nPos); virtual Size GetOptimalSize() const override; diff --git a/vcl/source/control/listctrl.cxx b/vcl/source/control/listctrl.cxx index 3f846ad03138..1c6aa0c85742 100644 --- a/vcl/source/control/listctrl.cxx +++ b/vcl/source/control/listctrl.cxx @@ -118,7 +118,7 @@ IMPL_LINK_NOARG( ListControl, ScrollHdl, ScrollBar*, void ) DoScroll(mpScrollBar->GetDelta()); } -void ListControl::addEntry(VclPtr<Control> xEntry, sal_uInt32 nPos) +void ListControl::addEntry(VclPtr<Window> xEntry, sal_uInt32 nPos) { xEntry->Show(); if (nPos < maEntries.size()) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits