--- a/SelectionInTreeView.st	Tue Apr 15 13:58:01 2003 +0200
+++ b/SelectionInTreeView.st	Tue Apr 15 13:59:15 2003 +0200
@@ -565,8 +565,8 @@
 !SelectionInTreeView methodsFor:'change & update'!
 
 modelChanged:what with:aPara
-    "hierarchical list changed
-    "
+    "hierarchical list changed"
+
     |start size visLn h y0 y1 cY parent pvLv ndLv|
 
     aPara isNil ifTrue:[
@@ -586,7 +586,8 @@
     shown ifFalse:[
         ^ self contentsChanged
     ].
-    (self sensor notNil and: [self sensor hasExposeEventFor:self]) ifTrue:[               "/ outstanding expose events
+    (self sensor hasExposeEventFor:self) ifTrue:[       
+        "/ outstanding expose events
         self invalidateRepairNow:true.
         ^ self contentsChanged
     ].
@@ -1362,9 +1363,8 @@
 
     isExpd := node isExpandable.
 
-    (     supportsExpandAll
-     and:[(sensor := self sensor) notNil
-     and:[(sensor ctrlDown or:[sensor shiftDown])]]
+    (supportsExpandAll
+     and:[(sensor := self sensor) ctrlDown or:[sensor shiftDown]]
     ) ifTrue:[
         isExpd ifTrue:[model doExpandAll:node]
               ifFalse:[model doCollapseAll:node]
@@ -1372,7 +1372,6 @@
         isExpd ifTrue:[model doExpand:node]
               ifFalse:[model doCollapse:node].
     ].
-
 !
 
 indicatiorLineForButton:aButton atX:x y:y
@@ -1401,18 +1400,9 @@
 !
 
 isCtrlMetaAltOrShiftPressed
-    "returns true if CTRL, META, ALT or SHIFT is pressed
-    "
-    |sensor|
-
-    (sensor := self sensor) notNil ifTrue:[
-        ^ (     sensor ctrlDown
-            or:[sensor altDown
-            or:[sensor shiftDown
-            or:[sensor metaDown]]]
-          )
-    ].
-    ^ false
+    "returns true if CTRL, META, ALT or SHIFT is pressed"
+
+    ^ self sensor anyModifierKeyDown.
 !
 
 key:key select:index x:x y:y
@@ -2479,5 +2469,5 @@
 !SelectionInTreeView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInTreeView.st,v 1.99 2002-10-26 15:53:23 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInTreeView.st,v 1.100 2003-04-15 11:59:15 stefan Exp $'
 ! !