#whenClickedDo: is usable for all button and button menu item kinds

src/Toplo-Examples/ToMiniBrowser.class.st

@@ -25,7 +25,7 @@ ToMiniBrowser >> candidateProtocolsForClass: aClass [
 	| prots |
 	prots := classSide
 		         ifTrue: [
-			         aClass organization allProtocols select: [ :p |
+			         aClass allProtocols select: [ :p |
 				         aClass isLocalMethodsProtocol: p ] ]
 		         ifFalse: [ aClass allProtocols ].
 	^ prots sort: [ :a :b | a name < b name ]
@@ -126,12 +126,10 @@ ToMiniBrowser >> newClassPane [
 	classesPane addChild: classesButtonPane.
 
 	sideToggle checked: self classSide.
-	sideToggle addEventHandler: (BlEventHandler
-			 on: ToCheckableCheckEvent
-			 do: [ :event |
+	sideToggle whenClickedDo: [ :event |
 				 classSide := event current.
 				 self refreshClassSelectionWithSelectedIndexes:
-					 classes selectionModel selectedIndexes ]).
+					 classes selectionModel selectedIndexes ].
 	^ classesPane
 ]
 

src/Toplo-Examples/ToSandBox.class.st

@@ -22,18 +22,15 @@ ToSandBox class >> barConfigurationBoardFor: aBar [
 	menu addItem: (ToCheckMenuItem new
 			 label: (ToLabel text: 'Disable bar');
 			 whenClickedDo: [ :event |
-				event currentTarget isChecked traceCr.
-				 aBar enabled: event currentTarget isChecked ];
+				 aBar disabled: event currentTarget isChecked ];
 			 yourself).
 	confPane addChild: menu.
 
 	verticalSwitch := ToSwitchButton new labelText: 'Vertical'.
 	verticalSwitch startFlexible: true.
 	verticalSwitch hMatchParent.
 
-	verticalSwitch addEventHandler: (BlEventHandler
-			 on: ToCheckableCheckEvent
-			 do: [ :event | aBar vertical: event current ]).
+	verticalSwitch whenClickedDo: [ :event | aBar vertical: event current ].
 
 	confPane addChild: verticalSwitch.
 
@@ -55,59 +52,49 @@ ToSandBox class >> barConfigurationBoardFor: aBar [
 
 	confPane addChild: scrollingSwitch.
 
-	wrappingSwitch addEventHandler: (BlEventHandler
-			 on: ToCheckableCheckEvent
-			 do: [ :event |
+	wrappingSwitch whenClickedDo: [ :event |
 				 | v |
 				 v := event current.
 				 aBar nodeWrapping: v.
 				 sameWidthSwitch enabled: v.
-				 scrollingSwitch disabled: v ]).
+				 scrollingSwitch disabled: v ].
 
-	sameWidthSwitch addEventHandler: (BlEventHandler
-			 on: ToCheckableCheckEvent
-			 do: [ :event |
+	sameWidthSwitch whenClickedDo: [ :event |
 				 | v |
 				 v := event current.
-				 aBar flowLineUniformWidth: v ]).
+				 aBar flowLineUniformWidth: v ].
 
-	scrollingSwitch addEventHandler: (BlEventHandler
-			 on: ToCheckableCheckEvent
-			 do: [ :event |
+	scrollingSwitch whenClickedDo: [ :event |
 				 | v |
 				 v := event current.
-				 aBar nodeScrolling: v ]).
+				 aBar nodeScrolling: v ].
 
 	autoDistributionSwitch := ToSwitchButton new labelText:
 		                          'Auto-distribution'.
 	autoDistributionSwitch startFlexible: true.
 	autoDistributionSwitch hMatchParent.
 
 	confPane addChild: autoDistributionSwitch.
-	autoDistributionSwitch addEventHandler: (BlEventHandler
-			 on: ToCheckableCheckEvent
-			 do: [ :event |
+	autoDistributionSwitch whenClickedDo: [ :event |
 				 | v |
 				 v := event current.
-				 aBar nodeAutoDistribution: v ]).
+				 aBar nodeAutoDistribution: v ].
 
 	selectionAnimationSwitch := ToSwitchButton new labelText:
 		                            'Animate selection transition'.
 	selectionAnimationSwitch startFlexible: true.
 	selectionAnimationSwitch hMatchParent.
 
 	confPane addChild: selectionAnimationSwitch.
-	selectionAnimationSwitch addEventHandler: (BlEventHandler
-			 on: ToCheckableCheckEvent
-			 do: [ :event |
+	selectionAnimationSwitch whenClickedDo: [ :event |
 				 | v |
 				 v := event current.
 				 aBar primarySelectionMode option animationDuration: (v
 						  ifTrue: [ 200 milliSeconds ]
 						  ifFalse: [ 0 milliSeconds ]).
 				 aBar secondarySelectionMode option animationDuration: (v
 						  ifTrue: [ 150 milliSeconds ]
-						  ifFalse: [ 0 milliSeconds ]) ]).
+						  ifFalse: [ 0 milliSeconds ]) ].
 
 	wrappingSwitch checked: true.
 
@@ -118,10 +105,8 @@ ToSandBox class >> barConfigurationBoardFor: aBar [
 	selectOnMouseDownSwitch hMatchParent.
 
 	confPane addChild: selectOnMouseDownSwitch.
-	selectOnMouseDownSwitch addEventHandler: (BlEventHandler
-			 on: ToCheckableCheckEvent
-			 do: [ :event |
-			 aBar primarySelectionMode selectOnMouseDown: event current ]).
+	selectOnMouseDownSwitch whenClickedDo: [ :event |
+			 aBar primarySelectionMode selectOnMouseDown: event current ].
 
 	wrappingSwitch checked: true.
 
@@ -475,8 +460,7 @@ ToSandBox class >> example_CheckboxChecked [
 			 on: ToSkinEvent
 			 do: [ :evt | evt target = chb ifTrue: [ evt traceCr ] ])."
 	chb whenClickedDo: [ :event |
-		event currentTarget isChecked traceCr.
-		event traceCr ].
+		event currentTarget isChecked traceCr ].
 	chb checked: true.
 	chb isChecked traceCr.
 	chb openInInnerWindow
@@ -2697,7 +2681,7 @@ ToSandBox class >> example_bar [
 	bar := ToBarElement new.
 	bar addStamp: #background withValue: Color veryLightGray.
 	bar nodeFactory: [ :holder | ToBarNodeExamplePart new ].
-	bar nodeBuilder: [ :node :dataItem :holder|
+	bar nodeBuilder: [ :node :dataItem :holder |
 		node label:
 			(ToLabel text: holder position asString , ': ' , dataItem asString) ].
 
@@ -2719,11 +2703,11 @@ ToSandBox class >> example_bar [
 	confBoard := self barConfigurationBoardFor: bar.
 	selectionModeBoard := self selectionModeChooserFor: bar.
 	confBoard addChild: selectionModeBoard.
-	
+
 	rootPane := ToPane horizontal.
 	rootPane padding: (BlInsets all: 5).
 	rootPane matchParent.
-	
+
 	rootPane addChild: confBoard.
 	rootPane addChild: bar.
 	rootPane addDividers.
@@ -2764,18 +2748,13 @@ ToSandBox class >> example_buttonWithActionControl [
 	but label: (ToLabel text: 'Button with label').
 	count := 0.
 	but whenClickedDo: [ :event | self inform: 'Action runned' ].
-	but addEventHandlerOn: ToClickableActionRequestEvent do: [ :event |
-		count := count + 1.
-		event authorized: count odd.
-		event denied ifTrue: [ self inform: 'Action denied' ] ].
 	but openInSpace.
 	^ but
 ]
 
 { #category : #button }
 ToSandBox class >> example_buttonWithDisableEnable [
 
-
 	| space button pane disacbox |
 	space := BlSpace new.
 	space root layout: BlLinearLayout vertical.
@@ -2784,16 +2763,12 @@ ToSandBox class >> example_buttonWithDisableEnable [
 	pane layout cellSpacing: 5.
 	pane padding: (BlInsets all: 5).
 
-	disacbox := ToCheckbox new label:
-		           (ToLabel text: 'Disable').
+	disacbox := ToCheckbox new label: (ToLabel text: 'Disable').
 	button := (ToButton id: #buttonA)
-		                  labelText: 'Button';
-		                  yourself.
+		          labelText: 'Button';
+		          yourself.
 
-	disacbox addEventHandler: (BlEventHandler
-			 on: ToCheckableCheckEvent
-			 do: [ :evt |
-				 button disabled: evt current ]).
+	disacbox whenClickedDo: [ :evt | button disabled: evt current ].
 
 	pane addChild: disacbox.
 	pane addChild: button.
@@ -2938,10 +2913,7 @@ ToSandBox class >> example_closeableTabs [
 	(Color wheel: 5) withIndexDo: [ :eachColor :index |
 		but := ToTab new.
 		but closable: true.
-		but addEventHandler: (BlEventHandler
-				 on: ToCheckableCheckEvent
-				 do: [ :event | event current traceCr ]).
-
+		but whenClickedDo: [ :event | event current traceCr ].
 		but labelText: 'Button ' , index asString.
 		but paneBuilder: [ :pane :theNoteBook | pane background: eachColor ].
 		nb addTab: but ].
@@ -3811,9 +3783,7 @@ ToSandBox class >> example_switchButton2 [
 		((ToImage inner: (self iconNamed: #glamorousClose))
 			 innerImageColor: Color white).
 
-	th addEventHandler: (BlEventHandler
-			 on: ToCheckableCheckEvent
-			 do: [ :event | event current traceCr ]).
+	th whenClickedDo: [ :event | event current traceCr ].
 	sp := th openInSpace
 ]
 

src/Toplo-Theme-Examples/ToThemeExamples.class.st

@@ -401,23 +401,19 @@ ToThemeExamples class >> example_beeButtonsInRawPane [
 		primaryButton2
 			addTokenNamed: #'color-primary-hover'
 			withValue: c twiceLighter ].
-	chb addEventHandler: (BlEventHandler
-			 on: ToCheckableCheckEvent
-			 do: [ :evt |
+	chb whenClickedDo: [ :evt |
 				 evt current
 					 ifTrue: [ primaryButton2 addStamp: #primary ]
-					 ifFalse: [ primaryButton2 removeStamp: #primary ] ]).
+					 ifFalse: [ primaryButton2 removeStamp: #primary ] ].
 	chb checked: true.
-	disachb addEventHandler: (BlEventHandler
-			 on: ToCheckableCheckEvent
-			 do: [ :evt |
+	disachb whenClickedDo: [ :evt |
 				 evt current
 					 ifTrue: [
 						 pane childrenDo: [ :child |
 							 child ~= disachb ifTrue: [ child disable ] ] ]
 					 ifFalse: [
 						 pane childrenDo: [ :child |
-							 child ~= disachb ifTrue: [ child enable ] ] ] ]).
+							 child ~= disachb ifTrue: [ child enable ] ] ] ].
 
 	pane addChild: primaryButton1.
 	pane addChild: chb.

src/Toplo-Widget-Button/ToClickableActionEventHandler.class.st

@@ -1,6 +1,6 @@
 Class {
 	#name : #ToClickableActionEventHandler,
-	#superclass : #BlCustomEventHandler,
+	#superclass : #BlBasicEventHandler,
 	#instVars : [
 		'action'
 	],
@@ -19,47 +19,18 @@ ToClickableActionEventHandler >> action: aBlock [
 	action := aBlock
 ]
 
-{ #category : #'as yet unclassified' }
-ToClickableActionEventHandler >> clickableRunActionEvent: anEvent [
-
-	anEvent currentTarget clickEvent: anEvent.
-	action cull: anEvent
-]
-
-{ #category : #'as yet unclassified' }
-ToClickableActionEventHandler >> eventsToHandle [
-
-	^ { ToClickableRunActionEvent }
-]
-
 { #category : #'api - event managing' }
 ToClickableActionEventHandler >> handleEvent: anEvent [
 
-	(anEvent isKindOf: anEvent currentTarget clickEventClass)
-		ifTrue: [
-			self receiveClickEvent: anEvent.
-			^ self ].
-	anEvent sendTo: self
-]
-
-{ #category : #'event handling' }
-ToClickableActionEventHandler >> receiveClickEvent: anEvent [
-
-	| req target |
+	| target |
 	target := anEvent currentTarget.
 	target isDisabled ifTrue: [ ^ self ].
-	req := ToClickableActionRequestEvent new
-		       requestedAction: [
-			       target fireEvent: (ToClickableRunActionEvent new
-						        sourceEvent: anEvent;
-						        yourself) ];
-		       yourself.
-	target fireAuthorisationRequest: req
+	action ifNil: [ ^ self ].
+	action cull: anEvent
 ]
 
 { #category : #'api - event managing' }
 ToClickableActionEventHandler >> wantsEvent: anEvent [
 
-	^ (anEvent isKindOf: anEvent currentTarget clickEventClass) or: [
-		  super wantsEvent: anEvent ]
+	^ (anEvent isKindOf: anEvent currentTarget clickEventClass) 
 ]

src/Toplo-Widget-Button/ToSwitchButton.class.st

@@ -37,7 +37,9 @@ ToSwitchButton >> initialize [
 	super initialize.
 	self icon: ToSwitchIcon new.
 	self initializeCheckable.
-	self checked: false
+	self checked: false.
+	self clickEventClass: ToCheckableCheckEvent.
+
 ]
 
 { #category : #skin }

src/Toplo-Widget-Button/ToSwitchIcon.class.st

@@ -40,7 +40,8 @@ ToSwitchIcon >> checked: aBoolean [
 
 	checked = aBoolean ifTrue: [ ^ self ].
 	checked := aBoolean.
-	self dispatchEvent: (ToCheckableCheckEvent current: checked previous: checked not)
+	self dispatchEvent:
+		(ToCheckableCheckEvent current: checked previous: checked not)
 ]
 
 { #category : #accessing }

src/Toplo-Widget-Button/ToToggleButton.class.st

@@ -14,7 +14,9 @@ ToToggleButton >> checkable: aBoolean [
 ToToggleButton >> initialize [ 
 
 	super initialize.
-	self initializeCheckable 
+	self initializeCheckable.
+	self clickEventClass: ToCheckableCheckEvent.
+
 ]
 
 { #category : #skin }

src/Toplo-Widget-Menu/ToCheckMenuItem.class.st

@@ -20,6 +20,12 @@ ToCheckMenuItem >> buttonClass [
 	^ ToCheckbox
 ]
 
+{ #category : #initialization }
+ToCheckMenuItem >> buttonClickEventClass [ 
+
+	^ ToCheckableCheckEvent 
+]
+
 { #category : #'t - checkable - accessing' }
 ToCheckMenuItem >> checkableData [