--- a/PopUpView.st	Fri Apr 23 14:50:20 1999 +0200
+++ b/PopUpView.st	Fri Apr 23 16:49:35 1999 +0200
@@ -120,25 +120,6 @@
 
 !PopUpView methodsFor:'activation'!
 
-hide
-    "hide the view, leave its modal event loop"
-
-    windowGroup notNil ifTrue:[
-        windowGroup removeView:self.
-        windowGroup := nil.
-    ].
-    self unmap.
-
-    "/ allow for redraw events to arrive
-    "/ (actually, only req'd for win32 systems,
-    "/  but that short delay does not hurt on others)
-
-    Delay waitForSeconds:0.05.
-
-    "Modified: / 3.5.1996 / 23:48:22 / stefan"
-    "Modified: / 12.9.1998 / 14:58:33 / cg"
-!
-
 show
     "realize the view at its last position"
 
@@ -190,22 +171,6 @@
     "Created: / 4.12.1998 / 15:11:20 / cg"
 ! !
 
-!PopUpView methodsFor:'dispatching'!
-
-modalLoop
-    "obsolete support for small configuration without threads.
-     This is no longer used"
-
-    haveControl := true.
-
-    "this is a kludge - if we do not have multiple processes, therefore
-     we start another dispatch loop, which exits when control is lost"
-
-    device dispatchFor:nil while:[haveControl]
-
-    "Modified: 12.5.1996 / 22:03:52 / cg"
-! !
-
 !PopUpView methodsFor:'initialize / release'!
 
 create
@@ -225,28 +190,24 @@
 initStyle
     "setup viewStyle specifics"
 
-    super initStyle.
+    |l|
 
-    styleSheet is3D == true ifTrue:[
-        borderWidth := 0.
-        level := 2
-    ] ifFalse:[
-        borderWidth := 1.
-        level := 0
-    ].
+    super initStyle.
 
     DefaultBorderColor notNil ifTrue:[
         self borderColor:(DefaultBorderColor on:device).
     ].
-    DefaultBorderWidth notNil ifTrue:[
+    DefaultBorderWidth isNil ifTrue:[
+        borderWidth := styleSheet is3D ifTrue:[0] ifFalse:[1].
+    ] ifFalse:[
         borderWidth := DefaultBorderWidth.
     ].
-"/    DefaultEdgeStyle notNil ifTrue:[
-"/        edgeStyle := DefaultEdgeStyle.
-"/    ].
-    DefaultLevel notNil ifTrue:[
-        self level:DefaultLevel.
+    DefaultLevel isNil ifTrue:[
+        l := styleSheet is3D ifTrue:[1] ifFalse:[0].
+    ] ifFalse:[
+        l := DefaultLevel.
     ].
+    self level:l.
 
     self defaultShadow ifTrue:[
         shadowView := (ShadowView onDevice:device) for:self.
@@ -315,6 +276,25 @@
 
 !PopUpView methodsFor:'realize / unrealize'!
 
+hide
+    "hide the view, leave its modal event loop"
+
+    windowGroup notNil ifTrue:[
+        windowGroup removeView:self.
+        windowGroup := nil.
+    ].
+    self unmap.
+
+    "/ allow for redraw events to arrive
+    "/ (actually, only req'd for win32 systems,
+    "/  but that short delay does not hurt on others)
+
+    Delay waitForSeconds:0.05.
+
+    "Modified: / 3.5.1996 / 23:48:22 / stefan"
+    "Modified: / 12.9.1998 / 14:58:33 / cg"
+!
+
 mapped
     "grab the pointer here, when visible (but not control is already lost). 
      If the grab fails, try again and unmap myself if that fails too."
@@ -371,5 +351,5 @@
 !PopUpView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/PopUpView.st,v 1.38 1998-12-04 14:11:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/PopUpView.st,v 1.39 1999-04-23 14:49:35 cg Exp $'
 ! !