implement a basic VclFrame

factor out common VclContainer pieces

1 files changed, 12 insertions, 8 deletions

diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index fc7e0a1d69d1..cff021ff2970 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -36,6 +36,9 @@ class VCL_DLLPUBLIC VclContainer : public Window
 {
 public:
     VclContainer(Window *pParent) : Window(pParent) {}
+    virtual Size GetOptimalSize(WindowSizeType eType) const;
+    using Window::SetPosSizePixel;
+    virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
 protected:
     virtual Size calculateRequisition() const = 0;
     virtual void setAllocation(const Size &rAllocation) = 0;
@@ -60,10 +63,6 @@ public:
     {
         Show();
     }
-public:
-    virtual Size GetOptimalSize(WindowSizeType eType) const;
-    using Window::SetPosSizePixel;
-    virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
 protected:
     virtual Size calculateRequisition() const;
     virtual void setAllocation(const Size &rAllocation);
@@ -313,15 +312,20 @@ public:
     {
         return m_nColumnSpacing;
     }
-public:
-    virtual Size GetOptimalSize(WindowSizeType eType) const;
-    using Window::SetPosSizePixel;
-    virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
 };
 
 VCL_DLLPUBLIC void setGridAttach(Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop,
     sal_Int32 nWidth = 1, sal_Int32 nHeight = 1);
 
+class VCL_DLLPUBLIC VclFrame : public VclContainer
+{
+public:
+    VclFrame(Window *pParent) : VclContainer(pParent) {}
+protected:
+    virtual Size calculateRequisition() const;
+    virtual void setAllocation(const Size &rAllocation);
+};
+
 // retro-fitting utilities //
 
 //Get a Size which is large enough to contain all children with