--- a/SimpleView.st	Thu Jun 30 18:29:49 2016 +0200
+++ b/SimpleView.st	Thu Jul 07 13:58:26 2016 +0200
@@ -2940,7 +2940,7 @@
 layout:aLayoutObject
     "set the layout object which controls my geometry."
 
-    layout = aLayoutObject ifFalse:[
+    layout ~= aLayoutObject ifTrue:[
         layout := aLayoutObject.
         self layoutChanged.
     ].
@@ -8323,24 +8323,24 @@
 
     margin isNil ifTrue:[margin := 0].
     (margin ~~ 0) ifTrue:[
-	m2 := margin + margin.
-	nX := nY := margin.
-	nW := width - m2.
-	nH := height - m2.
+        m2 := margin + margin.
+        nX := nY := margin.
+        nW := width - m2.
+        nH := height - m2.
 "/        transformation notNil ifTrue:[
 "/            nX := transformation applyInverseToX:nX.
 "/            nY := transformation applyInverseToY:nY.
 "/            nW := transformation applyInverseScaleX:nW.
 "/            nH := transformation applyInverseScaleY:nH.
 "/        ].
-	innerClipRect := Rectangle
-				 left:nX
-				 top:nY
-				 width:nW
-				 height:nH
+        innerClipRect := Rectangle
+                                 left:nX
+                                 top:nY
+                                 width:nW
+                                 height:nH
     ] ifFalse:[
-	"no clipping"
-	innerClipRect := nil
+        "no clipping"
+        innerClipRect := nil
     ]
 
     "Modified: / 22.5.1999 / 16:50:58 / cg"