X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Fbase.py;h=133cc532c2ae8fb0886117255decbba65f1e374c;hb=d9ded620200ed74517f17f83f01313470ffca222;hp=b922b62280a595d61b1e422685add1b87ba9ad6a;hpb=0b4f46ac5262aed61cf3aeb994a1b55fa7823c7c;p=naja.git

diff --git a/naja/widgets/base.py b/naja/widgets/base.py
index b922b62..133cc53 100644
--- a/naja/widgets/base.py
+++ b/naja/widgets/base.py
@@ -1,4 +1,5 @@
 import pygame
+from naja.events import InvalidateTheWorld
 
 
 class Widget(object):
@@ -11,13 +12,45 @@ class Widget(object):
     def rect(self):
         return pygame.Rect(self.pos, self.size)
 
+    def render(self, surface):
+        '''Draw the widget onto surface'''
+        if not self._prepared:
+            self.prepare()
+            self._prepared = True
+        self.draw(surface)
+
     def draw(self, surface):
+        '''The overrideable bit of widget drawing'''
         raise NotImplemented()
 
     def prepare(self):
-        if not self._prepared:
-            self._prepare()
-            self._prepared = True
+        '''Prepare the widget for drawing. This usually caches a surface.'''
 
-    def _prepare(self):
-        raise NotImplemented()
+    def handle_event(self, ev):
+        '''Return True if the event has been handled'''
+        if InvalidateTheWorld.matches(ev):
+            # Invalidate has special handling. Widgets should never return
+            # True for for this event
+            self._prepared = False
+            return False
+        return False
+
+
+class Container(object):
+    def __init__(self, *widgets):
+        self.widgets = []
+        for widget in widgets:
+            self.add(widget)
+
+    def add(self, widget):
+        self.widgets.append(widget)
+
+    def render(self, surface):
+        for widget in self.widgets:
+            widget.render(surface)
+
+    def handle_event(self, ev):
+        for widget in self.widgets:
+            if widget.handle_event(ev):
+                return True
+        return False