diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/salvtables.hxx | 11 | ||||
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 31 |
2 files changed, 24 insertions, 18 deletions
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 8c3e1a8aee5b..8c11e17c2ba2 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -1901,4 +1901,15 @@ public: virtual void popdown() override; }; +class SalInstanceBox : public SalInstanceContainer, public virtual weld::Box +{ +private: + VclPtr<VclBox> m_xBox; + +public: + SalInstanceBox(VclBox* pContainer, SalInstanceBuilder* pBuilder, bool bTakeOwnership); + virtual void reorder_child(weld::Widget* pWidget, int nNewPosition) override; + virtual void sort_native_button_order() override; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index da17b8facb40..61eacb855af4 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1330,28 +1330,23 @@ void SalInstanceWidget::draw(OutputDevice& rOutput, const Point& rPos, const Siz m_xWidget->SetSizePixel(aOrigSize); } -namespace +SalInstanceBox::SalInstanceBox(VclBox* pContainer, SalInstanceBuilder* pBuilder, + bool bTakeOwnership) + : SalInstanceContainer(pContainer, pBuilder, bTakeOwnership) + , m_xBox(pContainer) { -class SalInstanceBox : public SalInstanceContainer, public virtual weld::Box +} +void SalInstanceBox::reorder_child(weld::Widget* pWidget, int nNewPosition) { -private: - VclPtr<VclBox> m_xBox; + SalInstanceWidget* pVclWidget = dynamic_cast<SalInstanceWidget*>(pWidget); + assert(pVclWidget); + pVclWidget->getWidget()->reorderWithinParent(nNewPosition); +} -public: - SalInstanceBox(VclBox* pContainer, SalInstanceBuilder* pBuilder, bool bTakeOwnership) - : SalInstanceContainer(pContainer, pBuilder, bTakeOwnership) - , m_xBox(pContainer) - { - } - virtual void reorder_child(weld::Widget* pWidget, int nNewPosition) override - { - SalInstanceWidget* pVclWidget = dynamic_cast<SalInstanceWidget*>(pWidget); - assert(pVclWidget); - pVclWidget->getWidget()->reorderWithinParent(nNewPosition); - } - virtual void sort_native_button_order() override { ::sort_native_button_order(*m_xBox); } -}; +void SalInstanceBox::sort_native_button_order() { ::sort_native_button_order(*m_xBox); } +namespace +{ void CollectChildren(const vcl::Window& rCurrent, const basegfx::B2IPoint& rTopLeft, weld::ScreenShotCollection& rControlDataCollection) { |