--- a/DeviceGraphicsContext.st	Mon Apr 05 18:46:11 2004 +0200
+++ b/DeviceGraphicsContext.st	Tue Apr 06 22:18:56 2004 +0200
@@ -3687,7 +3687,7 @@
 "/    ]
 
     font notNil ifTrue:[
-        font device == device ifTrue:[
+        font graphicsDevice == device ifTrue:[
             (fontId := font fontId) notNil ifTrue:[
                 device setFont:fontId in:gcId
             ]
@@ -3846,7 +3846,7 @@
 !DeviceGraphicsContext class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceGraphicsContext.st,v 1.98 2004-04-02 15:24:21 werner Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceGraphicsContext.st,v 1.99 2004-04-06 20:18:56 stefan Exp $'
 ! !
 
 DeviceGraphicsContext initialize!

--- a/Font.st	Mon Apr 05 18:46:11 2004 +0200
+++ b/Font.st	Tue Apr 06 22:18:56 2004 +0200
@@ -271,7 +271,10 @@
 !Font methodsFor:'accessing'!
 
 device
-    "return the device I am on"
+    "return the device I am on.
+     Obsolete - use #graphicsDevice"
+
+    <resource:#obsolete>
 
     ^ device
 !
@@ -1120,7 +1123,7 @@
 !Font class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.92 2004-03-19 15:48:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.93 2004-04-06 20:18:50 stefan Exp $'
 ! !
 
 Font initialize!

--- a/FontDescription.st	Mon Apr 05 18:46:11 2004 +0200
+++ b/FontDescription.st	Tue Apr 06 22:18:56 2004 +0200
@@ -507,6 +507,8 @@
 device
     "return the device I am on"
 
+    <resource:#obsolete>
+
     self obsoleteMethodWarning:'use #graphicsDevice'.
     ^ self graphicsDevice
 !
@@ -1128,7 +1130,7 @@
 !FontDescription class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.55 2004-02-18 12:04:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.56 2004-04-06 20:18:53 stefan Exp $'
 ! !
 
 FontDescription initialize!