Merge with main repo.

1 files changed, 9 insertions, 5 deletions

diff --git a/dw/ui.hh b/dw/ui.hh
index 1ff896f5..a4c77ceb 100644
--- a/dw/ui.hh
+++ b/dw/ui.hh
@@ -237,7 +237,8 @@ protected:
    void correctRequisitionOfChild (Widget *child,
                                    Requisition *requisition,
                                    void (*splitHeightFun) (int, int*, int*));
-   void correctExtremesOfChild (Widget *child, Extremes *extremes);
+   void correctExtremesOfChild (Widget *child, Extremes *extremes,
+                                bool useAdjustmentWidth);
 
    void containerSizeChangedForChildren ();
 
@@ -270,8 +271,9 @@ public:
                                                                      int*))
    { Widget::correctReqHeightOfChild (child, requisition, splitHeightFun); }
 
-   virtual void correctExtremesOfChildNoRec (Widget *child, Extremes *extremes)
-   { Widget::correctExtremesOfChild (child, extremes); }
+   virtual void correctExtremesOfChildNoRec (Widget *child, Extremes *extremes,
+                                             bool useAdjustmentWidth)
+   { Widget::correctExtremesOfChild (child, extremes, useAdjustmentWidth); }
 };
 
 /**
@@ -363,7 +365,8 @@ public:
                                            Requisition *requisition,
                                            void (*splitHeightFun) (int, int*,
                                                                    int*));
-   virtual void correctExtremesOfChild (Widget *child, Extremes *extremes);
+   virtual void correctExtremesOfChild (Widget *child, Extremes *extremes,
+                                        bool useAdjustmentWidth);
    virtual void containerSizeChangedForChildren ();
 
    virtual void setDisplayed (bool displayed);
@@ -439,7 +442,8 @@ public:
    void correctRequisitionOfChild (Widget *child,
                                    Requisition *requisition,
                                    void (*splitHeightFun) (int, int*, int*));
-   void correctExtremesOfChild (Widget *child, Extremes *extremes);
+   void correctExtremesOfChild (Widget *child, Extremes *extremes,
+                                bool useAdjustmentWidth);
    void containerSizeChangedForChildren ();
 
    Iterator *iterator (Content::Type mask, bool atEnd);