[squeak-dev] The Trunk: ST80-ul.75.mcz

commits at source.squeak.org commits at source.squeak.org
Sat Dec 12 14:27:30 UTC 2009


Levente Uzonyi uploaded a new version of ST80 to project The Trunk:
http://source.squeak.org/trunk/ST80-ul.75.mcz

==================== Summary ====================

Name: ST80-ul.75
Author: ul
Time: 12 December 2009, 2:47:47 am
UUID: f51201d3-1107-2047-8712-784355516c28
Ancestors: ST80-dtl.74

- replace sends of #ifNotNilDo: to #ifNotNil:, #ifNil:ifNotNilDo: to #ifNil:ifNotNil:, #ifNotNilDo:ifNil: to #ifNotNil:ifNil:

=============== Diff against ST80-dtl.74 ===============

Item was changed:
  ----- Method: MVCProject>>viewLocFor: (in category 'display') -----
  viewLocFor: exitedProject 
  	"Look for a view of the exitedProject, and return its center"
  
  	(world controllerWhoseModelSatisfies: [:p | p == exitedProject])
+ 		ifNotNil: [:ctlr | ^ctlr view windowBox center].
- 		ifNotNilDo: [:ctlr | ^ctlr view windowBox center].
  	^Sensor cursorPoint	"default result"!

Item was changed:
  ----- Method: MVCProject>>addDeferredUIMessage: (in category 'scheduling') -----
  addDeferredUIMessage: valuableObject 
  	"Arrange for valuableObject to be evaluated at a time when the user interface
  	is in a coherent state."
  
  	ScheduledControllers activeController
+ 		ifNotNil: [:controller | controller addDeferredUIMessage: valuableObject]!
- 		ifNotNilDo: [:controller | controller addDeferredUIMessage: valuableObject]!

Item was changed:
  ----- Method: PopUpMenu>>startUpWithCaption:icon:at:allowKeyboard: (in category 'basic control sequence') -----
  startUpWithCaption: captionOrNil icon: aForm at: location allowKeyboard: aBoolean
  	"Display the menu, with caption if supplied. Wait for the mouse button to go down, then track the selection as long as the button is pressed. When the button is released,
  	Answer the index of the current selection, or zero if the mouse is not released over  any menu item. Location specifies the desired topLeft of the menu body rectangle. The final argument indicates whether the menu should seize the keyboard focus in order to allow the user to navigate it via the keyboard."
  
  	| maxHeight |
+ 	(ProvideAnswerNotification signal: captionOrNil) ifNotNil:
- 	(ProvideAnswerNotification signal: captionOrNil) ifNotNilDo:
  		[:answer | ^ selection := answer ifTrue: [1] ifFalse: [2]].
  		 
  	maxHeight := Display height*3//4.
  	self frameHeight > maxHeight ifTrue:
  		[^ self
  			startUpSegmented: maxHeight
  			withCaption: captionOrNil
  			at: location
  			allowKeyboard: aBoolean].
  
  	Smalltalk isMorphic
  		ifTrue:[
  			selection := Cursor normal showWhile:
  				[| menuMorph | 
  				menuMorph := MVCMenuMorph from: self title: nil.
  				(captionOrNil notNil or:[aForm notNil])
  					ifTrue:[menuMorph addTitle: captionOrNil icon: aForm].
  				MenuIcons decorateMenu: menuMorph.
  				menuMorph
  					invokeAt: location 
  					in: ActiveWorld
  					allowKeyboard: aBoolean].
  			^ selection].
  
  	frame ifNil: [self computeForm].
  	Cursor normal showWhile:
  		[self
  			displayAt: location
  			withCaption: captionOrNil
  			during: [self controlActivity]].
  	^ selection!




More information about the Squeak-dev mailing list