--- a/XTermView.st	Tue Feb 18 15:17:26 2014 +0100
+++ b/XTermView.st	Tue Feb 18 15:18:33 2014 +0100
@@ -229,9 +229,8 @@
 !
 
 selectionAsString
-
-    ^ (device getSelectionOwnerOf: #PRIMARY) = drawableId ifTrue:[
-        device getClipboardText:#selection for:drawableId
+    ^ (self graphicsDevice getSelectionOwnerOf: #PRIMARY) = self drawableId ifTrue:[
+        self graphicsDevice getClipboardText:#selection for:self drawableId
     ] ifFalse:[
         nil
     ]
@@ -272,13 +271,12 @@
 !
 
 xtermArgs
-
     | args |
 
     args := OrderedCollection new.
     args
         add: self xtermExecutable;
-        add: (XTermType == #xterm ifTrue:['-into'] ifFalse:['-embed']); add: drawableId address printString;        
+        add: (XTermType == #xterm ifTrue:['-into'] ifFalse:['-embed']); add:self embeddingWindowId printString;        
         add: '-j';
 "/        add: '-font'; add: (device fullFontNameOf: (font fontId));
         add: '-fg'; add: 'white'"(self xcolorNameFor: foreground)";
@@ -319,7 +317,7 @@
         ^ preferredExtent
     ].
 
-    ^(font width * 80) @ (font height * 25)
+    ^(gc font width * 80) @ (gc font height * 25)
 
     "Modified: / 19-07-1996 / 20:43:32 / cg"
     "Created: / 25-11-2010 / 12:51:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -369,11 +367,11 @@
 !XTermView class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/XTermView.st,v 1.7 2014-02-06 19:11:02 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/XTermView.st,v 1.8 2014-02-18 14:18:33 stefan Exp $'
 !
 
 version_SVN
-    ^ '$Id: XTermView.st,v 1.7 2014-02-06 19:11:02 vrany Exp $'
+    ^ '$Id: XTermView.st,v 1.8 2014-02-18 14:18:33 stefan Exp $'
 ! !