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
Wed, 01 Mar 1995 01:12:54 +0100
changeset 112 88383d87f382
parent 111 6f840bddb9e2
child 113 60981f3775c6
*** empty log message ***
Color.st file | annotate | diff | comparison | revisions
Depth24Image.st file | annotate | diff | comparison | revisions
Depth8Image.st file | annotate | diff | comparison | revisions
WGroup.st file | annotate | diff | comparison | revisions
WindowGroup.st file | annotate | diff | comparison | revisions 
--- a/Color.st	Wed Mar 01 00:12:27 1995 +0100
+++ b/Color.st	Wed Mar 01 01:12:54 1995 +0100
@@ -26,7 +26,7 @@
 COPYRIGHT (c) 1992 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Color.st,v 1.20 1995-02-28 23:12:27 claus Exp $
+$Header: /cvs/stx/stx/libview/Color.st,v 1.21 1995-03-01 00:11:34 claus Exp $
 '!
 
 !Color class methodsFor:'documentation'!
@@ -47,7 +47,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Color.st,v 1.20 1995-02-28 23:12:27 claus Exp $
+$Header: /cvs/stx/stx/libview/Color.st,v 1.21 1995-03-01 00:11:34 claus Exp $
 "
 !
 
@@ -645,7 +645,7 @@
 
     id := Display colorNamed:aString.
     id isNil ifTrue:[
-	ObjectMemory scavenge.
+	ObjectMemory scavenge; finalize.
 	id := Display colorNamed:aString.
 	id isNil ifTrue:[^ nil].
     ].
@@ -1858,7 +1858,7 @@
 	id isNil ifTrue:[
 	    "this is a kludge: scavenge to free unused colors
 	     and try again ..."
-	    ObjectMemory scavenge.
+	    ObjectMemory scavenge; finalize.
 	    id := aDevice colorRed:redVal green:greenVal blue:blueVal
 	].
 	id isNil ifTrue:[
@@ -1916,7 +1916,7 @@
 		    ] ifFalse:[
 			id := aDevice colorRed:grey green:grey blue:grey.
 			id isNil ifTrue:[
-			    ObjectMemory scavenge.
+			    ObjectMemory scavenge; finalize.
 			    id := aDevice colorRed:redVal green:greenVal blue:blueVal
 			].
 		    ].
@@ -1990,7 +1990,7 @@
     id isNil ifTrue:[
 	"this is a kludge: scavenge to free unused colors
 	 and try again ..."
-	ObjectMemory scavenge.
+	ObjectMemory scavenge; finalize.
 	id := aDevice colorRed:redVal green:greenVal blue:blueVal
     ].
     id isNil ifTrue:[
@@ -2064,7 +2064,7 @@
 	"this is a kludge: scavenge to free unused colors
 	 and try again ..."
 "
-	ObjectMemory scavenge.
+	ObjectMemory scavenge; finalize.
 	id := aDevice colorRed:redVal green:greenVal blue:blueVal
 "
     ].
--- a/Depth24Image.st	Wed Mar 01 00:12:27 1995 +0100
+++ b/Depth24Image.st	Wed Mar 01 01:12:54 1995 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.10 1995-02-15 10:35:42 claus Exp $
+$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.11 1995-03-01 00:11:51 claus Exp $
 '!
 
 !Depth24Image class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.10 1995-02-15 10:35:42 claus Exp $
+$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.11 1995-03-01 00:11:51 claus Exp $
 "
 !
 
@@ -1276,7 +1276,7 @@
 	    "free the allocated colors"
 	    colors atAllPut:nil.
 	    "a kludge - force immediate freeing of colors"
-	    ObjectMemory scavenge.
+	    ObjectMemory scavenge; finalize.
 
 	    "cut off one more color-bit - cut off blue first"
 	    (bMask == 2r11111111) ifTrue:[
--- a/Depth8Image.st	Wed Mar 01 00:12:27 1995 +0100
+++ b/Depth8Image.st	Wed Mar 01 01:12:54 1995 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.18 1995-02-22 01:18:01 claus Exp $
+$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.19 1995-03-01 00:12:02 claus Exp $
 '!
 
 !Depth8Image class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.18 1995-02-22 01:18:01 claus Exp $
+$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.19 1995-03-01 00:12:02 claus Exp $
 "
 !
 
@@ -1015,14 +1015,14 @@
 		     already free images.
 		    "
 		    gcRound == 0 ifTrue:[
-			ObjectMemory scavenge.
+			ObjectMemory scavenge; finalize.
 			devColor := color exactOn:aDevice.
 			gcRound := 1
 		    ].
 		    devColor isNil ifTrue:[
 			gcRound == 1 ifTrue:[
 			    'D8IMAGE: force GC for possible color reclamation.' errorPrintNL.
-			    ObjectMemory markAndSweep.
+			    ObjectMemory incrementalGC; finalize.
 			    devColor := color exactOn:aDevice.
 			    gcRound := 2
 			]
@@ -1080,14 +1080,14 @@
 			     free images.
 			    "
 			    gcRound == 0 ifTrue:[
-				ObjectMemory scavenge.
+				ObjectMemory scavenge; finalize.
 				devColor := color nearestOn:aDevice error:error.
 				gcRound := 1
 			    ].
 			    devColor isNil ifTrue:[
 				gcRound == 1 ifTrue:[
 				    'D8IMAGE: force GC for possible color reclamation.' errorPrintNL.
-				    ObjectMemory markAndSweep.
+				    ObjectMemory incrementalGC; finalize.
 				    devColor := color nearestOn:aDevice error:error.
 				    gcRound := 2
 				]
--- a/WGroup.st	Wed Mar 01 00:12:27 1995 +0100
+++ b/WGroup.st	Wed Mar 01 01:12:54 1995 +0100
@@ -22,7 +22,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Attic/WGroup.st,v 1.20 1995-02-27 10:20:01 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/WGroup.st,v 1.21 1995-03-01 00:12:54 claus Exp $
 '!
 
 !WindowGroup class methodsFor:'documentation'!
@@ -43,7 +43,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Attic/WGroup.st,v 1.20 1995-02-27 10:20:01 claus Exp $
+$Header: /cvs/stx/stx/libview/Attic/WGroup.st,v 1.21 1995-03-01 00:12:54 claus Exp $
 "
 !
 
@@ -354,7 +354,7 @@
     [mySensor hasEvents] whileTrue:[
 	event := mySensor nextEvent.
 	event notNil ifTrue:[
-	    (views isNil and:[topViews isNil]) ifFalse:[
+	    (views notNil or:[topViews notNil]) ifTrue:[
 		"/
 		"/ FocusStepping is done right here
 		"/
--- a/WindowGroup.st	Wed Mar 01 00:12:27 1995 +0100
+++ b/WindowGroup.st	Wed Mar 01 01:12:54 1995 +0100
@@ -22,7 +22,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.20 1995-02-27 10:20:01 claus Exp $
+$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.21 1995-03-01 00:12:54 claus Exp $
 '!
 
 !WindowGroup class methodsFor:'documentation'!
@@ -43,7 +43,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.20 1995-02-27 10:20:01 claus Exp $
+$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.21 1995-03-01 00:12:54 claus Exp $
 "
 !
 
@@ -354,7 +354,7 @@
     [mySensor hasEvents] whileTrue:[
 	event := mySensor nextEvent.
 	event notNil ifTrue:[
-	    (views isNil and:[topViews isNil]) ifFalse:[
+	    (views notNil or:[topViews notNil]) ifTrue:[
 		"/
 		"/ FocusStepping is done right here
 		"/
hg/stx-libview