--- a/WindowBuilder.st	Fri Feb 14 01:00:00 1997 +0100
+++ b/WindowBuilder.st	Fri Feb 14 01:01:41 1997 +0100
@@ -12,7 +12,7 @@
 
 Object subclass:#WindowBuilder
 	instanceVariableNames:'window application bindings focusSequence namedComponents
-		componentCreationHook'
+		componentCreationHook applicationClass'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-Support-UI'
@@ -69,6 +69,11 @@
     "Modified: 17.1.1997 / 19:04:47 / cg"
 !
 
+applicationClass:something
+    "set the value of the instance variable 'applicationClass' (automatically generated)"
+
+    applicationClass := something.!
+
 aspectAt:aSymbol
     bindings isNil ifTrue:[^ nil].
     ^ bindings at:aSymbol ifAbsent:nil
@@ -172,13 +177,16 @@
     focusSequence add:aComponent
 ! !
 
-!WindowBuilder methodsFor:'spec creation callbacks'!
+!WindowBuilder methodsFor:'spec creation aspect fetch'!
 
 actionFor:aKey
     application notNil ifTrue:[
         ^ application actionFor:aKey
     ].
-    ^ self aspectAt:aKey
+    applicationClass notNil ifTrue:[
+        ^ applicationClass actionFor:aKey
+    ].
+    ^ []
 
     "Created: 17.1.1997 / 21:08:22 / cg"
 !
@@ -187,35 +195,47 @@
     application notNil ifTrue:[
         ^ application aspectFor:aKey
     ].
+    applicationClass notNil ifTrue:[
+        ^ applicationClass aspectFor:aKey
+    ].
     ^ self aspectAt:aKey
 
     "Created: 17.1.1997 / 21:06:16 / cg"
 !
 
+labelFor:aKey
+    |cls|
+
+    application notNil ifTrue:[
+        ^ application labelFor:aKey
+    ].
+    applicationClass notNil ifTrue:[
+        ^ applicationClass labelFor:aKey
+    ].
+    ^ self aspectAt:aKey
+
+!
+
+listFor:aKey
+    application notNil ifTrue:[
+        ^ application listFor:aKey
+    ].
+    applicationClass notNil ifTrue:[
+        ^ applicationClass listFor:aKey
+    ].
+    ^ self aspectAt:aKey
+
+    "Created: 17.1.1997 / 21:08:45 / cg"
+! !
+
+!WindowBuilder methodsFor:'spec creation callbacks'!
+
 createdComponent:aView forSpec:spec
     componentCreationHook notNil ifTrue:[
         componentCreationHook value:aView value:spec value:self
     ]
 
     "Modified: 5.9.1995 / 21:42:54 / claus"
-!
-
-labelFor:aKey
-    application notNil ifTrue:[
-        ^ application labelFor:aKey
-    ].
-    ^ self aspectAt:aKey
-
-    "Created: 17.1.1997 / 21:08:45 / cg"
-!
-
-listFor:aKey
-    application notNil ifTrue:[
-        ^ application listFor:aKey
-    ].
-    ^ self aspectAt:aKey
-
-    "Created: 17.1.1997 / 21:08:45 / cg"
 ! !
 
 !WindowBuilder methodsFor:'startup'!
@@ -318,5 +338,5 @@
 !WindowBuilder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/WindowBuilder.st,v 1.18 1997-02-13 22:25:21 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/WindowBuilder.st,v 1.19 1997-02-14 00:01:41 ca Exp $'
 ! !