diff -r 542bbbf55014 -r a50a526d2396 DeviceWorkstation.st --- a/DeviceWorkstation.st Mon Jul 24 12:23:18 2000 +0200 +++ b/DeviceWorkstation.st Mon Jul 24 15:51:35 2000 +0200 @@ -5191,6 +5191,12 @@ |prevKnownViews prevMapping prevWidth prevHeight| + blackColor notNil ifTrue:[ + blackColor releaseFromDevice. + ]. + whiteColor notNil ifTrue:[ + whiteColor releaseFromDevice. + ]. self releaseDeviceFonts. self releaseDeviceCursors. self releaseDeviceColors. @@ -5216,9 +5222,9 @@ self initializeFor:nil. displayId isNil ifTrue:[ - 'DevWorkstation [error]: could not connect to display' errorPrintCR. - Smalltalk exit. - ^ self + 'DevWorkstation [error]: could not connect to display' errorPrintCR. + Smalltalk exit. + ^ self ]. " @@ -5230,51 +5236,51 @@ "/ prevMapping notNil ifTrue:[ prevKnownViews notNil ifTrue:[ - " - first round: flush all device specific stuff - " + " + first round: flush all device specific stuff + " "/ prevMapping keysAndValuesDo:[:anId :aView | - prevKnownViews do:[:aView | - (aView notNil and:[aView ~~ 0]) ifTrue:[ - aView prepareForReinit - ] - ]. - - " - 2nd round: all views should reinstall themself - on the new display - " + prevKnownViews do:[:aView | + (aView notNil and:[aView ~~ 0]) ifTrue:[ + aView prepareForReinit + ] + ]. + + " + 2nd round: all views should reinstall themself + on the new display + " "/ prevMapping keysAndValuesDo:[:anId :aView | - prevKnownViews do:[:aView | - (aView notNil and:[aView ~~ 0]) ifTrue:[ - "have to re-create the view" - UserInterruptSignal catch:[ - AbortSignal catch:[ - GraphicsContext drawingOnClosedDrawableSignal handle:[:ex | - 'DeviceWorkstation [warning]: drawing attempt on closed drawable during reinit' errorPrintCR. - ex return - ] do:[ - aView reinitialize - ] - ] - ] - ] - ]. - - (prevWidth ~~ width - or:[prevHeight ~~ height]) ifTrue:[ - " - 3rd round: all views get a chance to handle - changed environment (colors, font sizes etc) - " + prevKnownViews do:[:aView | + (aView notNil and:[aView ~~ 0]) ifTrue:[ + "have to re-create the view" + UserInterruptSignal catch:[ + AbortSignal catch:[ + GraphicsContext drawingOnClosedDrawableSignal handle:[:ex | + 'DeviceWorkstation [warning]: drawing attempt on closed drawable during reinit' errorPrintCR. + ex return + ] do:[ + aView reinitialize + ] + ] + ] + ] + ]. + + (prevWidth ~~ width + or:[prevHeight ~~ height]) ifTrue:[ + " + 3rd round: all views get a chance to handle + changed environment (colors, font sizes etc) + " "/ prevMapping keysAndValuesDo:[:anId :aView | - prevKnownViews do:[:aView | - (aView notNil and:[aView ~~ 0]) ifTrue:[ - aView reAdjustGeometry - ] - ]. - ] + prevKnownViews do:[:aView | + (aView notNil and:[aView ~~ 0]) ifTrue:[ + aView reAdjustGeometry + ] + ]. + ] ]. dispatching := false. @@ -7080,6 +7086,6 @@ !DeviceWorkstation class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.373 2000-07-19 11:31:16 ca Exp $' + ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.374 2000-07-24 13:51:35 cg Exp $' ! ! DeviceWorkstation initialize!