--- a/View.st	Sun Jan 09 22:56:39 1994 +0100
+++ b/View.st	Wed Jan 12 21:22:54 1994 +0100
@@ -42,7 +42,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/View.st,v 1.9 1994-01-08 17:10:23 claus Exp $
+$Header: /cvs/stx/stx/libview/View.st,v 1.10 1994-01-12 20:22:44 claus Exp $
 
 written spring/summer 89 by claus
 3D effects summer 90 by claus
@@ -1668,10 +1668,7 @@
         m2 := margin * 2.
         w := w min:(width - m2).
 
-"
-        super function:#copy.
-        super foreground:White.
-"
+        self catchExpose.
         self copyFrom:self x:margin y:margin
                          toX:margin y:(count + margin)
                        width:w 
@@ -1680,8 +1677,8 @@
                width:(width - m2)
               height:count.
 
+        self waitForExpose.
         self originChanged:(0 @ count negated).
-        self waitForExpose
     ]
 !
 
@@ -1722,10 +1719,7 @@
                                     and:(viewOrigin y + count).
         w := w min:(width - m2).
 
-"
-        super function:#copy.
-        super foreground:White.
-"
+        self catchExpose.
         self copyFrom:self x:margin y:(count + margin)
                          toX:margin y:margin
                        width:w 
@@ -1734,8 +1728,8 @@
         self redrawX:margin y:(height - margin - count) 
                width:(width - m2) height:count.
 
+        self waitForExpose.
         self originChanged:(0 @ count).
-        self waitForExpose
     ]
 !
 
@@ -1769,10 +1763,7 @@
         m2 := margin * 2.
         h := (height - m2).
 
-"
-        super function:#copy.
-        super foreground:White.
-"
+        self catchExpose.
         self copyFrom:self x:margin y:margin
                          toX:(count + margin) y:margin
                        width:(width - m2 - count) 
@@ -1782,8 +1773,8 @@
                width:count
               height:(height - m2).
 
+        self waitForExpose.
         self originChanged:(count negated @ 0).
-        self waitForExpose
     ]
 !
 
@@ -1822,10 +1813,7 @@
         m2 := margin * 2.
         h := (height - m2).
 
-"
-        super function:#copy.
-        super foreground:White.
-"
+        self catchExpose.
         self copyFrom:self x:(count + margin) y:margin
                          toX:margin y:margin
                        width:(width - m2 - count) 
@@ -1834,8 +1822,8 @@
         self redrawX:(width - margin - count) y:margin 
                width:count height:(height - m2).
 
+        self waitForExpose.
         self originChanged:(count @ 0).
-        self waitForExpose
     ]
 !
 
@@ -2413,7 +2401,9 @@
     "put myself into superviews windowgroup"
     superView notNil ifTrue:[
         windowGroup notNil ifTrue:[
+"
             'oops - wgroup change on realize' printNewline.
+"
             windowGroup removeView:self
         ].
         windowGroup := superView windowGroup.
@@ -3124,12 +3114,6 @@
     super buttonPress:button x:x y:y
 !
 
-XXXwaitForExpose
-    "after a scroll, we have to wait for expose/noexpose"
-
-    device dispatchExposeEventsFor:drawableId
-!
-
 terminate
     "window manager wants me to go away"