--- a/GraphicsContext.st	Wed Jun 09 19:11:18 1999 +0200
+++ b/GraphicsContext.st	Wed Jun 09 19:15:23 1999 +0200
@@ -346,23 +346,21 @@
     ].
 
     White isNil ifTrue:[
-        "/ mhmh - the next two checks are historic leftOvers;
-        "/ they should never be nil.
-        Color isNil ifTrue:[^ self].
-        Font isNil ifTrue:[^ self].
+        Color initialize.
 
         White := Color white.
         Black := Color black.
 
-        Color initialize.
-
         Display notNil ifTrue:[
-            White := White on:Display.
-            Black := Black on:Display.
+            White := White onDevice:Display.
+            Black := Black onDevice:Display.
         ].
 
         Font initialize.
         DefaultFont := Font family:'courier' face:'medium' style:'roman' size:12
+        Display notNil ifTrue:[
+	    DefaultFont := DefaultFont onDevice:Display
+	]
     ]
 
     "Modified: / 29.1.1998 / 12:56:18 / cg"
@@ -2138,6 +2136,6 @@
 !GraphicsContext class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/GraphicsContext.st,v 1.76 1999-06-09 17:11:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/GraphicsContext.st,v 1.77 1999-06-09 17:15:23 cg Exp $'
 ! !
 GraphicsContext initialize!