Simplified interrupted drawing. (Mouse events will follow.)

2 files changed, 4 insertions, 6 deletions

diff --git a/test/dw_simple_container.cc b/test/dw_simple_container.cc
index c1f22458..2e9ed6ae 100644
--- a/test/dw_simple_container.cc
+++ b/test/dw_simple_container.cc
@@ -209,13 +209,12 @@ void SimpleContainer::sizeAllocateImpl (Allocation *allocation)
 }
 
 void SimpleContainer::draw (View *view, Rectangle *area,
-                            StackingIteratorStack *iteratorStack,
-                            Widget **interruptedWidget)
+                            DrawingContext *context)
 {
    drawWidgetBox (view, area, false);
    Rectangle childArea;
-   if (child && child->intersects (area, &childArea))
-      child->drawTotal (view, &childArea, iteratorStack, interruptedWidget);
+   if (child && child->intersects (this, area, &childArea))
+      child->draw (view, &childArea, context);
 }
 
 Iterator *SimpleContainer::iterator (Content::Type mask, bool atEnd)
diff --git a/test/dw_simple_container.hh b/test/dw_simple_container.hh
index 423b1fab..021f5277 100644
--- a/test/dw_simple_container.hh
+++ b/test/dw_simple_container.hh
@@ -45,8 +45,7 @@ public:
    ~SimpleContainer ();
 
    void draw (core::View *view, core::Rectangle *area,
-              core::StackingIteratorStack *iteratorStack,
-              Widget **interruptedWidget);
+              core::DrawingContext *context);
    core::Iterator *iterator (core::Content::Type mask, bool atEnd);
    void removeChild (Widget *child);