diff options
Diffstat (limited to 'dw')
| -rw-r--r-- | dw/fltkviewport.cc | 7 | ||||
| -rw-r--r-- | dw/ooffloatsmgr.cc | 2 | ||||
| -rw-r--r-- | dw/table.cc | 3 | ||||
| -rw-r--r-- | dw/table.hh | 17 | ||||
| -rw-r--r-- | dw/view.hh | 2 |
5 files changed, 20 insertions, 11 deletions
diff --git a/dw/fltkviewport.cc b/dw/fltkviewport.cc index 91d4ee57..6d2c5ecd 100644 --- a/dw/fltkviewport.cc +++ b/dw/fltkviewport.cc @@ -121,13 +121,15 @@ void FltkViewport::adjustScrollbarsAndGadgetsAllocation () vscrollbar->resize(x () + w () - SCROLLBAR_THICKNESS, y (), SCROLLBAR_THICKNESS, h () - vdiff); - int X = x () + w () - SCROLLBAR_THICKNESS; - int Y = y () + h () - SCROLLBAR_THICKNESS; + //int X = x () + w () - SCROLLBAR_THICKNESS; + //int Y = y () + h () - SCROLLBAR_THICKNESS; for (Iterator <TypedPointer < Fl_Widget> > it = gadgets->iterator (); it.hasNext (); ) { Fl_Widget *widget = it.getNext()->getTypedValue (); widget->resize(x (), y (), SCROLLBAR_THICKNESS, SCROLLBAR_THICKNESS); + /* FIXME: This has no effect */ +#if 0 switch (gadgetOrientation [visibility]) { case GADGET_VERTICAL: Y -= SCROLLBAR_THICKNESS; @@ -137,6 +139,7 @@ void FltkViewport::adjustScrollbarsAndGadgetsAllocation () X -= SCROLLBAR_THICKNESS; break; } +#endif } } diff --git a/dw/ooffloatsmgr.cc b/dw/ooffloatsmgr.cc index aed1f936..54ea5744 100644 --- a/dw/ooffloatsmgr.cc +++ b/dw/ooffloatsmgr.cc @@ -548,7 +548,7 @@ int OOFFloatsMgr::addWidgetOOF (Widget *widget, OOFAwareWidget *generatingBlock, DBG_OBJ_ENTER ("construct.oofm", 0, "addWidgetOOF", "%p, %p, %d", widget, generatingBlock, externalIndex); - int subRef; + int subRef = 0; TBInfo *tbInfo = getOOFAwareWidget (generatingBlock); Float *vloat = new Float (this, widget, generatingBlock, externalIndex); diff --git a/dw/table.cc b/dw/table.cc index 582c8184..18bf81cd 100644 --- a/dw/table.cc +++ b/dw/table.cc @@ -1196,10 +1196,13 @@ void Table::actuallyCalcCellSizes (bool calcHeights) for (int col = 0; col < numCols; col++) { int n = row * numCols + col; if (childDefined (n)) { + /* FIXME: Variable width is not used */ +#if 0 int width = (children->get(n)->cell.colspanEff - 1) * getStyle()->hBorderSpacing; for (int i = 0; i < children->get(n)->cell.colspanEff; i++) width += colWidths->get (col + i); +#endif core::Requisition childRequisition; //children->get(n)->cell.widget->setWidth (width); diff --git a/dw/table.hh b/dw/table.hh index 3729da71..ad1a2ddc 100644 --- a/dw/table.hh +++ b/dw/table.hh @@ -325,6 +325,14 @@ namespace dw { class Table: public oof::OOFAwareWidget { private: + struct Cell { + core::Widget *widget; + int colspanOrig, colspanEff, rowspan; + }; + struct SpanSpace { + int startCol, startRow; // where the cell starts + }; + struct Child { enum { @@ -332,13 +340,8 @@ private: SPAN_SPACE // part of a spanning cell } type; union { - struct { - core::Widget *widget; - int colspanOrig, colspanEff, rowspan; - } cell; - struct { - int startCol, startRow; // where the cell starts - } spanSpace; + struct Cell cell; + struct SpanSpace spanSpace; }; }; @@ -48,7 +48,7 @@ public: * Scrolling and Related. Only usesViewport must be * implemented, if it returns false, the other methods * are never called. - * ------------------------------------------------------- + * --------------------------------------------------------- */ /** |