# HG changeset patch # User ca # Date 1095763769 -7200 # Node ID ab5cc43b193a536a24aba9d684bf9e8abc1a59ab # Parent 42729969c0326f4c3c71a64197b878e3c41288a1 get selection interface changed diff -r 42729969c032 -r ab5cc43b193a UIPainter.st --- a/UIPainter.st Tue Sep 21 12:31:03 2004 +0200 +++ b/UIPainter.st Tue Sep 21 12:49:29 2004 +0200 @@ -2661,10 +2661,11 @@ treeSelection := treeView selection. "/ the top-node cannot be cut, copied or pasted. canCutOrCopy := treeSelection size >= 1 and:[treeSelection first ~~ 1]. - clipboard := self getSelection. - - clipboard isCollection ifTrue:[clipboard notEmpty ifTrue:[sel := clipboard first]] - ifFalse:[sel := clipboard]. + clipboard := self getClipboardObject. + + clipboard isCollection + ifTrue:[clipboard notEmpty ifTrue:[sel := clipboard first]] + ifFalse:[sel := clipboard]. canPaste := (sel isKindOf:UISpecification) "/ and:[treeSelection size = 1 diff -r 42729969c032 -r ab5cc43b193a UIPainterView.st --- a/UIPainterView.st Tue Sep 21 12:31:03 2004 +0200 +++ b/UIPainterView.st Tue Sep 21 12:49:29 2004 +0200 @@ -321,12 +321,11 @@ " |sel| - sel := self pasteSpecifications:(self getSelection) keepLayout:false. + sel := self pasteSpecifications:(self getClipboardObject) keepLayout:false. sel notNil ifTrue:[ - self select:sel. + self select:sel. ]. - ! pasteKeepingPosition @@ -337,13 +336,13 @@ |sel| sel := self - pasteSpecifications:(self getSelection) - keepLayout:true - keepPosition:true - at:nil. + pasteSpecifications:(self getClipboardObject) + keepLayout:true + keepPosition:true + at:nil. sel notNil ifTrue:[ - self select:sel. + self select:sel. ]. ! @@ -485,10 +484,10 @@ " |sel| - sel := self pasteSpecifications:(self getSelection) keepLayout:true. + sel := self pasteSpecifications:(self getClipboardObject) keepLayout:true. sel notNil ifTrue:[ - self select:sel. + self select:sel. ]. ! ! @@ -507,7 +506,7 @@ "returns true if something to be past exists and can be paste into the selection if exists " - ^ self canPaste:(self getSelection) + ^ self canPaste:(self getClipboardObject) ! canPaste:something diff -r 42729969c032 -r ab5cc43b193a UISelectionPanel.st --- a/UISelectionPanel.st Tue Sep 21 12:31:03 2004 +0200 +++ b/UISelectionPanel.st Tue Sep 21 12:49:29 2004 +0200 @@ -1526,7 +1526,7 @@ ^ self defineClassAndSelector ]. - paste := self window getSelection. + paste := self window getClipboardObject. (self canPaste:paste) ifTrue:[ menu := self class menuUnselected decodeAsLiteralArray.