--- a/SubCanvas.st	Tue Sep 21 18:07:33 1999 +0200
+++ b/SubCanvas.st	Tue Sep 21 20:09:45 1999 +0200
@@ -72,35 +72,18 @@
 
     ^ client!
 
-client:anApplicationModel
-    "release existing components and generate new components from
-     the applications windowSpec."
-
-    ^ self client:anApplicationModel spec:#windowSpec
-!
-
-client:anApplication spec:aWindowSpecOrSelector
-    "release existing components and generate new components from
-     the applications windowSpec."
-
-    |aBuilder|
-
-    (anApplication notNil and:[anApplication respondsTo:#builder]) ifTrue:[
-        aBuilder := anApplication builder
-    ] ifFalse:[
-        aBuilder := UIBuilder new
-    ].
-  ^ self client:anApplication spec:aWindowSpecOrSelector builder:aBuilder
-!
-
 client:anApplication spec:aWindowSpecOrSpecSymbol builder:aBuilder
     "release existing components and generate new components from
      the given windowSpec, using the given builder."
 
     |myApp|
 
-    builder  := aBuilder.
-    spec     := aWindowSpecOrSpecSymbol.
+    (builder := aBuilder) isNil ifTrue:[
+        builder := anApplication perform:#builder
+                         ifNotUnderstood:[UIBuilder new]
+    ].
+
+    spec := aWindowSpecOrSpecSymbol.
 
     "/ check for master application
     (anApplication notNil and:[anApplication masterApplication isNil]) ifTrue:[
@@ -344,5 +327,5 @@
 !SubCanvas class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/SubCanvas.st,v 1.16 1999-08-12 17:16:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/SubCanvas.st,v 1.17 1999-09-21 18:09:45 stefan Exp $'
 ! !