--- a/FramedBox.st	Tue Feb 18 15:40:54 2014 +0100
+++ b/FramedBox.st	Tue Feb 18 15:41:40 2014 +0100
@@ -612,7 +612,7 @@
                     "
                      label at right
                     "
-                    x := width - margin - labelLen - font height
+                    x := width - margin - labelLen - gc font height
                 ] ifFalse:[
                     "
                      label at center
@@ -624,7 +624,7 @@
             label isString ifTrue:[
                 self displayOpaqueString:l x:x y:y
             ] ifFalse:[
-                l displayOpaqueOn:self x:x y:y - font ascent
+                l displayOpaqueOn:self x:x y:y - gc font ascent
             ]
         ]
     ]
@@ -648,7 +648,7 @@
 
     super fetchDeviceResources.
 
-    fgColor := fgColor onDevice:device.
+    fgColor := fgColor onDevice:self graphicsDevice.
 
     "Created: 15.2.1997 / 16:57:56 / cg"
 !
@@ -709,7 +709,7 @@
         ^ preferredExtent
     ].
 
-    sep := gc font heightOn:device.
+    sep := gc font heightOn:self graphicsDevice.
     sep2 := sep + sep.
 
     true "showFrame" ifFalse:[
@@ -726,7 +726,7 @@
 
     |mH mV sepH sepV imH imV lw|
 
-    sepH := sepV := gc font heightOn:device.
+    sepH := sepV := gc font heightOn:self graphicsDevice.
     horizontalSpace notNil ifTrue:[
         sepH := horizontalSpace
     ].
@@ -764,10 +764,10 @@
 !FramedBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/FramedBox.st,v 1.55 2014-02-13 18:42:34 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/FramedBox.st,v 1.56 2014-02-18 14:41:40 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/FramedBox.st,v 1.55 2014-02-13 18:42:34 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/FramedBox.st,v 1.56 2014-02-18 14:41:40 stefan Exp $'
 ! !