add basic hbox, vbox and dialog support

14 files changed, 519 insertions, 50 deletions

diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 122d54214de1..a1b7f8dc2612 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -40,34 +40,86 @@
 #include <wrtsh.hxx>
 
 //TODO, add asian/non-asian word count to UI when CJK mode is enabled.
-
-SwWordCountDialog::SwWordCountDialog(Window* pParent) :
-#if defined _MSC_VER
-#pragma warning (disable : 4355)
-#endif
-    aCurrentFL( pParent, SW_RES(              FL_CURRENT            )),
-    aCurrentWordFT( pParent, SW_RES(          FT_CURRENTWORD        )),
-    aCurrentWordFI( pParent, SW_RES(          FI_CURRENTWORD        )),
-    aCurrentCharacterFT( pParent, SW_RES(     FT_CURRENTCHARACTER   )),
-    aCurrentCharacterFI( pParent, SW_RES(     FI_CURRENTCHARACTER   )),
-    aCurrentCharacterExcludingSpacesFT( pParent, SW_RES(     FT_CURRENTCHARACTEREXCLUDINGSPACES   )),
-    aCurrentCharacterExcludingSpacesFI( pParent, SW_RES(     FI_CURRENTCHARACTEREXCLUDINGSPACES   )),
-
-    aDocFL( pParent, SW_RES(                  FL_DOC                )),
-    aDocWordFT( pParent, SW_RES(              FT_DOCWORD            )),
-    aDocWordFI( pParent, SW_RES(              FI_DOCWORD            )),
-    aDocCharacterFT( pParent, SW_RES(         FT_DOCCHARACTER       )),
-    aDocCharacterFI( pParent, SW_RES(         FI_DOCCHARACTER       )),
-    aDocCharacterExcludingSpacesFT( pParent, SW_RES(         FT_DOCCHARACTEREXCLUDINGSPACES       )),
-    aDocCharacterExcludingSpacesFI( pParent, SW_RES(         FI_DOCCHARACTEREXCLUDINGSPACES       )),
-    aBottomFL(pParent, SW_RES(                FL_BOTTOM             )),
-    aOK( pParent, SW_RES(                     PB_OK                 )),
-    aHelp( pParent, SW_RES(                   PB_HELP               ))
-#if defined _MSC_VER
-#pragma warning (default : 4355)
-#endif
+SwWordCountDialog::SwWordCountDialog(Window* pParent)
+    : dialog_vbox1(pParent)
+    , box1(&dialog_vbox1)
+    , aCurrentSelection(&box1)
+    , aCurrentSelectionText(&aCurrentSelection, SW_RES(FT_CURRENT))
+    , aCurrentSelectionLine(&aCurrentSelection, SW_RES(FL_CURRENT))
+    , aSelectionBox(&box1)
+    , aSelectionRow1(&aSelectionBox)
+    , aCurrentWordFT(&aSelectionRow1, SW_RES(FT_CURRENTWORD))
+    , aCurrentWordFI(&aSelectionRow1, SW_RES(FI_CURRENTWORD))
+    , aSelectionRow2(&aSelectionBox)
+    , aCurrentCharacterFT(&aSelectionRow2, SW_RES(FT_CURRENTCHARACTER))
+    , aCurrentCharacterFI(&aSelectionRow2, SW_RES(FI_CURRENTCHARACTER))
+    , aSelectionRow3(&aSelectionBox)
+    , aCurrentCharacterExcludingSpacesFT(&aSelectionRow3, SW_RES(FT_CURRENTCHARACTEREXCLUDINGSPACES))
+    , aCurrentCharacterExcludingSpacesFI(&aSelectionRow3, SW_RES(FI_CURRENTCHARACTEREXCLUDINGSPACES))
+    , aDoc(&box1)
+    , aDocText(&aDoc, SW_RES(FT_DOC))
+    , aDocLine(&aDoc, SW_RES(FL_DOC))
+    , dialog_action_area1(&dialog_vbox1)
+    , aOK(&dialog_action_area1, SW_RES(PB_OK))
+    , aHelp(&dialog_action_area1, SW_RES(PB_HELP))
 {
+    Size aSize;
+
+    dialog_vbox1.setFill(true);
+
+    dialog_action_area1.setFill(true);
+
+    box1.setFill(true);
+    box1.setExpand(true);
+
+    aCurrentSelection.setFill(true);
+    aCurrentSelectionText.setFill(true);
+    aCurrentSelectionLine.setFill(true);
+    aCurrentSelectionLine.setExpand(true);
+
+    aSelectionBox.setFill(true);
+
+    aSelectionRow1.setFill(true);
+    aSelectionRow1.setExpand(true);
+    aCurrentWordFT.setFill(true);
+    aCurrentWordFI.setFill(true);
+    aCurrentWordFI.setExpand(true);
+
+    aSelectionRow2.setFill(true);
+    aSelectionRow2.setExpand(true);
+    aCurrentCharacterFT.setFill(true);
+    aCurrentCharacterFI.setFill(true);
+    aCurrentCharacterFI.setExpand(true);
+    aSelectionRow3.setFill(true);
+    aSelectionRow3.setExpand(true);
+    aCurrentCharacterExcludingSpacesFT.setFill(true);
+    aCurrentCharacterExcludingSpacesFI.setFill(true);
+    aCurrentCharacterExcludingSpacesFI.setExpand(true);
+
+    aDoc.setFill(true);
+    aDocText.setFill(true);
+    aDocLine.setFill(true);
+    aDocLine.setExpand(true);
+
+    aSize = dialog_vbox1.GetOptimalSize(WINDOWSIZE_PREFERRED);
+    dialog_vbox1.SetSizePixel(aSize);
+
+    aSize = pParent->GetOptimalSize(WINDOWSIZE_PREFERRED);
+    pParent->SetSizePixel(aSize);
+    fprintf(stderr, "size is %ld %ld on %p\n", aSize.Width(), aSize.Height(), pParent);
+
+    aSize = dialog_vbox1.GetOptimalSize(WINDOWSIZE_PREFERRED);
+    dialog_vbox1.SetSizePixel(aSize);
+
     aOK.SetClickHdl(LINK(this,SwWordCountDialog,        OkHdl));
+
+    fprintf(stderr, "aOk is %p\n", &aOK);
+    fprintf(stderr, "aHelp is %p\n", &aHelp);
+    fprintf(stderr, "dialog_action_area1 is is %p\n", &dialog_action_area1);
+    fprintf(stderr, "aCurrentSelectionLine is is %p\n", &aCurrentSelectionLine);
+    fprintf(stderr, "aCurrentSelectionText is is %p\n", &aCurrentSelectionText);
+    fprintf(stderr, "aCurrentSelection is is %p\n", &aCurrentSelection);
+    fprintf(stderr, "dialog_vbox1 is is %p\n", &dialog_vbox1);
 }
 
 IMPL_LINK_NOARG(SwWordCountDialog, OkHdl)
@@ -85,14 +137,16 @@ SwWordCountDialog::~SwWordCountDialog()
     ViewShell::SetCareWin( 0 );
 }
 
-void  SwWordCountDialog::SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc)
+void  SwWordCountDialog::SetValues(const SwDocStat& rCurrent, const SwDocStat&)
 {
     aCurrentWordFI.SetText(     String::CreateFromInt32(rCurrent.nWord ));
     aCurrentCharacterFI.SetText(String::CreateFromInt32(rCurrent.nChar ));
     aCurrentCharacterExcludingSpacesFI.SetText(String::CreateFromInt32(rCurrent.nCharExcludingSpaces ));
+#if 0
     aDocWordFI.SetText(         String::CreateFromInt32(rDoc.nWord ));
     aDocCharacterFI.SetText(    String::CreateFromInt32(rDoc.nChar ));
     aDocCharacterExcludingSpacesFI.SetText(    String::CreateFromInt32(rDoc.nCharExcludingSpaces ));
+#endif
 }
 
 
diff --git a/sw/source/ui/dialog/wordcountdialog.hrc b/sw/source/ui/dialog/wordcountdialog.hrc
index 7d805a8ed689..7fcceb30093d 100644
--- a/sw/source/ui/dialog/wordcountdialog.hrc
+++ b/sw/source/ui/dialog/wordcountdialog.hrc
@@ -34,5 +34,8 @@
 #define FL_BOTTOM                                15
 #define PB_OK                                    16
 #define PB_HELP                                  17
+#define WINDOW_DLG                               18
+#define FT_CURRENT                               19
+#define FT_DOC                                   20
 
 #endif
diff --git a/sw/source/ui/dialog/wordcountdialog.src b/sw/source/ui/dialog/wordcountdialog.src
index 1b8b1a1e1291..267563300e9e 100644
--- a/sw/source/ui/dialog/wordcountdialog.src
+++ b/sw/source/ui/dialog/wordcountdialog.src
@@ -37,15 +37,20 @@ ModelessDialog DLG_WORDCOUNT
     Moveable = TRUE ;
 
     Closeable = TRUE;
-    Sizeable = FALSE ;
+    Sizeable = TRUE ;
     Hide = TRUE ;
 
-    FixedLine  FL_CURRENT
+    FixedText  FT_CURRENT
     {
         Pos = MAP_APPFONT ( 5 , 5 ) ;
         Size = MAP_APPFONT ( 160 , 8 ) ;
         Text [ en-US ] = "Current selection";
     };
+    FixedLine  FL_CURRENT
+    {
+        Pos = MAP_APPFONT ( 6 , 3 ) ;
+        Size = MAP_APPFONT ( 158 , 8 ) ;
+    };
     FixedText       FT_CURRENTWORD
     {
         Pos = MAP_APPFONT ( 10 , 16 ) ;
@@ -82,12 +87,17 @@ ModelessDialog DLG_WORDCOUNT
         Size = MAP_APPFONT ( 50 , 8 ) ;
         Right = TRUE;
     };
-    FixedLine       FL_DOC
+    FixedText       FT_DOC
     {
         Pos = MAP_APPFONT (  5, 54 ) ;
         Size = MAP_APPFONT ( 160 , 8 ) ;
         Text [ en-US ] = "Whole document";
     };
+    FixedLine       FL_DOC
+    {
+        Pos = MAP_APPFONT (  6, 52 ) ;
+        Size = MAP_APPFONT ( 158 , 8 ) ;
+    };
     FixedText       FT_DOCWORD
     {
         Pos = MAP_APPFONT (  10, 65 ) ;
diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx
index f70c6a8bccf9..14ee10c1104f 100644
--- a/sw/source/ui/inc/wordcountdialog.hxx
+++ b/sw/source/ui/inc/wordcountdialog.hxx
@@ -29,6 +29,7 @@
 #define SW_WORDCOUNTDIALOG_HXX
 #include <sfx2/basedlgs.hxx>
 #include <svtools/stdctrl.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/button.hxx>
 struct SwDocStat;
 #include <sfx2/childwin.hxx>
@@ -36,26 +37,31 @@ struct SwDocStat;
 
 class SwWordCountDialog
 {
-    FixedLine       aCurrentFL;
-    FixedText       aCurrentWordFT;
-    FixedInfo       aCurrentWordFI;
-    FixedText       aCurrentCharacterFT;
-    FixedInfo       aCurrentCharacterFI;
-    FixedText       aCurrentCharacterExcludingSpacesFT;
-    FixedInfo       aCurrentCharacterExcludingSpacesFI;
-
-    FixedLine       aDocFL;
-    FixedText       aDocWordFT;
-    FixedInfo       aDocWordFI;
-    FixedText       aDocCharacterFT;
-    FixedInfo       aDocCharacterFI;
-    FixedText       aDocCharacterExcludingSpacesFT;
-    FixedInfo       aDocCharacterExcludingSpacesFI;
-
-    FixedLine       aBottomFL;
-
-    OKButton        aOK;
-    HelpButton      aHelp;
+    VBox dialog_vbox1;
+    VBox box1;
+
+    HBox aCurrentSelection;
+    FixedText aCurrentSelectionText;
+    FixedLine aCurrentSelectionLine;
+
+    VBox aSelectionBox;
+    HBox aSelectionRow1;
+    FixedText aCurrentWordFT;
+    FixedInfo aCurrentWordFI;
+    HBox aSelectionRow2;
+    FixedText aCurrentCharacterFT;
+    FixedInfo aCurrentCharacterFI;
+    HBox aSelectionRow3;
+    FixedText aCurrentCharacterExcludingSpacesFT;
+    FixedInfo aCurrentCharacterExcludingSpacesFI;
+
+    HBox aDoc;
+    FixedText aDocText;
+    FixedLine aDocLine;
+
+    HBox dialog_action_area1;
+    OKButton aOK;
+    HelpButton aHelp;
 
     void InitControls();
 
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f1eb6f12ad57..02f52320b04d 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -264,6 +264,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/window/introwin \
     vcl/source/window/keycod \
     vcl/source/window/keyevent \
+    vcl/source/window/layout \
     vcl/source/window/menu \
     vcl/source/window/mnemonic \
     vcl/source/window/mnemonicengine \
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index e791793dbe62..cbdeb36234bc 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -89,6 +89,7 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/jobdata.hxx,vcl/jobdata.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/jobset.hxx,vcl/jobset.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/keycodes.hxx,vcl/keycodes.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/keycod.hxx,vcl/keycod.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/layout.hxx,vcl/layout.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lazydelete.hxx,vcl/lazydelete.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lineinfo.hxx,vcl/lineinfo.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/longcurr.hxx,vcl/longcurr.hxx))
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index 093ef1e0db69..c8bb05d2c9fb 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -83,6 +83,10 @@ public:
     virtual void    StateChanged( StateChangedType nStateChange );
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 
+    virtual Size    GetOptimalSize(WindowSizeType eType) const;
+    virtual void    Resize();
+
+
     virtual sal_Bool    Close();
 
     virtual short   Execute();
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index 63f094d0509d..4ce0d9d0c606 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.hxx
@@ -74,6 +74,8 @@ public:
     static Size     CalcMinimumTextSize( Control const* pControl, long nMaxWidth = 0 );
     Size            CalcMinimumSize( long nMaxWidth = 0 ) const;
     virtual Size    GetOptimalSize(WindowSizeType eType) const;
+
+    virtual void    SetText( const XubString& rStr );
 };
 
 // -------------
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
new file mode 100644
index 000000000000..eaff5037a43a
--- /dev/null
+++ b/vcl/inc/vcl/layout.hxx
@@ -0,0 +1,154 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef _VCLLAYOUT_HXX
+#define _VCLLAYOUT_HXX
+
+#include <vcl/dllapi.h>
+#include <vcl/window.hxx>
+
+class VCL_DLLPUBLIC Box : public Window
+{
+protected:
+    bool m_bHomogeneous;
+    int m_nSpacing;
+public:
+    Box(Window *pParent, bool bHomogeneous = false, int nSpacing = 0)
+        : Window(pParent)
+        , m_bHomogeneous(bHomogeneous)
+        , m_nSpacing(nSpacing)
+    {
+        Show();
+    }
+public:
+    virtual Size GetOptimalSize(WindowSizeType eType) const;
+    using Window::SetPosSizePixel;
+    virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
+protected:
+    Size calculateRequisition() const;
+    void setAllocation(const Size &rAllocation);
+
+    virtual long getPrimaryDimension(const Size &rSize) const = 0;
+    virtual void setPrimaryDimension(Size &rSize, long) const = 0;
+    virtual long getPrimaryCoordinate(const Point &rPos) const = 0;
+    virtual void setPrimaryCoordinate(Point &rPos, long) const = 0;
+    virtual long getSecondaryDimension(const Size &rSize) const = 0;
+    virtual void setSecondaryDimension(Size &rSize, long) const = 0;
+    virtual long getSecondaryCoordinate(const Point &rPos) const = 0;
+    virtual void setSecondaryCoordinate(Point &rPos, long) const = 0;
+
+    virtual long getPrimaryDimensionBorders(sal_Int32 nLeftBorder, sal_Int32 nTopBorder,
+        sal_Int32 nRightBorder, sal_Int32 nBottomBorder) = 0;
+};
+
+class VCL_DLLPUBLIC VBox : public Box
+{
+protected:
+    virtual long getPrimaryDimension(const Size &rSize) const
+    {
+        return rSize.getHeight();
+    }
+    virtual void setPrimaryDimension(Size &rSize, long nHeight) const
+    {
+        rSize.setHeight(nHeight);
+    }
+    virtual long getPrimaryCoordinate(const Point &rPos) const
+    {
+        return rPos.getY();
+    }
+    virtual void setPrimaryCoordinate(Point &rPos, long nPos) const
+    {
+        rPos.setY(nPos);
+    }
+    virtual long getSecondaryDimension(const Size &rSize) const
+    {
+        return rSize.getWidth();
+    }
+    virtual void setSecondaryDimension(Size &rSize, long nWidth) const
+    {
+        rSize.setWidth(nWidth);
+    }
+    virtual long getSecondaryCoordinate(const Point &rPos) const
+    {
+        return rPos.getX();
+    }
+    virtual void setSecondaryCoordinate(Point &rPos, long nPos) const
+    {
+        rPos.setX(nPos);
+    }
+    virtual long getPrimaryDimensionBorders(sal_Int32, sal_Int32 nTopBorder,
+        sal_Int32, sal_Int32 nBottomBorder)
+    {
+        return nTopBorder + nBottomBorder;
+    }
+};
+
+class VCL_DLLPUBLIC HBox : public Box
+{
+protected:
+    virtual long getPrimaryDimension(const Size &rSize) const
+    {
+        return rSize.getWidth();
+    }
+    virtual void setPrimaryDimension(Size &rSize, long nWidth) const
+    {
+        rSize.setWidth(nWidth);
+    }
+    virtual long getPrimaryCoordinate(const Point &rPos) const
+    {
+        return rPos.getX();
+    }
+    virtual void setPrimaryCoordinate(Point &rPos, long nPos) const
+    {
+        rPos.setX(nPos);
+    }
+    virtual long getSecondaryDimension(const Size &rSize) const
+    {
+        return rSize.getHeight();
+    }
+    virtual void setSecondaryDimension(Size &rSize, long nHeight) const
+    {
+        rSize.setHeight(nHeight);
+    }
+    virtual long getSecondaryCoordinate(const Point &rPos) const
+    {
+        return rPos.getY();
+    }
+    virtual void setSecondaryCoordinate(Point &rPos, long nPos) const
+    {
+        rPos.setY(nPos);
+    }
+    virtual long getPrimaryDimensionBorders(sal_Int32 nLeftBorder, sal_Int32,
+        sal_Int32 nRightBorder, sal_Int32)
+    {
+        return nLeftBorder + nRightBorder;
+    }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 67349eed3742..6fd7eca3cd13 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -379,6 +379,11 @@ private:
     //
     WindowImpl* mpWindowImpl;
 
+    //^^^la la la, I can't hear you^^^
+    bool m_bExpand;
+    bool m_bFill;
+    long m_nPadding;
+
     SAL_DLLPRIVATE void ImplInitWindowData( WindowType nType );
 
 #ifdef DBG_UTIL
@@ -1057,6 +1062,14 @@ public:
 
     // Advisory Sizing - what is a good size for this widget ?
     virtual Size GetOptimalSize(WindowSizeType eType) const;
+    bool getExpand() const { return m_bExpand; }
+    bool getFill() const { return m_bFill; }
+    long getPadding() const { return m_nPadding; }
+    void setExpand(bool bExpand) { m_bExpand = bExpand; }
+    void setFill(bool bFill) { m_bFill = bFill; }
+    void setPadding(long nPadding) { m_nPadding = nPadding; }
+    void queueResize();
+
 
     //-------------------------------------
     //  Native Widget Rendering functions
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 62fae387d47e..b1765b8bb427 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -429,6 +429,15 @@ void  FixedText::FillLayoutData() const
     ImplDraw( const_cast<FixedText*>(this), 0, Point(), GetOutputSizePixel(), true );
 }
 
+
+void FixedText::SetText( const XubString& rStr )
+{
+    fprintf(stderr, "FixedText::SetText changed\n");
+    Window::SetText(rStr);
+    //Text changed, tell possibly existing layout that size requisition has changed
+    queueResize();
+}
+
 // =======================================================================
 
 void FixedLine::ImplInit( Window* pParent, WinBits nStyle )
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 3d6ad01f1c67..4afdf7e7516a 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -944,6 +944,29 @@ void Dialog::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal
     pDev->Pop();
 }
 
+Size Dialog::GetOptimalSize(WindowSizeType eType) const
+{
+    if (eType == WINDOWSIZE_MAXIMUM)
+        return SystemWindow::GetOptimalSize(eType);
+    Size aSize;
+    if (GetChildCount() == 1)
+        aSize = GetChild(0)->GetOptimalSize(eType);
+    return Window::CalcWindowSize(aSize);
+}
+
+void Dialog::Resize()
+{
+    fprintf(stderr, "Dialog::Resize\n");
+    if (GetChildCount() == 1)
+    {
+        Size aSize = GetSizePixel();
+        aSize.Width() -= mpWindowImpl->mnLeftBorder + mpWindowImpl->mnRightBorder;
+        aSize.Height() -= mpWindowImpl->mnTopBorder + mpWindowImpl->mnBottomBorder;
+        Point aPos(mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder);
+        GetChild(0)->SetPosSizePixel(aPos, aSize);
+    }
+}
+
 // -----------------------------------------------------------------------
 
 ModelessDialog::ModelessDialog( Window* pParent, const ResId& rResId ) :
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
new file mode 100644
index 000000000000..b44c9fcaf12e
--- /dev/null
+++ b/vcl/source/window/layout.cxx
@@ -0,0 +1,171 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include <vcl/layout.hxx>
+#include <boost/bind.hpp>
+
+#define callDimension(object,ptrToMember) ((object).*(ptrToMember))()
+
+Size Box::calculateRequisition() const
+{
+    long nMaxChildDimension = 0;
+
+    sal_uInt16 nVisibleChildren = 0;
+
+    Size aSize;
+    sal_uInt16 nChildren = GetChildCount();
+    for (sal_uInt16 i = 0; i < nChildren; ++i)
+    {
+        Window *pChild = GetChild(i);
+        if (!pChild->IsVisible())
+            continue;
+        ++nVisibleChildren;
+        Size aChildSize = pChild->GetOptimalSize(WINDOWSIZE_PREFERRED);
+        fprintf(stderr, "child %p wants to be %ld %ld\n", pChild, aChildSize.Width(), aChildSize.Height());
+        long nSecondaryDimension = getSecondaryDimension(aChildSize);
+        if (nSecondaryDimension > getSecondaryDimension(aSize))
+            setSecondaryDimension(aSize, nSecondaryDimension);
+        if (m_bHomogeneous)
+        {
+            long nPrimaryDimension = getPrimaryDimension(aChildSize);
+            if (nPrimaryDimension > nMaxChildDimension)
+                nMaxChildDimension = nPrimaryDimension;
+        }
+        else
+        {
+            long nPrimaryDimension = getPrimaryDimension(aSize);
+            setPrimaryDimension(aSize, nPrimaryDimension + getPrimaryDimension(aChildSize));
+        }
+    }
+
+    if (nVisibleChildren)
+    {
+        long nPrimaryDimension = getPrimaryDimension(aSize);
+        if (m_bHomogeneous)
+            nPrimaryDimension += nMaxChildDimension * (nVisibleChildren-1);
+        setPrimaryDimension(aSize, nPrimaryDimension + m_nSpacing * (nVisibleChildren-1));
+    }
+
+    return aSize;
+}
+
+Size Box::GetOptimalSize(WindowSizeType eType) const
+{
+    if (eType == WINDOWSIZE_MAXIMUM)
+        return Window::GetOptimalSize(eType);
+    return calculateRequisition();
+}
+
+void Box::setAllocation(const Size &rAllocation)
+{
+    sal_uInt16 nChildren = GetChildCount();
+    if (!nChildren)
+        return;
+
+    sal_uInt16 nVisibleChildren = 0, nExpandChildren = 0;;
+    for (sal_uInt16 i = 0; i < nChildren; ++i)
+    {
+        Window *pChild = GetChild(i);
+        if (!pChild->IsVisible())
+            continue;
+        ++nVisibleChildren;
+        if (pChild->getExpand())
+            ++nExpandChildren;
+    }
+
+    if (!nVisibleChildren)
+        return;
+
+    sal_Int32 nLeftBorder, nTopBorder, nRightBorder, nBottomBorder;
+    GetBorder(nLeftBorder, nTopBorder, nRightBorder, nBottomBorder);
+    Point aPos(nLeftBorder, nTopBorder);
+
+    Size aSize = rAllocation;
+
+    long nHomogeneousDimension, nExtraSpace = 0;
+    if (m_bHomogeneous)
+    {
+        long nBorder = getPrimaryDimensionBorders(nLeftBorder, nTopBorder, nRightBorder, nBottomBorder);
+        nHomogeneousDimension = ( ( getPrimaryDimension(rAllocation) - nBorder -
+                          ( nVisibleChildren - 1 ) * m_nSpacing )) / nVisibleChildren;
+    }
+    else if (nExpandChildren)
+    {
+        Size aRequisition = calculateRequisition();
+        nExtraSpace = (getPrimaryDimension(rAllocation) - getPrimaryDimension(aRequisition)) / nExpandChildren;
+    }
+
+    for (sal_uInt16 i = 0; i < nChildren; ++i)
+    {
+        Window *pChild = GetChild(i);
+        if (!pChild->IsVisible())
+            continue;
+
+        Size aBoxSize;
+        if (m_bHomogeneous)
+            setPrimaryDimension(aBoxSize, nHomogeneousDimension);
+        else
+        {
+            aBoxSize = pChild->GetOptimalSize(WINDOWSIZE_PREFERRED);
+            long nPrimaryDimension = getPrimaryDimension(aBoxSize);
+            nPrimaryDimension += pChild->getPadding();
+            if (pChild->getExpand())
+                setPrimaryDimension(aBoxSize, nPrimaryDimension + nExtraSpace);
+        }
+        setSecondaryDimension(aBoxSize, getSecondaryDimension(aSize));
+
+        Point aChildPos(aPos);
+        long nPrimaryCoordinate = getPrimaryCoordinate(aChildPos);
+        setPrimaryCoordinate(aChildPos, nPrimaryCoordinate + pChild->getPadding());
+
+        Size aChildSize(aBoxSize);
+        if (pChild->getFill())
+            setPrimaryDimension(aChildSize, std::max(static_cast<long>(1), getPrimaryDimension(aBoxSize)-pChild->getPadding()));
+        else
+        {
+            setPrimaryDimension(aChildSize, getPrimaryDimension(pChild->GetOptimalSize(WINDOWSIZE_PREFERRED)));
+            setPrimaryCoordinate(aChildPos, getPrimaryCoordinate(aChildPos) +
+                (getPrimaryDimension(aBoxSize) - getPrimaryDimension(aChildSize)) / 2);
+            setSecondaryCoordinate(aChildPos, getSecondaryCoordinate(aChildPos) +
+                (getSecondaryDimension(aBoxSize) - getSecondaryDimension(aChildSize)) / 2);
+        }
+
+        pChild->SetPosSizePixel(aChildPos, aChildSize);
+        fprintf(stderr, "child %p set to %ld %ld : %ld %ld\n", pChild, aPos.X(), aPos.Y(), aChildSize.Width(), aChildSize.Height());
+        nPrimaryCoordinate = getPrimaryCoordinate(aPos);
+        setPrimaryCoordinate(aPos, nPrimaryCoordinate + getPrimaryDimension(aBoxSize) + m_nSpacing + pChild->getPadding());
+    }
+}
+
+void Box::SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation)
+{
+    Window::SetPosSizePixel(rAllocPos, rAllocation);
+    setAllocation(rAllocation);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 73280fe1080f..a866a7d32974 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -574,6 +574,10 @@ CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, Window* pSour
 
 void Window::ImplInitWindowData( WindowType nType )
 {
+    m_bExpand = false;
+    m_bFill = false;
+    m_nPadding = 0;
+
     mpWindowImpl = new WindowImpl;
 
     meOutDevType        = OUTDEV_WINDOW;
@@ -9571,4 +9575,18 @@ Selection Window::GetSurroundingTextSelection() const
   return Selection( 0, 0 );
 }
 
+//Poor man's equivalent, when widget want's to renegotiate
+//size, get parent dialog and call resize on it
+void Window::queueResize()
+{
+    fprintf(stderr, "Window::queueResize called\n");
+    Window *pParent = GetParentDialog();
+    fprintf(stderr, "parent dialog is %p\n", pParent);
+    if (pParent && pParent->GetChildCount() == 1)
+    {
+        fprintf(stderr, "suitable, so call resize\n");
+        pParent->Resize();
+    }
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */