Mercurial Mercurial > hg > stx-libview / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorclaus
Mon, 28 Nov 1994 22:01:57 +0100
changeset 86 032006651226
parent 85 32687feafcc1
child 87 b64ce99ebeaa
*** empty log message ***
Controll.st file | annotate | diff | comparison | revisions
Controller.st file | annotate | diff | comparison | revisions
Depth8Image.st file | annotate | diff | comparison | revisions
DevWorkst.st file | annotate | diff | comparison | revisions
DeviceWorkstation.st file | annotate | diff | comparison | revisions
Font.st file | annotate | diff | comparison | revisions
Form.st file | annotate | diff | comparison | revisions
Image.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
ModalBox.st file | annotate | diff | comparison | revisions
ShadowV.st file | annotate | diff | comparison | revisions
ShadowView.st file | annotate | diff | comparison | revisions
View.st file | annotate | diff | comparison | revisions
WGroup.st file | annotate | diff | comparison | revisions
WindowGroup.st file | annotate | diff | comparison | revisions
XWorkstat.st file | annotate | diff | comparison | revisions
XWorkstation.st file | annotate | diff | comparison | revisions 
--- a/Controll.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/Controll.st	Mon Nov 28 22:01:57 1994 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1992 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Attic/Controll.st,v 1.7 1994-11-17 14:24:50 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/Controll.st,v 1.8 1994-11-28 21:00:41 claus Exp $
 '!
 
 !Controller class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Attic/Controll.st,v 1.7 1994-11-17 14:24:50 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/Controll.st,v 1.8 1994-11-28 21:00:41 claus Exp $
 "
 !
 
@@ -115,7 +115,7 @@
     ^ view model
 ! !
 
-!Controller methodsFor:'events'!
+!Controller methodsFor:'event handling'!
 
 redButtonActivity
     "actually, this should be called 'leftButtonActivity'.
--- a/Controller.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/Controller.st	Mon Nov 28 22:01:57 1994 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1992 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Controller.st,v 1.7 1994-11-17 14:24:50 claus Exp $
+$Header: /cvs/stx/stx/libview/Controller.st,v 1.8 1994-11-28 21:00:41 claus Exp $
 '!
 
 !Controller class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Controller.st,v 1.7 1994-11-17 14:24:50 claus Exp $
+$Header: /cvs/stx/stx/libview/Controller.st,v 1.8 1994-11-28 21:00:41 claus Exp $
 "
 !
 
@@ -115,7 +115,7 @@
     ^ view model
 ! !
 
-!Controller methodsFor:'events'!
+!Controller methodsFor:'event handling'!
 
 redButtonActivity
     "actually, this should be called 'leftButtonActivity'.
--- a/Depth8Image.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/Depth8Image.st	Mon Nov 28 22:01:57 1994 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.14 1994-11-17 14:29:13 claus Exp $
+$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.15 1994-11-28 21:00:47 claus Exp $
 '!
 
 !Depth8Image class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.14 1994-11-17 14:29:13 claus Exp $
+$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.15 1994-11-28 21:00:47 claus Exp $
 "
 !
 
@@ -505,7 +505,7 @@
     fast := false.
 %{
     register unsigned char *srcPtr, *dstPtr, *mapPtr;
-    register _v, _bits, _bitCount;
+    register __v, __bits, __bitCount;
     register j;
     register i;
     extern OBJ ByteArray;
@@ -516,20 +516,20 @@
 	dstPtr = _ByteArrayInstPtr(monoBits)->ba_element;
 	mapPtr = _ByteArrayInstPtr(map)->ba_element;
 	for (i=_intVal(h); i>0; i--) {
-	    _bitCount = 0;
-	    _bits = 0;
+	    __bitCount = 0;
+	    __bits = 0;
 	    for (j=_intVal(w); j>0; j--) {
-		_v = mapPtr[*srcPtr++];
-		_bits = (_bits<<1) | _v; 
-		_bitCount++;
-		if (_bitCount == 8) {
-		    *dstPtr++ = _bits;
-		    _bits = 0;
-		    _bitCount = 0;
+		__v = mapPtr[*srcPtr++];
+		__bits = (__bits<<1) | __v; 
+		__bitCount++;
+		if (__bitCount == 8) {
+		    *dstPtr++ = __bits;
+		    __bits = 0;
+		    __bitCount = 0;
 		}
 	    }
-	    if (_bitCount != 0) {
-		*dstPtr++ = _bits;
+	    if (__bitCount != 0) {
+		*dstPtr++ = __bits;
 	    }
 	}
     }
@@ -614,7 +614,7 @@
     fast := false.
 %{
     register unsigned char *srcPtr, *dstPtr, *mapPtr;
-    register _v, _bits, _bitCount;
+    register __v, __bits, __bitCount;
     register j;
     register i;
     extern OBJ ByteArray;
@@ -625,20 +625,20 @@
 	dstPtr = _ByteArrayInstPtr(twoPlaneBits)->ba_element;
 	mapPtr = _ByteArrayInstPtr(map)->ba_element;
 	for (i=_intVal(h); i>0; i--) {
-	    _bitCount = 0;
-	    _bits = 0;
+	    __bitCount = 0;
+	    __bits = 0;
 	    for (j=_intVal(w); j>0; j--) {
-		_v = mapPtr[*srcPtr++];
-		_bits = (_bits<<2) | _v; 
-		_bitCount++;
-		if (_bitCount == 4) {
-		    *dstPtr++ = _bits;
-		    _bits = 0;
-		    _bitCount = 0;
+		__v = mapPtr[*srcPtr++];
+		__bits = (__bits<<2) | __v; 
+		__bitCount++;
+		if (__bitCount == 4) {
+		    *dstPtr++ = __bits;
+		    __bits = 0;
+		    __bitCount = 0;
 		}
 	    }
-	    if (_bitCount != 0) {
-		*dstPtr++ = _bits;
+	    if (__bitCount != 0) {
+		*dstPtr++ = __bits;
 	    }
 	}
     }
--- a/DevWorkst.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/DevWorkst.st	Mon Nov 28 22:01:57 1994 +0100
@@ -34,7 +34,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Attic/DevWorkst.st,v 1.21 1994-11-22 14:30:32 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/DevWorkst.st,v 1.22 1994-11-28 21:00:42 claus Exp $
 '!
 
 !DeviceWorkstation class methodsFor:'documentation'!
@@ -55,7 +55,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Attic/DevWorkst.st,v 1.21 1994-11-22 14:30:32 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/DevWorkst.st,v 1.22 1994-11-28 21:00:42 claus Exp $
 "
 !
 
@@ -1232,7 +1232,7 @@
     "Display restoreCursors"
 ! !
 
-!DeviceWorkstation methodsFor:'events'!
+!DeviceWorkstation methodsFor:'event handling'!
 
 startDispatch
     "create the display dispatch process"
--- a/DeviceWorkstation.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/DeviceWorkstation.st	Mon Nov 28 22:01:57 1994 +0100
@@ -34,7 +34,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.21 1994-11-22 14:30:32 claus Exp $
+$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.22 1994-11-28 21:00:42 claus Exp $
 '!
 
 !DeviceWorkstation class methodsFor:'documentation'!
@@ -55,7 +55,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.21 1994-11-22 14:30:32 claus Exp $
+$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.22 1994-11-28 21:00:42 claus Exp $
 "
 !
 
@@ -1232,7 +1232,7 @@
     "Display restoreCursors"
 ! !
 
-!DeviceWorkstation methodsFor:'events'!
+!DeviceWorkstation methodsFor:'event handling'!
 
 startDispatch
     "create the display dispatch process"
--- a/Font.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/Font.st	Mon Nov 28 22:01:57 1994 +0100
@@ -24,7 +24,7 @@
 COPYRIGHT (c) 1992 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Font.st,v 1.11 1994-11-17 14:29:24 claus Exp $
+$Header: /cvs/stx/stx/libview/Font.st,v 1.12 1994-11-28 21:00:49 claus Exp $
 '!
 
 !Font class methodsFor:'documentation'!
@@ -45,7 +45,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Font.st,v 1.11 1994-11-17 14:29:24 claus Exp $
+$Header: /cvs/stx/stx/libview/Font.st,v 1.12 1994-11-28 21:00:49 claus Exp $
 "
 !
 
@@ -499,7 +499,7 @@
     "
      this happens, when you ask a font for its height or width,
      ascent or any other dimension which depends on the device on
-     which the font is rendered, AND the recevier font is not (yet)
+     which the font is rendered, AND the receiver font is not (yet)
      associated to a device.
      You should always use 
 	font := font on:someDevice
@@ -673,7 +673,7 @@
 !
 
 bold
-    "return true, if the recevier is a bold font -
+    "return true, if the receiver is a bold font -
      for st-80 compatibility"
 
     ^ face = 'bold' 
--- a/Form.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/Form.st	Mon Nov 28 22:01:57 1994 +0100
@@ -26,7 +26,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Form.st,v 1.13 1994-10-28 03:18:55 claus Exp $
+$Header: /cvs/stx/stx/libview/Form.st,v 1.14 1994-11-28 21:00:51 claus Exp $
 '!
 
 !Form class methodsFor:'documentation'!
@@ -47,7 +47,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Form.st,v 1.13 1994-10-28 03:18:55 claus Exp $
+$Header: /cvs/stx/stx/libview/Form.st,v 1.14 1994-11-28 21:00:51 claus Exp $
 "
 !
 
@@ -1638,7 +1638,8 @@
      bytesPerLineIn 
      inData tmpData info
      srcIndex "{ Class: SmallInteger }"
-     dstIndex "{ Class: SmallInteger }"|
+     dstIndex "{ Class: SmallInteger }"
+     buffer|
 
     data notNil ifTrue:[
 	^ data
@@ -1679,6 +1680,20 @@
 	    inData replaceFrom:1 to:bytesPerLine * height with:tmpData startingAt:1
 	]
     ].
+    "
+     have to reverse bytes, if not msbFirst ?
+    "
+    (info at:1) == #lsbFirst ifTrue:[
+	buffer := ByteArray new:bytesPerLine.
+	dstIndex := 1.
+	1 to:height do:[:hi |
+	    buffer replaceFrom:1 to:bytesPerLine with:inData startingAt:dstIndex.
+	    buffer reverse.
+	    inData replaceFrom:dstIndex to:dstIndex+bytesPerLine-1 with:buffer startingAt:1.
+	    dstIndex := dstIndex + bytesPerLine
+	]
+    ].
+
     ^ inData.
 !
 
@@ -1837,7 +1852,7 @@
     ^ newForm
 ! !
 
-!Form methodsFor:'storing'!
+!Form methodsFor:'printing & storing'!
 
 storeOn:aStream
     aStream nextPutAll:'(Form width:'.
--- a/Image.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/Image.st	Mon Nov 28 22:01:57 1994 +0100
@@ -28,7 +28,7 @@
 COPYRIGHT (c) 1991 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Image.st,v 1.17 1994-11-21 16:44:08 claus Exp $
+$Header: /cvs/stx/stx/libview/Image.st,v 1.18 1994-11-28 21:00:57 claus Exp $
 '!
 
 !Image class methodsFor:'documentation'!
@@ -49,7 +49,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Image.st,v 1.17 1994-11-21 16:44:08 claus Exp $
+$Header: /cvs/stx/stx/libview/Image.st,v 1.18 1994-11-28 21:00:57 claus Exp $
 "
 !
 
@@ -891,7 +891,7 @@
     ^ bytesPerRow
 ! !
 
-!Image methodsFor:'storing'!
+!Image methodsFor:'printing & storing'!
 
 storeOn:aStream
     aStream nextPutAll:'(' , self class name , ' new)'.
@@ -1108,7 +1108,7 @@
 on:aDevice
     "return an image with the same pixels as the receiver, but
      associated to aDevice. If the receiver is not yet bound to
-     a device, this will be the recevier. Otherwise, a new image
+     a device, this will be the receiver. Otherwise, a new image
      is returned."
 
     ((aDevice == device) and:[deviceForm notNil]) ifTrue:[^ self].
--- a/Make.proto	Wed Nov 23 00:09:18 1994 +0100
+++ b/Make.proto	Mon Nov 28 22:01:57 1994 +0100
@@ -142,7 +142,7 @@
 #
 I=$(INCLUDE)
 
-STCHDR=$(I)/stc.h $(I)/stcIntern.h
+STCHDR=$(I)/stc.h $(I)/stcIntern.h $(CPUINTERN_H)
 OBJECT=$(I)/Object.H $(STCHDR)
 
 GRAPHICSCONTEXT=$(I)/GC.H $(OBJECT)
--- a/ModalBox.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/ModalBox.st	Mon Nov 28 22:01:57 1994 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1990 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/ModalBox.st,v 1.14 1994-11-21 16:43:19 claus Exp $
+$Header: /cvs/stx/stx/libview/ModalBox.st,v 1.15 1994-11-28 21:01:03 claus Exp $
 '!
 
 !ModalBox class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/ModalBox.st,v 1.14 1994-11-21 16:43:19 claus Exp $
+$Header: /cvs/stx/stx/libview/ModalBox.st,v 1.15 1994-11-28 21:01:03 claus Exp $
 "
 !
 
@@ -513,7 +513,7 @@
     "
 ! !
 
-!ModalBox methodsFor:'events'!
+!ModalBox methodsFor:'event handling'!
 
 doResize
     "the resize button was pressed"
--- a/ShadowV.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/ShadowV.st	Mon Nov 28 22:01:57 1994 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1991 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Attic/ShadowV.st,v 1.8 1994-10-10 02:33:07 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/ShadowV.st,v 1.9 1994-11-28 21:01:01 claus Exp $
 '!
 
 !ShadowView class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Attic/ShadowV.st,v 1.8 1994-10-10 02:33:07 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/ShadowV.st,v 1.9 1994-11-28 21:01:01 claus Exp $
 "
 !
 
@@ -167,7 +167,7 @@
     self saveUnder:true
 ! !
 
-!ShadowView methodsFor:'events'!
+!ShadowView methodsFor:'event handling'!
 
 redraw
     "fill all of myself with black"
--- a/ShadowView.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/ShadowView.st	Mon Nov 28 22:01:57 1994 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1991 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/ShadowView.st,v 1.8 1994-10-10 02:33:07 claus Exp $
+$Header: /cvs/stx/stx/libview/ShadowView.st,v 1.9 1994-11-28 21:01:01 claus Exp $
 '!
 
 !ShadowView class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/ShadowView.st,v 1.8 1994-10-10 02:33:07 claus Exp $
+$Header: /cvs/stx/stx/libview/ShadowView.st,v 1.9 1994-11-28 21:01:01 claus Exp $
 "
 !
 
@@ -167,7 +167,7 @@
     self saveUnder:true
 ! !
 
-!ShadowView methodsFor:'events'!
+!ShadowView methodsFor:'event handling'!
 
 redraw
     "fill all of myself with black"
--- a/View.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/View.st	Mon Nov 28 22:01:57 1994 +0100
@@ -44,7 +44,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/View.st,v 1.23 1994-11-22 14:30:47 claus Exp $
+$Header: /cvs/stx/stx/libview/View.st,v 1.24 1994-11-28 21:01:05 claus Exp $
 '!
 
 "this flag controls (globally) how views look - it will vanish"
@@ -69,7 +69,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/View.st,v 1.23 1994-11-22 14:30:47 claus Exp $
+$Header: /cvs/stx/stx/libview/View.st,v 1.24 1994-11-28 21:01:05 claus Exp $
 "
 !
 
@@ -2918,6 +2918,7 @@
     "rerealize at old position"
 
     drawableId notNil ifTrue:[
+	realized := true.
 	subViews notNil ifTrue:[
 	    subViews do:[:aView |
 		aView realize
@@ -3024,7 +3025,15 @@
      This makes any interaction with the current window impossible - 
      however, other views (in their groups) still work."
 
-    (Processor activePriority >= Processor userInterruptPriority) ifFalse:[
+    |active|
+
+    active := Processor activeProcess.
+    (ProcessorScheduler isPureEventDriven 
+    or:[(active priority >= Processor userInterruptPriority)
+    or:[active id == 0
+    or:[active nameOrId endsWith:'dispatcher']]]) ifTrue:[
+	self realize
+    ] ifFalse:[
 	"
 	 create a new window group and put myself into it
 	"
@@ -3045,8 +3054,6 @@
 "/        ]) ifTrue:[
 "/            self hide
 "/        ].
-    ] ifTrue:[
-	self realize
     ]
 !
 
@@ -3464,7 +3471,7 @@
     self redrawX:lx y:ly width:lw height:lh
 ! !
 
-!View methodsFor:'events'!
+!View methodsFor:'event handling'!
 
 destroyed
     "view has been destroyed by someone else (usually window system)"
@@ -3678,13 +3685,29 @@
     "the view has been mapped (by some outside
      action - i.e. window manager de-iconified me)"
 
-    realized := true.
-    shown := true.
-    "backed views will not get expose events - have
-     to force a redraw here to get things drawn into
-     backing store"
-    backed ifTrue:[
-	self redraw
+    "
+     the old code was:
+
+	realized := true.
+	shown := true.
+	...
+
+     this created a race condition, if the view was
+     realized and shortly after unrealized - before the mapped event
+     arrived. This lead to shown being set to true even thought the
+     view was not. Boy - that was a bad one (hard to reproduce and hard to find).
+    "
+
+    realized ifTrue:[
+	shown := true.
+	"
+	 backed views will not get expose events - have
+	 to force a redraw here to get things drawn into
+	 backing store.
+	"
+	backed ifTrue:[
+	    self redraw
+	]
     ]
 !
 
--- a/WGroup.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/WGroup.st	Mon Nov 28 22:01:57 1994 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Attic/WGroup.st,v 1.15 1994-11-22 23:09:16 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/WGroup.st,v 1.16 1994-11-28 21:01:20 claus Exp $
 '!
 
 !WindowGroup class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Attic/WGroup.st,v 1.15 1994-11-22 23:09:16 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/WGroup.st,v 1.16 1994-11-28 21:01:20 claus Exp $
 "
 !
 
@@ -469,16 +469,24 @@
 	previousGroup := nil.
 	topViews := nil.
 	views := nil.
+	"
+	 the following is rubbish;
+	 the views could be reused ..
+	"
+"
 	topViews notNil ifTrue:[
 	    topViews do:[:aView |
 		aView destroy
 	    ].
+	    topViews := nil.
 	].
 	views notNil ifTrue:[
 	    views do:[:aView |
 		aView destroy
-	    ]
+	    ].
+	    views := nil.
 	].
+"
     ].
 !
 
--- a/WindowGroup.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/WindowGroup.st	Mon Nov 28 22:01:57 1994 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.15 1994-11-22 23:09:16 claus Exp $
+$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.16 1994-11-28 21:01:20 claus Exp $
 '!
 
 !WindowGroup class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.15 1994-11-22 23:09:16 claus Exp $
+$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.16 1994-11-28 21:01:20 claus Exp $
 "
 !
 
@@ -469,16 +469,24 @@
 	previousGroup := nil.
 	topViews := nil.
 	views := nil.
+	"
+	 the following is rubbish;
+	 the views could be reused ..
+	"
+"
 	topViews notNil ifTrue:[
 	    topViews do:[:aView |
 		aView destroy
 	    ].
+	    topViews := nil.
 	].
 	views notNil ifTrue:[
 	    views do:[:aView |
 		aView destroy
-	    ]
+	    ].
+	    views := nil.
 	].
+"
     ].
 !
 
--- a/XWorkstat.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/XWorkstat.st	Mon Nov 28 22:01:57 1994 +0100
@@ -30,7 +30,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.27 1994-11-22 14:30:37 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.28 1994-11-28 21:01:21 claus Exp $
 '!
 
 !XWorkstation class methodsFor:'documentation'!
@@ -51,7 +51,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.27 1994-11-22 14:30:37 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.28 1994-11-28 21:01:21 claus Exp $
 "
 !
 
@@ -246,7 +246,7 @@
      * on IRIS, this creates a badwindow error - why ?
      * children contains a funny window (000034)
      */
-#ifndef IRIS
+#if !defined(IRIS) || defined(IRIX5)
     if (XQueryTree(dpy, root, &rootReturn, &parentReturn, &children, &numChildren)) {
 	vRootAtom = XInternAtom(dpy, "__SWM_VROOT", True );
 	if (vRootAtom != None) {
@@ -4606,7 +4606,7 @@
     ^ false
 ! !
 
-!XWorkstation methodsFor:'events'!
+!XWorkstation methodsFor:'event handling'!
 
 eventMaskFor:anEventSymbol
     "return the eventMask bit-constant corresponding to an event symbol"
--- a/XWorkstation.st	Wed Nov 23 00:09:18 1994 +0100
+++ b/XWorkstation.st	Mon Nov 28 22:01:57 1994 +0100
@@ -30,7 +30,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.27 1994-11-22 14:30:37 claus Exp $
+$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.28 1994-11-28 21:01:21 claus Exp $
 '!
 
 !XWorkstation class methodsFor:'documentation'!
@@ -51,7 +51,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.27 1994-11-22 14:30:37 claus Exp $
+$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.28 1994-11-28 21:01:21 claus Exp $
 "
 !
 
@@ -246,7 +246,7 @@
      * on IRIS, this creates a badwindow error - why ?
      * children contains a funny window (000034)
      */
-#ifndef IRIS
+#if !defined(IRIS) || defined(IRIX5)
     if (XQueryTree(dpy, root, &rootReturn, &parentReturn, &children, &numChildren)) {
 	vRootAtom = XInternAtom(dpy, "__SWM_VROOT", True );
 	if (vRootAtom != None) {
@@ -4606,7 +4606,7 @@
     ^ false
 ! !
 
-!XWorkstation methodsFor:'events'!
+!XWorkstation methodsFor:'event handling'!
 
 eventMaskFor:anEventSymbol
     "return the eventMask bit-constant corresponding to an event symbol"
hg/stx-libview