Mercurial Mercurial > hg > stx-libwidg2 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use new #perform:withOptionalArgument:
authorClaus Gittinger <cg@exept.de>
Fri, 14 Dec 2001 11:53:34 +0100
changeset 2069 7891c7d3af69
parent 2068 3fcbf2422c5a
child 2070 cb8b952f7214
use new #perform:withOptionalArgument:
ExtendedComboBox.st file | annotate | diff | comparison | revisions
HierarchicalListView.st file | annotate | diff | comparison | revisions
MenuPanel.st file | annotate | diff | comparison | revisions 
--- a/ExtendedComboBox.st	Fri Dec 14 11:51:02 2001 +0100
+++ b/ExtendedComboBox.st	Fri Dec 14 11:53:34 2001 +0100
@@ -1155,11 +1155,7 @@
     |h w menuOrigin widgetPrfExt useableExt|
 
     openAction notNil ifTrue:[
-        openAction numArgs == 0 ifTrue:[
-            openAction value
-        ] ifFalse:[
-            openAction value:menuWidget
-        ]
+        openAction valueWithOptionalArgument:menuWidget
     ].
     menuWrapper isNil ifTrue:[
         menuWidget isNil ifTrue:[^ self].
@@ -1503,5 +1499,5 @@
 !ExtendedComboBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ExtendedComboBox.st,v 1.30 2001-10-10 14:04:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ExtendedComboBox.st,v 1.31 2001-12-14 10:53:04 cg Exp $'
 ! !
--- a/HierarchicalListView.st	Fri Dec 14 11:51:02 2001 +0100
+++ b/HierarchicalListView.st	Fri Dec 14 11:53:34 2001 +0100
@@ -411,14 +411,9 @@
         item := list at:aLnNr ifAbsent:nil.
 
         (item notNil and:[item hasChildren]) ifTrue:[
-            (indicatorAction numArgs == 1) ifTrue:[
-                indicatorAction value:aLnNr
-            ] ifFalse:[
-                indicatorAction value
-            ]
+            indicatorAction valueWithOptionalArgument:aLnNr
         ]
     ]
-
 !
 
 lineChangedAt:aLnNr with:arg
@@ -1178,5 +1173,5 @@
 !HierarchicalListView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalListView.st,v 1.38 2001-11-15 08:35:23 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalListView.st,v 1.39 2001-12-14 10:53:19 cg Exp $'
 ! !
--- a/MenuPanel.st	Fri Dec 14 11:51:02 2001 +0100
+++ b/MenuPanel.st	Fri Dec 14 11:53:34 2001 +0100
@@ -6417,18 +6417,18 @@
      Ignore the error if that message is not understood
      (but not other message-not-understoods)"
 
-    |subm sel num|
+    |subm sel numArgs|
 
     aRecv isNil ifTrue:[^ nil].
 
     sel := submenuChannel asSymbol.
-    num := sel numArgs.
-
-    num == 0 ifTrue:[
-        Object messageNotUnderstoodSignal handle:[:ex|
+    numArgs := sel numArgs.
+
+    numArgs == 0 ifTrue:[
+        MessageNotUnderstood handle:[:ex |
             |selector|
 
-            ((selector := ex parameter selector) == sel
+            ((selector := ex message selector) == sel
             or:[selector == #aspectFor:]) ifFalse:[
                 ex reject
             ].
@@ -6440,12 +6440,18 @@
 
     (Array with:(aRecv) with:(aRecv class))
     do:[:aPossibleReceiver |
-        Object messageNotUnderstoodSignal handle:[:ex|
-            ex parameter selector == sel ifFalse:[ ex reject ]
+        MessageNotUnderstood handle:[:ex|
+            ex message selector == sel ifFalse:[ ex reject ]
         ] do:[
-                     num == 0 ifTrue:[subm := aPossibleReceiver perform:sel]
-            ifFalse:[num == 1 ifTrue:[subm := aPossibleReceiver perform:sel with:(argument ? menuPanel)]
-            ifFalse:[                 subm := aPossibleReceiver perform:sel with:argument with:menuPanel]]
+            numArgs == 0 ifTrue:[
+                subm := aPossibleReceiver perform:sel
+            ] ifFalse:[ 
+                numArgs == 1 ifTrue:[
+                    subm := aPossibleReceiver perform:sel with:(argument ? menuPanel)
+                ] ifFalse:[
+                    subm := aPossibleReceiver perform:sel with:argument with:menuPanel
+                ]
+            ]
         ].
         subm notNil ifTrue:[^ subm].
     ].
@@ -6474,8 +6480,8 @@
                 sel := indication copyFrom:1 to:(indication indexOf:$:).
                 sel := sel asSymbol.
 
-                Object messageNotUnderstoodSignal handle:[:ex| 
-                    ex parameter selector == sel ifFalse:[
+                MessageNotUnderstood handle:[:ex| 
+                    ex message selector == sel ifFalse:[
                         ex reject
                     ].
                 ] do:[
@@ -6524,8 +6530,8 @@
         recv isNil ifTrue:[^ self].
     ].
 
-    Object messageNotUnderstoodSignal handle:[:ex| 
-        (ex parameter selector ~~ indication) ifTrue:[
+    MessageNotUnderstood handle:[:ex| 
+        (ex message selector ~~ indication) ifTrue:[
             ex reject
         ].
         ('MenuPanel [info]: application does not respond to ' , indication) infoPrintCR.
@@ -7005,6 +7011,6 @@
 !MenuPanel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.294 2001-12-12 15:18:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.295 2001-12-14 10:53:34 cg Exp $'
 ! !
 MenuPanel initialize!
hg/stx-libwidg2