aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2014-08-13 22:03:05 +0200
committerSebastian Geerken <devnull@localhost>2014-08-13 22:03:05 +0200
commit2d53ecf97d42642a6684e49b61d981103d745a42 (patch)
treee6ef93ac6f217291548feb958fb1cf03c3a7c2ed
parenta897977f31889bb32044cfcca81e288f5ff740f6 (diff)
Removed Table::correctRequisitionOfChild, which is unnecessary and harmful.
-rw-r--r--dw/table.cc28
-rw-r--r--dw/table.hh3
2 files changed, 0 insertions, 31 deletions
diff --git a/dw/table.cc b/dw/table.cc
index 54264828..42963ba0 100644
--- a/dw/table.cc
+++ b/dw/table.cc
@@ -232,34 +232,6 @@ int Table::getAvailWidthOfChild (Widget *child, bool forceValue)
return width;
}
-void Table::correctRequisitionOfChild (core::Widget *child,
- core::Requisition *requisition,
- void (*splitHeightFun) (int, int*, int*))
-{
- // TODO Same comments as in Widget::correctRequisitionOfChild may
- // apply here.
-
- DBG_OBJ_ENTER ("resize", 0, "correctRequisitionOfChild",
- "%p, %d * (%d + %d), ...)",
- child, requisition->width, requisition->ascent,
- requisition->descent);
-
- if (child->getStyle()->width != core::style::LENGTH_AUTO) {
- calcCellSizes (false);
- // The requisition is always the width of the column; the table
- // widget is special in inforcing this, based on extremes, which
- // may again be corrected again by CSS attributes.
- requisition->width = calcAvailWidthForDescendant (child);
- }
-
- correctReqHeightOfChild (child, requisition, splitHeightFun);
-
- DBG_OBJ_MSGF ("resize", 1, "=> %d * (%d + %d)",
- requisition->width, requisition->ascent,
- requisition->descent);
- DBG_OBJ_LEAVE ();
-}
-
int Table::calcAvailWidthForDescendant (Widget *child)
{
DBG_OBJ_ENTER ("resize", 0, "calcAvailWidthForDescendant", "%p", child);
diff --git a/dw/table.hh b/dw/table.hh
index a20e8c6b..a8823ca0 100644
--- a/dw/table.hh
+++ b/dw/table.hh
@@ -467,9 +467,6 @@ protected:
bool getAdjustMinWidth () { return Table::adjustTableMinWidth; }
int getAvailWidthOfChild (Widget *child, bool forceValue);
- void correctRequisitionOfChild (core::Widget *child,
- core::Requisition *requisition,
- void (*splitHeightFun) (int, int*, int*));
void containerSizeChangedForChildren ();
bool affectsSizeChangeContainerChild (Widget *child);