--- a/mamba/widgets/base.py	Sun Sep 11 14:06:58 2011 +0200
+++ b/mamba/widgets/base.py	Sun Sep 11 14:21:50 2011 +0200
@@ -6,11 +6,11 @@
     def __init__(self, rect):
         self.rect = pygame.Rect(rect)
 
-    def do_event(self, event):
+    def event(self, event):
         "Override me"
         pass
 
-    def do_draw(self, surface):
+    def draw(self, surface):
         "Override me"
         pass
 
@@ -23,18 +23,11 @@
     def event(self, event):
         for child in self.children:
             # TODO mouse events
-            if issubclass(child, Container):
-                child.event(event)
-            else:
-                child.do_event(event)
+            child.event(event)
 
     def add(self, widget):
         self.children.append(widget)
 
     def draw(self, surface):
-        self.do_draw(surface)
         for child in self.children:
-            if issubclass(child, Container):
-                child.draw(surface)
-            else:
-                child.do_draw(surface)
+            child.draw(surface)