# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 930153846 -7200
# Node ID c7bce869223c94093659cdebd49e58ac4e5cb74f
# Parent  06957119a0acf02622f863049d973bab186940fe
*** empty log message ***

diff -r 06957119a0ac -r c7bce869223c SetInspV.st
--- a/SetInspV.st	Wed Jun 23 18:02:23 1999 +0200
+++ b/SetInspV.st	Wed Jun 23 18:04:06 1999 +0200
@@ -112,10 +112,17 @@
 doRemoveKey
     "remove selected item from keys"
 
-    |key|
+    |key idx|
 
-    selectedLine == 1 ifFalse:[
-        key := (keys at:selectedLine - 1).
+    idx := selectedLine.
+    (idx notNil and:[idx ~~ 1]) ifTrue:[
+        idx := idx + Set instSize.
+        idx <= inspectedObject class instSize ifTrue:[
+            ^ self
+        ].
+        idx := idx - inspectedObject class instSize.
+
+        key := keys at:idx.
         (inspectedObject includes:key) ifTrue:[
             listView cursor:(Cursor wait).
             inspectedObject remove:key.
@@ -144,13 +151,11 @@
         idx := idx - 1.
     ].
 
-    inspectedObject ~~ Smalltalk ifTrue:[
-        idx := idx + Dictionary instSize.
-        idx <= inspectedObject class instSize ifTrue:[
-            ^ inspectedObject instVarAt:idx
-        ].
-        idx := idx - inspectedObject class instSize.
+    idx := idx + Set instSize.
+    idx <= inspectedObject class instSize ifTrue:[
+        ^ inspectedObject instVarAt:idx
     ].
+    idx := idx - inspectedObject class instSize.
 
     key := keys at:idx.
     ^ key.
@@ -160,5 +165,5 @@
 !SetInspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/SetInspV.st,v 1.9 1999-06-23 16:02:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/SetInspV.st,v 1.10 1999-06-23 16:04:06 cg Exp $'
 ! !
diff -r 06957119a0ac -r c7bce869223c SetInspectorView.st
--- a/SetInspectorView.st	Wed Jun 23 18:02:23 1999 +0200
+++ b/SetInspectorView.st	Wed Jun 23 18:04:06 1999 +0200
@@ -112,10 +112,17 @@
 doRemoveKey
     "remove selected item from keys"
 
-    |key|
+    |key idx|
 
-    selectedLine == 1 ifFalse:[
-        key := (keys at:selectedLine - 1).
+    idx := selectedLine.
+    (idx notNil and:[idx ~~ 1]) ifTrue:[
+        idx := idx + Set instSize.
+        idx <= inspectedObject class instSize ifTrue:[
+            ^ self
+        ].
+        idx := idx - inspectedObject class instSize.
+
+        key := keys at:idx.
         (inspectedObject includes:key) ifTrue:[
             listView cursor:(Cursor wait).
             inspectedObject remove:key.
@@ -144,13 +151,11 @@
         idx := idx - 1.
     ].
 
-    inspectedObject ~~ Smalltalk ifTrue:[
-        idx := idx + Dictionary instSize.
-        idx <= inspectedObject class instSize ifTrue:[
-            ^ inspectedObject instVarAt:idx
-        ].
-        idx := idx - inspectedObject class instSize.
+    idx := idx + Set instSize.
+    idx <= inspectedObject class instSize ifTrue:[
+        ^ inspectedObject instVarAt:idx
     ].
+    idx := idx - inspectedObject class instSize.
 
     key := keys at:idx.
     ^ key.
@@ -160,5 +165,5 @@
 !SetInspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/SetInspectorView.st,v 1.9 1999-06-23 16:02:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SetInspectorView.st,v 1.10 1999-06-23 16:04:06 cg Exp $'
 ! !