More work on Widget::extraSpace.

1 files changed, 10 insertions, 1 deletions

diff --git a/dw/widget.hh b/dw/widget.hh
index 46fdf856..88219764 100644
--- a/dw/widget.hh
+++ b/dw/widget.hh
@@ -187,7 +187,10 @@ protected:
 
    /**
     * \brief Space around the margin box. Allocation is extraSpace +
-    *    margin + border + padding + contents;
+    *    margin + border + padding + contents.
+    *
+    * See also dw::core::Widget::calcExtraSpace and
+    * dw::core::Widget::calcExtraSpaceImpl.
     */
    style::Box extraSpace;
 
@@ -275,6 +278,8 @@ protected:
     */
    virtual void getExtremesImpl (Extremes *extremes) = 0;
 
+   virtual void calcExtraSpaceImpl ();
+
    /**
     * \brief See \ref dw-widget-sizes.
     */
@@ -427,6 +432,8 @@ public:
    void getExtremes (Extremes *extremes);
    void sizeAllocate (Allocation *allocation);
 
+   void calcExtraSpace ();
+
    int getAvailWidth (bool forceValue);
    int getAvailHeight (bool forceValue);
    virtual bool getAdjustMinWidth () { return Widget::adjustMinWidth; }
@@ -489,6 +496,8 @@ public:
    void scrollTo (HPosition hpos, VPosition vpos,
                   int x, int y, int width, int height);
 
+   void getMarginArea (int *xMar, int *yMar, int *widthMar, int *heightMar);
+   void getBorderArea (int *xBor, int *yBor, int *widthBor, int *heightBor);
    void getPaddingArea (int *xPad, int *yPad, int *widthPad, int *heightPad);
 
    /**