--- a/UIPainterView.st	Mon Feb 25 20:56:30 2002 +0100
+++ b/UIPainterView.st	Mon Feb 25 21:02:03 2002 +0100
@@ -588,10 +588,10 @@
         (selector := aProp model) notNil ifTrue:[
             selector isArray ifFalse:[
                 selector := selector asSymbol.
-                (cls implements:selector) ifTrue:[
+                (cls includesSelector:selector) ifTrue:[
                     skip := false.
                     (cls isSubclassOf:SimpleDialog) ifTrue:[
-                        skip := SimpleDialog implements:selector asSymbol
+                        skip := SimpleDialog includesSelector:selector asSymbol
                     ].
                     skip ifFalse:[
                         methods add:(cls compiledMethodAt:selector)
@@ -603,7 +603,7 @@
         (selector := aProp menu) notNil ifTrue:[
             selector isArray ifFalse:[
                 selector := selector asSymbol.
-                (cls implements:selector) ifTrue:[
+                (cls includesSelector:selector) ifTrue:[
                     methods add:(cls compiledMethodAt:selector)
                 ]
             ].
@@ -614,7 +614,7 @@
 
             aSel isArray ifFalse:[
                 selector := aSel asSymbol.
-                (cls implements:selector) ifTrue:[
+                (cls includesSelector:selector) ifTrue:[
                     methods add:(cls compiledMethodAt:selector)
                 ]
             ].
@@ -624,7 +624,7 @@
 
             aSel isArray ifFalse:[
                 selector := aSel asSymbol.
-                (cls implements:selector) ifTrue:[
+                (cls includesSelector:selector) ifTrue:[
                     methods add:(cls compiledMethodAt:selector)
                 ]
             ].
@@ -634,7 +634,7 @@
 
             aSel isArray ifFalse:[
                 selector := aSel asSymbol.
-                (cls implements:selector) ifTrue:[
+                (cls includesSelector:selector) ifTrue:[
                     methods add:(cls compiledMethodAt:selector)
                 ]
             ].
@@ -646,7 +646,7 @@
     (selector := protoSpec menu) notNil ifTrue:[
         selector isArray ifFalse:[
             selector := selector asSymbol.
-            (cls implements:selector) ifTrue:[
+            (cls includesSelector:selector) ifTrue:[
                 methods add:(cls compiledMethodAt:selector)
             ]
         ].
@@ -821,7 +821,7 @@
                     skip := false.
 
                     (cls isSubclassOf:SimpleDialog) ifTrue:[
-                        skip := SimpleDialog implements:sym
+                        skip := SimpleDialog includesSelector:sym
                     ].
                     (definedMethodSelectors includes:sym) ifTrue:[
                         skip := true.
@@ -1019,7 +1019,7 @@
 
     self class redefineAspectMethods ifTrue:[
         aListOfSelectors do:[:aSelector|
-            (aSelector isArray or:[aClass implements:aSelector]) ifFalse:[
+            (aSelector isArray or:[aClass includesSelector:aSelector]) ifFalse:[
                 aBlock value:aSelector
             ] ifTrue:[
                 Transcript showCR:'#' , aSelector , ' skipped - already implemented in the class'
@@ -1036,8 +1036,6 @@
             ]
         ]
     ]
-
-
 !
 
 generateHookMethodFor:selectorSpec comment:commentWhen note:noteOrNil defaultCode:defaultCode inClass:targetClass
@@ -1086,7 +1084,7 @@
 
     code := ''.
 
-    (targetClass implements:#postBuildWith:) ifFalse:[
+    (targetClass includesSelector:#postBuildWith:) ifFalse:[
         code := code 
                 , (self 
                     generateHookMethodFor:'postBuildWith:aBuilder'
@@ -1095,7 +1093,7 @@
                     defaultCode:'    super postBuildWith:aBuilder'
                     inClass:targetClass)
     ].
-    (targetClass implements:#postOpenWith:) ifFalse:[
+    (targetClass includesSelector:#postOpenWith:) ifFalse:[
         code := code 
                 , (self 
                     generateHookMethodFor:'postOpenWith:aBuilder'
@@ -1104,7 +1102,7 @@
                     defaultCode:'    super postOpenWith:aBuilder'
                     inClass:targetClass)
     ].
-    (targetClass implements:#closeRequest) ifFalse:[
+    (targetClass includesSelector:#closeRequest) ifFalse:[
         code := code 
                 , (self 
                     generateHookMethodFor:'closeRequest'