Merge with main repo. (But something is not working yet.)

1 files changed, 5 insertions, 0 deletions

diff --git a/dw/style.cc b/dw/style.cc
index 1c2978b4..830613fa 100644
--- a/dw/style.cc
+++ b/dw/style.cc
@@ -76,6 +76,7 @@ void StyleAttrs::initValues ()
    minWidth = maxWidth = minHeight = maxHeight = LENGTH_AUTO;
    vloat = FLOAT_NONE;
    clear = CLEAR_NONE;
+   overflow = OVERFLOW_VISIBLE;
    position = POSITION_STATIC;
    top = bottom = left = right = LENGTH_AUTO;
    textIndent = 0;
@@ -107,6 +108,7 @@ void StyleAttrs::resetValues ()
    textAlignChar = '.';
    vloat = FLOAT_NONE; /** \todo Correct? Check specification. */
    clear = CLEAR_NONE; /** \todo Correct? Check specification. */
+   overflow = OVERFLOW_VISIBLE;
    position = POSITION_STATIC; /** \todo Correct? Check specification. */
    top = bottom = left = right = LENGTH_AUTO; /** \todo Correct? Check
                                                   specification. */
@@ -168,6 +170,7 @@ bool StyleAttrs::equals (object::Object *other) {
        textTransform == otherAttrs->textTransform &&
        vloat == otherAttrs->vloat &&
        clear == otherAttrs->clear &&
+       overflow == otherAttrs->overflow &&
        position == otherAttrs->position &&
        top == otherAttrs->top &&
        bottom == otherAttrs->bottom &&
@@ -225,6 +228,7 @@ int StyleAttrs::hashValue () {
       textTransform +
       vloat +
       clear +
+      overflow +
       position +
       top +
       bottom +
@@ -352,6 +356,7 @@ void Style::copyAttrs (StyleAttrs *attrs)
    textTransform = attrs->textTransform;
    vloat = attrs->vloat;
    clear = attrs->clear;
+   overflow = attrs->overflow;
    position = attrs->position;
    top = attrs->top;
    bottom = attrs->bottom;