--- a/DataSetBuilder.st	Mon Feb 18 18:37:16 2002 +0100
+++ b/DataSetBuilder.st	Mon Feb 25 20:56:30 2002 +0100
@@ -2255,15 +2255,13 @@
 
     columns do:
     [:aColumn|
-        ((sel := aColumn backgroundSelector) notNil and:[(aClass implements:sel) not]) 
+        ((sel := aColumn backgroundSelector) notNil and:[(aClass includesSelector:sel) not]) 
         ifTrue:
         [
             bCode := sel asString, code, '    ^nil'.
             self compile:bCode forClass:aClass inCategory:catg
         ]
     ]
-
-
 !
 
 generateChoicesIn:aClass
@@ -2286,7 +2284,7 @@
         (      aColumn canSelect
           and:[(sel := aColumn choices) notNil
           and:[(edt == #ComboBox or:[edt == #ComboList])
-          and:[(aClass implements:sel) not]]]
+          and:[(aClass includesSelector:sel) not]]]
         ) ifTrue:[
             self compile:(sel asString, code) forClass:aClass inCategory:catg
         ]
@@ -2309,15 +2307,13 @@
     columns do:
     [:aColumn|
         ((sel := aColumn doubleClickedSelector) notNil 
-        and:[(aClass implements:sel) not]) 
+        and:[(aClass includesSelector:sel) not]) 
         ifTrue:
         [
             bCode := sel asString, code.
             self compile:bCode forClass:aClass inCategory:catg
         ]
     ]
-
-
 !
 
 generateForegroundSelectorIn:aClass
@@ -2336,15 +2332,13 @@
     columns do:
     [:aColumn|
         ((sel := aColumn foregroundSelector) notNil 
-        and:[(aClass implements:sel) not]) 
+        and:[(aClass includesSelector:sel) not]) 
         ifTrue:
         [
             bCode := sel asString, code, '    ^nil'.
             self compile:bCode forClass:aClass inCategory:catg
         ]
     ]
-
-
 !
 
 generateMenuIn:aClass
@@ -2365,7 +2359,7 @@
     [:aColumn|
         (aColumn canSelect
         and:[(sel := aColumn menu) notNil
-        and:[(aClass implements:sel) not]]) 
+        and:[(aClass includesSelector:sel) not]]) 
         ifTrue:
         [
             self compile:(sel asString, code) forClass:aClass inCategory:catg
@@ -2390,7 +2384,7 @@
     columns do:[:aColumn|
         (     aColumn rendererType ~~ #rowSelector
          and:[(sel := aColumn printSelector) notNil
-         and:[(aClass implements:sel) not]]
+         and:[(aClass includesSelector:sel) not]]
         ) ifTrue:[
             |numArgs bcode keys|
             bcode   := sel asString.
@@ -2426,7 +2420,7 @@
     [:aColumn|
         (aColumn rendererType ~~ #rowSelector 
         and:[(sel := aColumn readSelector) notNil
-        and:[(aClass implements:sel) not]]) 
+        and:[(aClass includesSelector:sel) not]]) 
         ifTrue:
         [
             (aColumn printSelector isNil or:[aColumn canSelect]) 
@@ -2462,15 +2456,13 @@
 
     columns do:
     [:aColumn|
-        ((sel := aColumn rowSeparatorSelector) notNil and:[(aClass implements:sel) not]) 
+        ((sel := aColumn rowSeparatorSelector) notNil and:[(aClass includesSelector:sel) not]) 
         ifTrue:
         [
             bCode := sel asString, code, '    ^true'.
             self compile:bCode forClass:aClass inCategory:catg
         ]
     ]
-
-
 !
 
 generateSelectSelectorIn:aClass
@@ -2490,7 +2482,7 @@
     [:aColumn|
         (aColumn rendererType ~~ #rowSelector 
          and:[(sel := aColumn selectSelector) notNil
-         and:[(aClass implements:sel) not]]) 
+         and:[(aClass includesSelector:sel) not]]) 
          ifTrue:
          [
             aColumn canSelect 
@@ -2522,7 +2514,7 @@
         (      aColumn canSelect
           and:[(sel := aColumn showComboFieldSelector) notNil
           and:[(edt == #ComboBox or:[edt == #ComboList])
-          and:[(aClass implements:sel) not]]]
+          and:[(aClass includesSelector:sel) not]]]
         ) ifTrue:[
             state := edt == #ComboBoxView.
 
@@ -2530,8 +2522,6 @@
             self compile:bCode forClass:aClass inCategory:catg
         ]
     ]
-
-
 !
 
 generateWriteSelectorIn:aClass
@@ -2551,7 +2541,7 @@
         ((sel := aColumn writeSelector) notNil
          and:[aColumn editorType ~~ #None
          and:[aColumn canSelect
-         and:[(aClass implements:sel) not]]]) 
+         and:[(aClass includesSelector:sel) not]]]) 
         ifTrue:
         [
             sel numArgs == 1