UIPainter.st
changeset 1991 feaad07cb3cf
parent 1983 5528c812da8f
child 1994 afcf20d971e0
--- a/UIPainter.st	Wed Feb 15 18:24:54 2006 +0100
+++ b/UIPainter.st	Wed Feb 15 18:25:02 2006 +0100
@@ -1694,42 +1694,42 @@
           )
          (MenuItem
             activeHelpKey: editCut
-            enabled: valueOfCanCut
+            enabled: canCutHolder
             label: 'Cut'
             itemValue: deleteSelection
             translateLabel: true
           )
          (MenuItem
             activeHelpKey: editCopy
-            enabled: valueOfCanCopy
+            enabled: canCopyHolder
             label: 'Copy'
             itemValue: copySelection
             translateLabel: true
           )
          (MenuItem
             activeHelpKey: pasteBuffer
-            enabled: valueOfCanPaste
+            enabled: canPasteHolder
             label: 'Paste'
             itemValue: pasteBuffer
             translateLabel: true
           )
          (MenuItem
             activeHelpKey: pasteWithLayout
-            enabled: valueOfCanPasteWithKeepingLayout
+            enabled: canPasteKeepingLayoutHolder
             label: 'Paste with Layout'
             itemValue: pasteWithLayout
             translateLabel: true
           )
          (MenuItem
             activeHelpKey: editPaste
-            enabled: valueOfCanPasteWithKeepingLayout
+            enabled: canPasteKeepingLayoutHolder
             label: 'Paste Keeping Absolute Position'
             itemValue: pasteKeepingPosition
             translateLabel: true
           )
          (MenuItem
             activeHelpKey: editDelete
-            enabled: valueOfCanCut
+            enabled: canCutHolder
             label: 'Delete'
             itemValue: deleteTotalSelection
             translateLabel: true
@@ -2083,7 +2083,7 @@
           )
          (MenuItem
             activeHelpKey: editCut
-            enabled: valueOfCanCut
+            enabled: canCutHolder
             label: 'Cut'
             itemValue: deleteSelection
             translateLabel: true
@@ -2092,7 +2092,7 @@
           )
          (MenuItem
             activeHelpKey: editCopy
-            enabled: valueOfCanCopy
+            enabled: canCopyHolder
             label: 'Copy'
             itemValue: copySelection
             translateLabel: true
@@ -2101,7 +2101,7 @@
           )
          (MenuItem
             activeHelpKey: editPaste
-            enabled: valueOfCanPasteWithKeepingLayout
+            enabled: canPasteKeepingLayoutHolder
             label: 'Paste With Layout'
             itemValue: pasteWithLayout
             translateLabel: true
@@ -2110,7 +2110,7 @@
           )
          (MenuItem
             activeHelpKey: editDelete
-            enabled: valueOfCanCut
+            enabled: canCutHolder
             label: 'Delete'
             itemValue: deleteTotalSelection
             translateLabel: true
@@ -2361,6 +2361,15 @@
     ^ builder booleanValueAspectFor:#canMoveSelectionOutOfContainer
 !
 
+canPasteKeepingLayoutHolder
+
+    |holder|
+    (holder := builder bindingAt:#valueOfCanPasteWithKeepingLayout) isNil ifTrue:[
+        builder aspectAt:#valueOfCanPasteWithKeepingLayout put:(holder :=  false asValue).
+    ].
+    ^ holder
+!
+
 canReplaceSelection
     treeView isCanvasSelected ifTrue:[^ false].
     ^ true
@@ -2497,15 +2506,8 @@
 !
 
 valueOfCanPasteWithKeepingLayout
-
-    |holder|
-    (holder := builder bindingAt:#valueOfCanPasteWithKeepingLayout) isNil ifTrue:[
-	builder aspectAt:#valueOfCanPasteWithKeepingLayout put:(holder :=  false asValue).
-    ].
-    ^ holder
-
-
-
+    self obsoleteMethodWarning:'stupid name - use #canPasteKeepingLayoutHolder'.
+    ^ self canPasteKeepingLayoutHolder
 ! !
 
 !UIPainter methodsFor:'building editors'!
@@ -2817,10 +2819,10 @@
 "/                         or: [self canPasteInto: treeView selectedNode contents view]]]
     ].
 
-    self valueOfCanCut value: canCutOrCopy.
-    self valueOfCanCopy value: canCutOrCopy.
-    self valueOfCanPaste value: canPaste.            
-    self valueOfCanPasteWithKeepingLayout value: (canPaste "&  self canKeepLayoutInSelection").
+    self canCutHolder value: canCutOrCopy.
+    self canCopyHolder value: canCutOrCopy.
+    self canPasteHolder value: canPaste.            
+    self canPasteKeepingLayoutHolder value: (canPaste "&  self canKeepLayoutInSelection").
 
 "/    self modifiedChannel value: false.