diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/dw_simple_container.cc | 11 | ||||
| -rw-r--r-- | test/dw_simple_container.hh | 5 |
2 files changed, 7 insertions, 9 deletions
diff --git a/test/dw_simple_container.cc b/test/dw_simple_container.cc index 9507e233..94dec2d5 100644 --- a/test/dw_simple_container.cc +++ b/test/dw_simple_container.cc @@ -205,17 +205,14 @@ namespace dw { } } -core::Widget *SimpleContainer::draw (View *view, Rectangle *area, - StackingIteratorStack *iteratorStack) +void SimpleContainer::draw (View *view, Rectangle *area, + StackingIteratorStack *iteratorStack, + Widget **interruptedWidget) { - Widget *retWidget = NULL; - drawWidgetBox (view, area, false); Rectangle childArea; if (child && child->intersects (area, &childArea)) - retWidget = child->drawTotal (view, &childArea, iteratorStack); - - return retWidget; + child->drawTotal (view, &childArea, iteratorStack, interruptedWidget); } Iterator *SimpleContainer::iterator (Content::Type mask, bool atEnd) diff --git a/test/dw_simple_container.hh b/test/dw_simple_container.hh index 251df8fb..9f3b2ca6 100644 --- a/test/dw_simple_container.hh +++ b/test/dw_simple_container.hh @@ -44,8 +44,9 @@ public: SimpleContainer (); ~SimpleContainer (); - Widget *draw (core::View *view, core::Rectangle *area, - core::StackingIteratorStack *iteratorStack); + void draw (core::View *view, core::Rectangle *area, + core::StackingIteratorStack *iteratorStack, + Widget **interruptedWidget); core::Iterator *iterator (core::Content::Type mask, bool atEnd); void removeChild (Widget *child); |