1 files changed, 9 insertions, 9 deletions

diff --git a/dw/table.cc b/dw/table.cc
index b6f7209b..565dfc9e 100644
--- a/dw/table.cc
+++ b/dw/table.cc
@@ -482,7 +482,7 @@ void Table::reallocChildren (int newNumCols, int newNumRows)
 
 void Table::calcCellSizes ()
 {
-   if (needsResize ())
+   if (needsResize () || resizeQueued ())
       forceCalcCellSizes ();
 }
 
@@ -640,7 +640,7 @@ void Table::apportionRowSpan ()
  */
 void Table::calcColumnExtremes ()
 {
-   if (extremesChanged ())
+   if (extremesChanged () || extremesQueued ())
       forceCalcColumnExtremes ();
 }
 
@@ -1130,7 +1130,7 @@ Table::TableIterator::TableIterator (Table *table,
    else if (index >= table->children->size ())
       content.type = core::Content::END;
    else {
-      content.type = core::Content::WIDGET;
+      content.type = core::Content::WIDGET_IN_FLOW;
       content.widget = table->children->get(index)->cell.widget;
    }
 }
@@ -1152,8 +1152,8 @@ bool Table::TableIterator::next ()
    if (content.type == core::Content::END)
       return false;
 
-   // tables only contain widgets:
-   if ((getMask() & core::Content::WIDGET) == 0) {
+   // tables only contain widgets (in flow):
+   if ((getMask() & core::Content::WIDGET_IN_FLOW) == 0) {
       content.type = core::Content::END;
       return false;
    }
@@ -1167,7 +1167,7 @@ bool Table::TableIterator::next ()
    } while (table->children->get(index) == NULL ||
             table->children->get(index)->type != Child::CELL);
 
-   content.type = core::Content::WIDGET;
+   content.type = core::Content::WIDGET_IN_FLOW;
    content.widget = table->children->get(index)->cell.widget;
    return true;
 }
@@ -1179,8 +1179,8 @@ bool Table::TableIterator::prev ()
    if (content.type == core::Content::START)
       return false;
 
-   // tables only contain widgets:
-   if ((getMask() & core::Content::WIDGET) == 0) {
+   // tables only contain widgets (in flow):
+   if ((getMask() & core::Content::WIDGET_IN_FLOW) == 0) {
       content.type = core::Content::START;
       return false;
    }
@@ -1194,7 +1194,7 @@ bool Table::TableIterator::prev ()
    } while (table->children->get(index) == NULL ||
             table->children->get(index)->type != Child::CELL);
 
-   content.type = core::Content::WIDGET;
+   content.type = core::Content::WIDGET_IN_FLOW;
    content.widget = table->children->get(index)->cell.widget;
    return true;
 }