diff options
| -rw-r--r-- | doc/dw-out-of-flow.doc | 4 | ||||
| -rw-r--r-- | dw/oofawarewidget.hh | 2 | ||||
| -rw-r--r-- | dw/textblock.hh | 15 |
3 files changed, 12 insertions, 9 deletions
diff --git a/doc/dw-out-of-flow.doc b/doc/dw-out-of-flow.doc index b7ebee40..f5eade21 100644 --- a/doc/dw-out-of-flow.doc +++ b/doc/dw-out-of-flow.doc @@ -1,9 +1,5 @@ /** \page dw-out-of-flow Handling Elements Out Of Flow -<div style="border: 2px solid #ffff00; margin-bottom: 0.5em; -padding: 0.5em 1em; background-color: #ffffe0"><b>Info:</b> -Should be incorporated into dw::Textblock.</div> - <div style="border: 2px solid #ff4040; margin-bottom: 0.5em; padding: 0.5em 1em; background-color: #fff0f0"><b>Info:</b> Not up to date; incorporate these two changes: (i) there are different diff --git a/dw/oofawarewidget.hh b/dw/oofawarewidget.hh index ba686913..17123910 100644 --- a/dw/oofawarewidget.hh +++ b/dw/oofawarewidget.hh @@ -15,6 +15,8 @@ namespace oof { * (Perhaps it should be diffenciated between the two roles, container * and generator, but this would make multiple inheritance necessary.) * + * See \ref dw-out-of-flow for an overview. + * * Requirements for sub classes (in most cases refer to dw::Textblock * as a good example): * diff --git a/dw/textblock.hh b/dw/textblock.hh index c4f2c66d..4a8290a8 100644 --- a/dw/textblock.hh +++ b/dw/textblock.hh @@ -23,10 +23,9 @@ namespace dw { * * <div style="border: 2px solid #ffff00; margin-top: 0.5em; * margin-bottom: 0.5em; padding: 0.5em 1em; background-color: - * #ffffe0"><b>Info:</b> The recent changes (line breaking and - * hyphenation on one hand, floats on the other hand) have not yet - * been incorporated into this documentation. See \ref - * dw-line-breaking and \ref dw-out-of-flow.</div> + * #ffffe0"><b>Info:</b> Some (not so) recent changes, line breaking + * and hyphenation, have not yet been incorporated into this + * documentation. See \ref dw-line-breaking.</div> * * <h3>Signals</h3> * @@ -163,7 +162,7 @@ namespace dw { * Anchors associate the anchor name with the index of the next word at * the point of the anchor. * - * <h4>Incremental Resizing</h4> + * <h3>Incremental Resizing</h3> * * dw::Textblock makes use of incremental resizing as described in \ref * dw-widget-sizes. The parentRef is, for children of a dw::Textblock, simply @@ -194,6 +193,12 @@ namespace dw { * dw::Textblock, which has the value -1 if no rewrapping of lines * necessary, or otherwise the line from which a rewrap is necessary. * + * <h3>Widgets Ouf Of Flow</h3> + * + * See + * + * - dw::oof::OOFAwareWidget (base class) and + * - \ref dw-out-of-flow. */ class Textblock: public oof::OOFAwareWidget { |