--- a/SimpleView.st Fri Jan 10 18:19:15 1997 +0100
+++ b/SimpleView.st Fri Jan 10 18:33:02 1997 +0100
@@ -1051,13 +1051,13 @@
StyleSheet := ViewStyle fromFile:(DefaultStyle , '.style').
StyleSheet fileReadFailed ifTrue:[
- ('***** WARNING: no styleSheet for ' , DefaultStyle , '-style.') errorPrintNL.
+ ('***** WARNING: no styleSheet for ' , DefaultStyle , '-style.') errorPrintCR.
DefaultStyle ~~ #normal ifTrue:[
DefaultStyle := #normal.
StyleSheet := ViewStyle fromFile:(DefaultStyle , '.style').
StyleSheet fileReadFailed ifTrue:[
- '***** WARNING: not even a styleSheet for normal-style (using defaults).' errorPrintNL.
+ '***** WARNING: not even a styleSheet for normal-style (using defaults).' errorPrintCR.
]
]
].
@@ -1079,7 +1079,7 @@
View updateAllStyleCaches
"
- "Modified: 18.3.1996 / 12:56:26 / cg"
+ "Modified: 10.1.1997 / 18:06:25 / cg"
!
updateStyleCache
@@ -1156,11 +1156,11 @@
].
DefaultViewBackgroundColor isNil ifTrue:[
- 'VIEW: bad viewBackground in style - using white' errorPrintNL.
+ 'SimpleView [warning]: bad viewBackground in style - using white' errorPrintCR.
DefaultViewBackgroundColor := White
].
- "Modified: 28.5.1996 / 21:14:06 / cg"
+ "Modified: 10.1.1997 / 18:06:18 / cg"
!
viewSpacing
@@ -3138,14 +3138,15 @@
aView container:self.
(aView graphicsDevice ~~ device) ifTrue:[
- 'VIEW: warning subview (' errorPrint. aView class name errorPrint.
+ 'SimpleView [warning]: subview (' errorPrint. aView class name errorPrint.
') has different device than me (' errorPrint.
- self class name errorPrint. ').' errorPrintNL.
+ self class name errorPrint. ').' errorPrintCR.
+
aView device:device
]
"Created: 9.5.1996 / 00:46:59 / cg"
- "Modified: 28.5.1996 / 20:24:49 / cg"
+ "Modified: 10.1.1997 / 18:06:49 / cg"
! !
!SimpleView methodsFor:'change & update'!
@@ -3179,7 +3180,7 @@
f := Image fromFile:('bitmaps/' , name , '.xbm').
f isNil ifTrue:[
- ('no bitmap file: ' , name , '.xbm') errorPrintNL.
+ ('SimpleView [warning]: no bitmap file: ' , name , '.xbm') errorPrintCR.
ok := false
].
f
@@ -3187,7 +3188,7 @@
mask := Image fromFile:'bitmaps/wheelm.xbm'.
mask isNil ifTrue:[
- ('no bitmap file: wheelm.xbm') errorPrintNL.
+ ('SimpleView [warning]: no bitmap file: wheelm.xbm') errorPrintCR.
ok := false
].
@@ -3224,7 +3225,7 @@
View new realize showBusyWhile:[10 timesRepeat:[3000 factorial]]
"
- "Modified: 19.12.1996 / 13:54:49 / cg"
+ "Modified: 10.1.1997 / 18:07:23 / cg"
! !
!SimpleView methodsFor:'edge drawing'!
@@ -4805,19 +4806,21 @@
|id dither|
drawableId notNil ifTrue:[
- borderColor := borderColor on:device.
- id := borderColor colorId.
- id notNil ifTrue:[
- device setWindowBorderColor:id in:drawableId
- ] ifFalse:[
- dither := borderColor ditherForm.
- dither notNil ifTrue:[
- device setWindowBorderPixmap:(dither id) in:drawableId
- ] ifFalse:[
- 'VIEW: bad borderColor' errorPrintNL
- ]
- ]
+ borderColor := borderColor on:device.
+ id := borderColor colorId.
+ id notNil ifTrue:[
+ device setWindowBorderColor:id in:drawableId
+ ] ifFalse:[
+ dither := borderColor ditherForm.
+ dither notNil ifTrue:[
+ device setWindowBorderPixmap:(dither id) in:drawableId
+ ] ifFalse:[
+ 'SimpleView [warning]: bad borderColor' errorPrintCR
+ ]
+ ]
]
+
+ "Modified: 10.1.1997 / 18:06:34 / cg"
!
setInnerClip
@@ -6489,6 +6492,6 @@
!SimpleView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.150 1997-01-09 12:48:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.151 1997-01-10 17:33:02 cg Exp $'
! !
SimpleView initialize!
--- a/WSensor.st Fri Jan 10 18:19:15 1997 +0100
+++ b/WSensor.st Fri Jan 10 18:33:02 1997 +0100
@@ -1963,9 +1963,9 @@
such an event)"
aView device scrollsAsynchronous ifFalse:[
- catchExpose := false.
- gotExpose := true.
- ^ self
+ catchExpose := false.
+ gotExpose := true.
+ ^ self
].
[
@@ -1993,9 +1993,9 @@
you can put a comment around the following line, if you dont
like the message ...
"
- 'WSENSOR: late expose event' errorPrintNL.
+ 'WindowSensor [info]: late expose event' infoPrintCR.
(exposeEventSemaphore waitWithTimeout:10) isNil ifFalse:[
- 'WSENSOR: lost expose event again - ignore' errorPrintNL.
+ 'WindowSensor [warning]: lost expose event again - ignore' errorPrintCR.
].
"
ok, break out
@@ -2019,7 +2019,7 @@
catchExpose := false.
].
- "Modified: 2.8.1996 / 16:52:21 / cg"
+ "Modified: 10.1.1997 / 18:15:52 / cg"
!
waitNoButton
@@ -2042,6 +2042,6 @@
!WindowSensor class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/WSensor.st,v 1.70 1997-01-08 10:27:18 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/WSensor.st,v 1.71 1997-01-10 17:32:02 cg Exp $'
! !
WindowSensor initialize!
--- a/WindowSensor.st Fri Jan 10 18:19:15 1997 +0100
+++ b/WindowSensor.st Fri Jan 10 18:33:02 1997 +0100
@@ -1963,9 +1963,9 @@
such an event)"
aView device scrollsAsynchronous ifFalse:[
- catchExpose := false.
- gotExpose := true.
- ^ self
+ catchExpose := false.
+ gotExpose := true.
+ ^ self
].
[
@@ -1993,9 +1993,9 @@
you can put a comment around the following line, if you dont
like the message ...
"
- 'WSENSOR: late expose event' errorPrintNL.
+ 'WindowSensor [info]: late expose event' infoPrintCR.
(exposeEventSemaphore waitWithTimeout:10) isNil ifFalse:[
- 'WSENSOR: lost expose event again - ignore' errorPrintNL.
+ 'WindowSensor [warning]: lost expose event again - ignore' errorPrintCR.
].
"
ok, break out
@@ -2019,7 +2019,7 @@
catchExpose := false.
].
- "Modified: 2.8.1996 / 16:52:21 / cg"
+ "Modified: 10.1.1997 / 18:15:52 / cg"
!
waitNoButton
@@ -2042,6 +2042,6 @@
!WindowSensor class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/WindowSensor.st,v 1.70 1997-01-08 10:27:18 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/WindowSensor.st,v 1.71 1997-01-10 17:32:02 cg Exp $'
! !
WindowSensor initialize!