undid some exception handling stuff;
moved open-protocol;
added subCanvas builder.
--- a/WinBuilder.st Thu Jun 18 21:36:52 1998 +0200
+++ b/WinBuilder.st Thu Jun 18 21:41:22 1998 +0200
@@ -194,6 +194,8 @@
]
].
^ nil
+
+ "Modified: / 18.6.1998 / 20:23:24 / cg"
!
aspectAt:aSymbol put:aModel
@@ -300,6 +302,14 @@
"Modified: 3.3.1997 / 18:32:27 / cg"
!
+keyboardProcessor:aKeyboardProcessor
+ "set my keyboard processor
+ "
+ keyboardProcessor := aKeyboardProcessor
+
+ "Created: / 18.6.1998 / 19:59:38 / cg"
+!
+
labelAt:name
labels isNil ifTrue:[^ nil].
^ labels at:name asSymbol ifAbsent:nil
@@ -593,7 +603,8 @@
aSelector notNil ifTrue:[
application notNil ifTrue:[
application messageNotUnderstoodSignal handle:[:ex|
- ex parameter selector ~~ aSelector ifTrue:[
+ (ex parameter selector ~~ aSelector
+ and:[ex parameter selector ~~ anArgument]) ifTrue:[
ex reject
]
] do:[
@@ -602,7 +613,8 @@
cls := application class.
cls messageNotUnderstoodSignal handle:[:ex|
- ex parameter selector ~~ aSelector ifTrue:[
+ (ex parameter selector ~~ aSelector
+ and:[ex parameter selector ~~ anArgument]) ifTrue:[
ex reject
]
] do:[
@@ -621,7 +633,7 @@
].
^ aBlock value
- "Modified: / 18.6.1998 / 16:26:10 / cg"
+ "Modified: / 18.6.1998 / 20:35:32 / cg"
!
safelyPerform:aSelector with:arg1 with:arg2 ifNone:aBlock
@@ -632,22 +644,39 @@
aSelector notNil ifTrue:[
application notNil ifTrue:[
- application messageNotUnderstoodSignal handle:[:ex|] do:[
+ application messageNotUnderstoodSignal handle:[:ex|
+ (ex parameter selector ~~ aSelector
+ and:[ex parameter selector ~~ arg1]) ifTrue:[
+ ex reject
+ ]
+ ] do:[
^ application perform:aSelector with:arg1 with:arg2
].
cls := application class.
- cls messageNotUnderstoodSignal handle:[:ex|] do:[
+ cls messageNotUnderstoodSignal handle:[:ex|
+ (ex parameter selector ~~ aSelector
+ and:[ex parameter selector ~~ arg1]) ifTrue:[
+ ex reject
+ ]
+ ] do:[
^ cls perform:aSelector with:arg1 with:arg2
]
].
applicationClass notNil ifTrue:[
- applicationClass messageNotUnderstoodSignal handle:[:ex|] do:[
+ applicationClass messageNotUnderstoodSignal handle:[:ex|
+ (ex parameter selector ~~ aSelector
+ and:[ex parameter selector ~~ arg1]) ifTrue:[
+ ex reject
+ ]
+ ] do:[
^ applicationClass perform:aSelector with:arg1 with:arg2
].
]
].
^ aBlock value
+
+ "Modified: / 18.6.1998 / 21:40:13 / cg"
! !
!WindowBuilder methodsFor:'spec creation aspect fetch'!
@@ -1011,5 +1040,5 @@
!WindowBuilder class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/Attic/WinBuilder.st,v 1.65 1998-06-18 17:11:47 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/Attic/WinBuilder.st,v 1.66 1998-06-18 19:41:22 cg Exp $'
! !
--- a/WindowBuilder.st Thu Jun 18 21:36:52 1998 +0200
+++ b/WindowBuilder.st Thu Jun 18 21:41:22 1998 +0200
@@ -194,6 +194,8 @@
]
].
^ nil
+
+ "Modified: / 18.6.1998 / 20:23:24 / cg"
!
aspectAt:aSymbol put:aModel
@@ -300,6 +302,14 @@
"Modified: 3.3.1997 / 18:32:27 / cg"
!
+keyboardProcessor:aKeyboardProcessor
+ "set my keyboard processor
+ "
+ keyboardProcessor := aKeyboardProcessor
+
+ "Created: / 18.6.1998 / 19:59:38 / cg"
+!
+
labelAt:name
labels isNil ifTrue:[^ nil].
^ labels at:name asSymbol ifAbsent:nil
@@ -593,7 +603,8 @@
aSelector notNil ifTrue:[
application notNil ifTrue:[
application messageNotUnderstoodSignal handle:[:ex|
- ex parameter selector ~~ aSelector ifTrue:[
+ (ex parameter selector ~~ aSelector
+ and:[ex parameter selector ~~ anArgument]) ifTrue:[
ex reject
]
] do:[
@@ -602,7 +613,8 @@
cls := application class.
cls messageNotUnderstoodSignal handle:[:ex|
- ex parameter selector ~~ aSelector ifTrue:[
+ (ex parameter selector ~~ aSelector
+ and:[ex parameter selector ~~ anArgument]) ifTrue:[
ex reject
]
] do:[
@@ -621,7 +633,7 @@
].
^ aBlock value
- "Modified: / 18.6.1998 / 16:26:10 / cg"
+ "Modified: / 18.6.1998 / 20:35:32 / cg"
!
safelyPerform:aSelector with:arg1 with:arg2 ifNone:aBlock
@@ -632,22 +644,39 @@
aSelector notNil ifTrue:[
application notNil ifTrue:[
- application messageNotUnderstoodSignal handle:[:ex|] do:[
+ application messageNotUnderstoodSignal handle:[:ex|
+ (ex parameter selector ~~ aSelector
+ and:[ex parameter selector ~~ arg1]) ifTrue:[
+ ex reject
+ ]
+ ] do:[
^ application perform:aSelector with:arg1 with:arg2
].
cls := application class.
- cls messageNotUnderstoodSignal handle:[:ex|] do:[
+ cls messageNotUnderstoodSignal handle:[:ex|
+ (ex parameter selector ~~ aSelector
+ and:[ex parameter selector ~~ arg1]) ifTrue:[
+ ex reject
+ ]
+ ] do:[
^ cls perform:aSelector with:arg1 with:arg2
]
].
applicationClass notNil ifTrue:[
- applicationClass messageNotUnderstoodSignal handle:[:ex|] do:[
+ applicationClass messageNotUnderstoodSignal handle:[:ex|
+ (ex parameter selector ~~ aSelector
+ and:[ex parameter selector ~~ arg1]) ifTrue:[
+ ex reject
+ ]
+ ] do:[
^ applicationClass perform:aSelector with:arg1 with:arg2
].
]
].
^ aBlock value
+
+ "Modified: / 18.6.1998 / 21:40:13 / cg"
! !
!WindowBuilder methodsFor:'spec creation aspect fetch'!
@@ -1011,5 +1040,5 @@
!WindowBuilder class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/WindowBuilder.st,v 1.65 1998-06-18 17:11:47 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/WindowBuilder.st,v 1.66 1998-06-18 19:41:22 cg Exp $'
! !