--- a/PullDMenu.st	Sat May 04 01:07:52 1996 +0200
+++ b/PullDMenu.st	Sat May 04 01:12:39 1996 +0200
@@ -1245,13 +1245,15 @@
     |m|
 
     activeMenuNumber notNil ifTrue:[
-	(m := menus at:activeMenuNumber) notNil ifTrue:[
-	    m unrealize.
-	].
-	activeMenuNumber := nil.
+        (m := menus at:activeMenuNumber) notNil ifTrue:[
+            m unmap.
+        ].
+        activeMenuNumber := nil.
     ].
     super recreate.
     self setMenuOrigins
+
+    "Modified: 3.5.1996 / 23:48:55 / stefan"
 !
 
 superView:aView
@@ -1501,5 +1503,5 @@
 !PullDownMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.50 1996-04-30 13:59:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.51 1996-05-03 23:11:52 stefan Exp $'
 ! !

--- a/PullDownMenu.st	Sat May 04 01:07:52 1996 +0200
+++ b/PullDownMenu.st	Sat May 04 01:12:39 1996 +0200
@@ -1245,13 +1245,15 @@
     |m|
 
     activeMenuNumber notNil ifTrue:[
-	(m := menus at:activeMenuNumber) notNil ifTrue:[
-	    m unrealize.
-	].
-	activeMenuNumber := nil.
+        (m := menus at:activeMenuNumber) notNil ifTrue:[
+            m unmap.
+        ].
+        activeMenuNumber := nil.
     ].
     super recreate.
     self setMenuOrigins
+
+    "Modified: 3.5.1996 / 23:48:55 / stefan"
 !
 
 superView:aView
@@ -1501,5 +1503,5 @@
 !PullDownMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.50 1996-04-30 13:59:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.51 1996-05-03 23:11:52 stefan Exp $'
 ! !

--- a/ScrollBar.st	Sat May 04 01:07:52 1996 +0200
+++ b/ScrollBar.st	Sat May 04 01:12:39 1996 +0200
@@ -311,61 +311,61 @@
     thumbHeight := height - upAndDownHeight - borderWidth - (elementSpacing * 3).
 "
     ((buttonLayout ~~ #top) and:[buttonLayout ~~ #bottom]) ifTrue:[
-	thumbHeight := thumbHeight - borderWidth
+        thumbHeight := thumbHeight - borderWidth
     ].
 "
     buttonLayout == #around ifTrue:[
-	thumbHeight := thumbHeight + borderWidth
+        thumbHeight := thumbHeight + borderWidth
     ].
 
     "if I become too small, hide buttons and thumb"
 
     height < upAndDownHeight ifTrue:[
-	b1Hidden := b2Hidden := thumbHidden := true.
+        b1Hidden := b2Hidden := thumbHidden := true.
     ] ifFalse:[
-	b1Hidden := b2Hidden := thumbHidden := false.
+        b1Hidden := b2Hidden := thumbHidden := false.
     ].
 
     (thumbHeight < 10) ifTrue:[
-	thumbHidden := true.
+        thumbHidden := true.
     ] ifFalse:[
-	thumbHidden := false.
+        thumbHidden := false.
     ].
 
     button1 hiddenOnRealize:b1Hidden.
     b1Hidden ifTrue:[
-	button1 unrealize
+        button1 unmap
     ] ifFalse:[
-	shown ifTrue:[button1 realize]
+        shown ifTrue:[button1 realize]
     ].
     button2 hiddenOnRealize:b1Hidden.
     b2Hidden ifTrue:[
-	button2 unrealize
+        button2 unmap
     ] ifFalse:[
-	shown ifTrue:[button2 realize]
+        shown ifTrue:[button2 realize]
     ].
     thumb hiddenOnRealize:thumbHidden.
     thumbHidden ifTrue:[
-	thumb unrealize
+        thumb unmap
     ] ifFalse:[
-	shown ifTrue:[thumb realize]
+        shown ifTrue:[thumb realize]
     ].
 
     "width of buttons is always my width"
 
     w := width - (margin * 2).
     (w ~~ button1 width) ifTrue:[
-	button1 width:w.
-	button2 width:w
+        button1 width:w.
+        button2 width:w
     ].
 
     thumbWidth := w.
     style == #next ifTrue:[
-	thumbWidth := thumbWidth - (thumb borderWidth * 2).
-	thumbHeight := thumbHeight - 1
+        thumbWidth := thumbWidth - (thumb borderWidth * 2).
+        thumbHeight := thumbHeight - 1
     ].
     style == #motif ifTrue:[
-	thumbHeight := thumbHeight - margin
+        thumbHeight := thumbHeight - margin
     ].
 
     "
@@ -373,18 +373,18 @@
      avoid error from view-creation (it will be hidden anyway)
     "
     thumbHeight <= 0 ifTrue:[
-	thumbHeight := 1
+        thumbHeight := 1
     ].
 
     (buttonLayout == #top) ifTrue:[
-	"buttons at top"
-	thumb extent:(thumbWidth @ thumbHeight).
-	^ self
+        "buttons at top"
+        thumb extent:(thumbWidth @ thumbHeight).
+        ^ self
     ].
 
     sep2 := elementSpacing * 2.
     (buttonLayout == #bottom) ifTrue:[
-	"buttons at bottom"
+        "buttons at bottom"
 "/
 "/ XX: I thought, that viewGravity shuld fix things automatically
 "/ XX: it seems not to do it (or I misused it ;-)
@@ -393,41 +393,43 @@
 "/ XX: the viewGravity depending code below is disabled.
 "/ XX: resize is somewhat slower, though.
 
-	thumbHeight := thumbHeight + borderWidth.
+        thumbHeight := thumbHeight + borderWidth.
 "/ XX        thumbHidden ifTrue:[
 "/ XX           bY := elementSpacing
 "/ XX       ] ifFalse:[
-	    bY := thumbHeight + sep2.
+            bY := thumbHeight + sep2.
 "/ XX       ].
 "XX"            button1 viewGravity:#North. 
 "XX"            button2 viewGravity:#North. 
-	(how == #smaller) ifTrue:[
-	    thumb extent:(thumbWidth @ thumbHeight).
+        (how == #smaller) ifTrue:[
+            thumb extent:(thumbWidth @ thumbHeight).
 "XX"            button1 origin:(bwn @ (thumbHeight + sep2)).
 "XX"            button2 origin:(bwn @ (thumbHeight + sep2 + upHeight))
-	] ifFalse:[
-	    button1 origin:(bwn @ bY).
-	    button2 origin:(bwn @ (bY + upHeight)).
-	    thumb extent:(thumbWidth @ thumbHeight)
-	].
-	^ self
+        ] ifFalse:[
+            button1 origin:(bwn @ bY).
+            button2 origin:(bwn @ (bY + upHeight)).
+            thumb extent:(thumbWidth @ thumbHeight)
+        ].
+        ^ self
     ].
     "buttons around thumb"
 
     style == #motif ifTrue:[
-	sep2 := sep2 + 1
+        sep2 := sep2 + 1
     ].
     button1 origin:(bwn @ bwn).
 
     style == #os2 ifTrue:[
-	button2 origin:(bwn @ (upHeight + thumbHeight + sep2 - margin "+ borderWidth")).
-	thumb extent:(thumbWidth @ (thumbHeight - margin - margin "+ margin - (margin // 2)")).
-	thumb origin:(bwn @ (upHeight - borderWidth + elementSpacing + margin))
+        button2 origin:(bwn @ (upHeight + thumbHeight + sep2 - margin "+ borderWidth")).
+        thumb extent:(thumbWidth @ (thumbHeight - margin - margin "+ margin - (margin // 2)")).
+        thumb origin:(bwn @ (upHeight - borderWidth + elementSpacing + margin))
     ] ifFalse:[
-	button2 origin:(bwn @ (upHeight + thumbHeight + sep2 - (margin // 2) "+ borderWidth")).
-	thumb extent:(thumbWidth @ (thumbHeight + margin - (margin // 2))).
-	thumb origin:(bwn @ (upHeight - borderWidth + elementSpacing))
+        button2 origin:(bwn @ (upHeight + thumbHeight + sep2 - (margin // 2) "+ borderWidth")).
+        thumb extent:(thumbWidth @ (thumbHeight + margin - (margin // 2))).
+        thumb origin:(bwn @ (upHeight - borderWidth + elementSpacing))
     ].
+
+    "Modified: 3.5.1996 / 23:49:02 / stefan"
 ! !
 
 !ScrollBar methodsFor:'forced scroll'!
@@ -694,5 +696,5 @@
 !ScrollBar class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ScrollBar.st,v 1.29 1996-04-25 17:23:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ScrollBar.st,v 1.30 1996-05-03 23:12:39 stefan Exp $'
 ! !