--- a/ObjectView.st	Wed May 29 16:16:35 1996 +0200
+++ b/ObjectView.st	Wed May 29 16:38:27 1996 +0200
@@ -346,27 +346,31 @@
      do redraw"
 
     something size > (contents size / 4) ifTrue:[
-	"
-	 better to remove first, then redraw rest
-	"
-	self forEach:something do:[:anObject |
-	    self removeFromSelection:anObject.
-	    contents remove:anObject.
-	].
-	self redraw.
-	^ self
+        "
+         better to remove first, then redraw rest
+        "
+        self forEach:something do:[:anObject |
+            self removeFromSelection:anObject.
+            contents remove:anObject.
+        ].
+        self invalidate.
+        ^ self
     ].
 
     self forEach:something do:[:anObject |
-	self removeObject:anObject
+        self removeObject:anObject
     ]
+
+    "Modified: 29.5.1996 / 16:20:24 / cg"
 !
 
 removeAll
     "remove all - redraw"
 
     self removeAllWithoutRedraw.
-    self redraw
+    self invalidate
+
+    "Modified: 29.5.1996 / 16:20:28 / cg"
 !
 
 removeAllWithoutRedraw
@@ -1523,17 +1527,18 @@
 
     gridPixmap := nil.
     shown ifTrue:[
-	self viewBackground:White.
-	self clear.
+        self viewBackground:White.
+        self clear.
     ].
 
     gridShown ifTrue:[
-	self defineGrid.
-	self viewBackground:gridPixmap.
+        self defineGrid.
+        self viewBackground:gridPixmap.
     ].
-    shown ifTrue:[
-	self redraw
-    ].
+
+    self invalidate
+
+    "Modified: 29.5.1996 / 16:20:11 / cg"
 !
 
 showGrid
@@ -1852,14 +1857,15 @@
      or 'letter'. See widthOfContentsInMM for supported formats."
 
     aFormatString ~= documentFormat ifTrue:[
-	documentFormat := aFormatString.
-	self contentsChanged.
-	self defineGrid.
-	gridShown ifTrue:[
-	    self clear.
-	    self redraw
-	]
+        documentFormat := aFormatString.
+        self contentsChanged.
+        self defineGrid.
+        gridShown ifTrue:[
+            self invalidate "/ clear; redraw
+        ]
     ]
+
+    "Modified: 29.5.1996 / 16:19:44 / cg"
 !
 
 forEach:aCollection do:aBlock
@@ -2314,11 +2320,11 @@
             ]
         ].
         (new and:[redraw]) ifTrue:[
-            self redraw
+            self invalidate
         ]
     ]
 
-    "Modified: 14.12.1995 / 20:59:49 / cg"
+    "Modified: 29.5.1996 / 16:19:58 / cg"
 !
 
 initializeFileInObject:anObject
@@ -2740,32 +2746,33 @@
     |current|
 
     transformation isNil ifTrue:[
-	current := 1@1
+        current := 1@1
     ] ifFalse:[
-	current := transformation scale
+        current := transformation scale
     ].
     factor asPoint = current asPoint ifTrue:[
-	^ self
+        ^ self
     ].
     current := factor.
     current isNil ifTrue:[
-	current := 1
+        current := 1
     ].
 
     (current = 1) ifTrue:[
-	transformation := nil
+        transformation := nil
     ] ifFalse:[
-	transformation := WindowingTransformation scale:current translation:0.
+        transformation := WindowingTransformation scale:current translation:0.
     ].
     self contentsChanged.
     self setInnerClip.
     gridShown ifTrue:[
-	self newGrid
+        self newGrid
     ].
     shown ifTrue:[
-	self clear.
-	self redraw
+        self invalidate "/ clear; redraw
     ].
+
+    "Modified: 29.5.1996 / 16:20:41 / cg"
 !
 
 zoomIn
@@ -2783,9 +2790,10 @@
                                 translation:0.
     self contentsChanged.
     self setInnerClip.
-    self redraw.
+    self invalidate.
 
     "Created: 27.4.1996 / 10:08:39 / cg"
+    "Modified: 29.5.1996 / 16:20:46 / cg"
 !
 
 zoomOut
@@ -2803,13 +2811,14 @@
                         translation:0.
     self contentsChanged.
     self setInnerClip.
-    self redraw
+    self invalidate
 
     "Created: 27.4.1996 / 10:09:19 / cg"
+    "Modified: 29.5.1996 / 16:20:49 / cg"
 ! !
 
 !ObjectView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ObjectView.st,v 1.40 1996-05-28 18:06:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ObjectView.st,v 1.41 1996-05-29 14:37:04 cg Exp $'
 ! !