--- a/TabWidget.st	Fri Feb 26 14:50:02 1999 +0100
+++ b/TabWidget.st	Fri Feb 26 14:50:39 1999 +0100
@@ -481,27 +481,37 @@
 containsPoint:aPoint
     "return true, if a point is contained in the tab
     "
-    |d x y origin|
+    |d origin 
+     originX "{ Class: SmallInteger }"
+     originY "{ Class: SmallInteger }"
+     w       "{ Class: SmallInteger }"
+     h       "{ Class: SmallInteger }"
+     x       "{ Class: SmallInteger }"
+     y       "{ Class: SmallInteger }"|
 
     d := tabView direction.
     x := aPoint x.
     y := aPoint y.
 
     origin := self computeOrigin.
+    originX := origin x.
+    originY := origin y.
+    w := extent x.
+    h := extent y.
 
     (d == #top or:[d == #bottom]) ifTrue:[
-        ((x >= origin x) and:[x <= (origin x + extent x)]) ifTrue:[
+        ((x >= originX) and:[x <= (originX + w)]) ifTrue:[
             d == #top ifTrue:[
-                ^ ((y >=  origin y) and:[y <= (origin y + extent y)])
+                ^ ((y >=  originY) and:[y <= (originY + h)])
             ].
-            ^ ((y <=  origin y) and:[y >= (origin y - extent y)])
+            ^ ((y <=  originY) and:[y >= (originY - h)])
         ]
     ] ifFalse:[
-        ((y >= origin y) and:[y <= (origin y + extent y)]) ifTrue:[
+        ((y >= originY) and:[y <= (originY + h)]) ifTrue:[
             d == #right ifTrue:[
-                ^ ((x <= origin x) and:[x >= (origin x - extent x)])
+                ^ ((x <= originX) and:[x >= (originX - w)])
             ].
-            ^ ((x >= origin x) and:[x <= (origin x + extent x)])
+            ^ ((x >= originX) and:[x <= (originX + w)])
         ]
     ].
     ^ false
@@ -1072,5 +1082,5 @@
 !TabWidget class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/TabWidget.st,v 1.16 1998-05-20 23:17:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/TabWidget.st,v 1.17 1999-02-26 13:50:39 cg Exp $'
 ! !