diff options
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/bastypes.cxx | 30 | ||||
-rw-r--r-- | basctl/source/inc/bastypes.hxx | 3 |
3 files changed, 16 insertions, 21 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index b5d65507fb50..a420949e4584 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1704,7 +1704,7 @@ void WatchWindow::Resize() if ( aBoxSz.Height() < 4 ) aBoxSz.setHeight( 0 ); - m_xVclContentArea->SetPosSizePixel(Point(DWBORDER, DWBORDER), aBoxSz); + m_xBox->SetPosSizePixel(Point(DWBORDER, DWBORDER), aBoxSz); Invalidate(); } @@ -1863,7 +1863,7 @@ void StackWindow::Resize() if ( aBoxSz.Height() < 4 ) aBoxSz.setHeight( 0 ); - m_xVclContentArea->SetPosSizePixel(Point(DWBORDER, DWBORDER), aBoxSz); + m_xBox->SetPosSizePixel(Point(DWBORDER, DWBORDER), aBoxSz); Invalidate(); } diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index a9a927a27878..cc58ffa6c846 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -42,7 +42,6 @@ #include <svl/srchdefs.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> -#include <vcl/layout.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <tools/stream.hxx> @@ -260,21 +259,19 @@ WinBits const DockingWindow::StyleBits = WB_BORDER | WB_3DLOOK | WB_CLIPCHILDREN | WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_DOCKABLE; -DockingWindow::DockingWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OString& rID) : - ::DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui"), - pLayout(nullptr), - nShowCount(0) +DockingWindow::DockingWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OString& rID) + : ResizableDockingWindow(pParent) + , pLayout(nullptr) + , nShowCount(0) { - m_xVclContentArea = VclPtr<VclVBox>::Create(this); - m_xVclContentArea->Show(); - m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea, rUIXMLDescription, true)); + m_xBuilder.reset(Application::CreateInterimBuilder(m_xBox.get(), rUIXMLDescription, true)); m_xContainer = m_xBuilder->weld_container(rID); } -DockingWindow::DockingWindow (Layout* pParent) : - ::DockingWindow(pParent, StyleBits), - pLayout(pParent), - nShowCount(0) +DockingWindow::DockingWindow (Layout* pParent) + : ResizableDockingWindow(pParent, StyleBits) + , pLayout(pParent) + , nShowCount(0) { } DockingWindow::~DockingWindow() @@ -286,9 +283,8 @@ void DockingWindow::dispose() { m_xContainer.reset(); m_xBuilder.reset(); - m_xVclContentArea.disposeAndClear(); pLayout.clear(); - ::DockingWindow::dispose(); + ResizableDockingWindow::dispose(); } // Sets the position and the size of the docking window. This property is saved @@ -327,12 +323,12 @@ void DockingWindow::Show (bool bShow) // = true if (bShow) { if (++nShowCount == 1) - ::DockingWindow::Show(); + ResizableDockingWindow::Show(); } else { if (--nShowCount == 0) - ::DockingWindow::Hide(); + ResizableDockingWindow::Hide(); } } @@ -361,7 +357,7 @@ bool DockingWindow::Docking( const Point& rPos, tools::Rectangle& rRect ) void DockingWindow::EndDocking( const tools::Rectangle& rRect, bool bFloatMode ) { if ( bFloatMode ) - ::DockingWindow::EndDocking( rRect, bFloatMode ); + ResizableDockingWindow::EndDocking( rRect, bFloatMode ); else { SetFloatingMode(false); diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index fecebced52ee..e6e306a73b5a 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -78,7 +78,7 @@ struct BasicStatus // basctl::DockingWindow -- special docking window for the Basic IDE // Not to be confused with ::DockingWindow from vcl. -class DockingWindow : public ::DockingWindow +class DockingWindow : public ResizableDockingWindow { public: DockingWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OString& rID); @@ -102,7 +102,6 @@ protected: protected: std::unique_ptr<weld::Builder> m_xBuilder; - VclPtr<vcl::Window> m_xVclContentArea; std::unique_ptr<weld::Container> m_xContainer; private: |