--- a/WinWorkstation.st	Tue Sep 21 12:54:10 2004 +0200
+++ b/WinWorkstation.st	Tue Sep 21 14:05:29 2004 +0200
@@ -15001,17 +15001,27 @@
 %}
 !
 
+getClipboardObjectFor:drawableId
+    ^ ClipBoardObject
+
+    "Modified: / 30.1.2000 / 02:26:47 / cg"
+!
+
+getClipboardText:selectionBufferSymbol for:drawableId
+    ^ self getCopyBuffer.
+!
+
 getCopyBuffer
     "return the copyBuffers contents."
 
     |clip|
 
     ClipBoardObject notNil ifTrue:[
-	^ ClipBoardObject
-    ].
-
-    (clip := (self getSelectionFor:nil)) notNil ifTrue:[
-	^ clip
+        ^ ClipBoardObject
+    ].
+
+    (clip := (self getClipboardData)) notNil ifTrue:[
+        ^ clip
     ].
     ^ copyBuffer
 
@@ -15019,19 +15029,6 @@
     "Modified: / 30.1.2000 / 12:01:13 / cg"
 !
 
-getSelectionFor:drawableId
-    |s|
-
-    s := self getClipboardData.
-    ^ s
-
-    "Modified: / 30.1.2000 / 02:26:47 / cg"
-!
-
-getTextSelection:selectionBufferSymbol for:drawableId
-    ^ self getCopyBuffer.
-!
-
 setClipboardData:aString
     "caveat: for now, only Text is supported"
 
@@ -15157,11 +15154,10 @@
 
 setClipboardObject:something owner:drawableId
     something isString ifTrue:[
-        ClipBoardObject := nil.
-        ^ self setClipboardData:something
-    ] ifFalse:[
-        ClipBoardObject := something.
-    ]
+        self setClipboardText:something owner:drawableId.
+        ^ self
+    ].
+    ClipBoardObject := something.
 
     "Created: / 13.7.1999 / 13:30:37 / cg"
     "Modified: / 30.1.2000 / 11:59:41 / cg"
@@ -16365,7 +16361,7 @@
 !WinWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.290 2004-09-21 10:23:06 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.291 2004-09-21 12:04:27 ca Exp $'
 ! !
 
 WinWorkstation initialize!