--- a/demo_layout.py	Sat Dec 29 12:16:06 2012 +0100
+++ b/demo_layout.py	Sun Dec 30 13:03:29 2012 +0100
@@ -14,8 +14,7 @@
 
         #self.top.borders = (1,1,1,1)
 
-        vert = VerticalLayout(homogeneous=False)
-        self.top.layout(vert)
+        self.top.layout = VerticalLayout(homogeneous=False)
 
         self.buildrow()
         self.buildrow(expand=True)
@@ -26,10 +25,9 @@
         self.buildrow(homogeneous=True, fill=True, spacing=2)
 
     def buildrow(self, homogeneous=False, spacing=0, expand=False, fill=False):
-        horz = HorizontalLayout(homogeneous=homogeneous, spacing=spacing)
         hbox1 = Container()
         hbox1.sizereq.h = 2
-        hbox1.layout(horz)
+        hbox1.layout = HorizontalLayout(homogeneous=homogeneous, spacing=spacing)
         self.top.add(hbox1)
         for i in range(5):
             btn = Button('Btn' + str(i) * i * i)