--- a/DisplaySurface.st	Sat Mar 22 15:19:41 1997 +0100
+++ b/DisplaySurface.st	Sat Mar 22 15:21:52 1997 +0100
@@ -525,13 +525,6 @@
     ^ nil
 !
 
-iconMask
-    "return the views iconMask - this is nil here.
-     Only standardSystemViews may support labels and icons."
-
-    ^ nil
-!
-
 icon:aBitmap
     "set the views icon - ignored here.
      Only standardSystemViews support labels and icons."
@@ -553,6 +546,13 @@
     ^ self
 !
 
+iconMask
+    "return the views iconMask - this is nil here.
+     Only standardSystemViews may support labels and icons."
+
+    ^ nil
+!
+
 iconView
     "return the views iconView - this is nil here.
      Only standardSystemViews support labels and icons."
@@ -1369,11 +1369,13 @@
     "view has been destroyed by someone else"
 
     drawableId notNil ifTrue:[
-	device removeKnownView:self.
-	drawableId := nil.
-	realized := false. 
+        device removeKnownView:self withId:drawableId.
+        drawableId := nil.
+        realized := false. 
     ].
     self destroy
+
+    "Modified: 22.3.1997 / 14:56:34 / cg"
 !
 
 initCursor
@@ -1499,6 +1501,16 @@
     "Created: 5.7.1996 / 14:58:55 / cg"
 !
 
+isTopView
+    "return true, if the receiver is some kind of topview;
+     false is returned here; redefined in some subclasses."
+
+    ^ false
+
+    "Modified: 28.5.1996 / 19:27:34 / cg"
+    "Created: 22.3.1997 / 14:45:29 / cg"
+!
+
 isView
     "return true, if the receiver is some kind of view;
      true is returned here."
@@ -1654,5 +1666,5 @@
 !DisplaySurface class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DisplaySurface.st,v 1.27 1997-03-05 13:11:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DisplaySurface.st,v 1.28 1997-03-22 14:21:35 cg Exp $'
 ! !