glimmer-dsl-swt 4.20.0.4 → 4.20.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c2288c83bde07fd0e5db24556bd986b52c868db3db8dffd1f4cb4a82bd8085
-  data.tar.gz: 33f8584fd2ce2efac14d188a5d4753f6a807851529d663b1dbab1b57a4838db8
+  metadata.gz: 581c69384ecd98621e42b9c109b26606bd02f971645d560b6a327a2afef193cd
+  data.tar.gz: ff868723057cdcc85357713f63f1bcc449505bb79e28714e1ce95eada387c0e5
 SHA512:
-  metadata.gz: cbb93aa7d256686e409becd45a4e4a8bc4ca2597923a8b66118f3711aa8922a1b5d2b6ad62d615b6affdcf430533b1539118313c5eea95c81f94766c21a90486
-  data.tar.gz: 1c79ebfc57bf52c2d586ce65badaf0643ce37c534261943597d308bbd702e1fa01840f9d75164c80e9597c8e73f26d438ec95528321a8ba8f16b0d2048412814
+  metadata.gz: fa48a538274e9a199d9f332d1fec5e3c99d235509673fcf2de5b3c646aa38306a093368adefe5161b81dcc8530b411b5bb1b304700cca4762d655185e5550916
+  data.tar.gz: 1d04d38dcda31ef8c02c015cd558e62dc29ff54ad2e295d548f91633b8b6b6ec5e98dc9ef514c2250e4d90cce1a1764feb3be626af8a843bfb95a07722f2dbc6

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Change Log
 
+### 4.20.3.0
+
+- Shine data-binding support for `custom widgets`, `custom shells`, and `custom shapes`
+- Update remaining samples with `bind` keyword to switch to Shine data-binding syntax
+- Switch scaffolded classes' data-binding to Shine
+- Fix `table` Shine syntax support for unidirectional (one-way) data-binding
+
+### 4.20.2.1
+
+- Shine data-binding support for `animation` (also supporting `#content {}` method in `Animation`)
+- Update Hello, Custom Shell! to use Shine data-binding syntax
+- Fix `table` automatic sorting support when using one-way Shine data-binding syntax (which was disabling reads)
+
+### 4.20.2.0
+
+- Shine data-binding syntax support for `tree` widget
+- Use Shine syntax in Hello, Tree! sample
+
+### 4.20.1.0
+
+- Shine data-binding syntax support for `table` widget
+- Use Shine syntax in Hello, Table! and Contact Manager samples
+
+### 4.20.0.5
+
+- Hello, Text! sample
+- Timer elaborate sample (copied and simplified from external sample)
+- Calculator elaborate sample (copied and simplified from external sample)
+- Fixed issue relating to cleaning up display listeners
+
 ### 4.20.0.4
 
 - Weather elaborate sample

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.0.4
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.3.0
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -15,9 +15,9 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.0.4 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.3.0 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
 
-**Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword (keep in mind that it is still an early alpha, so default back to `bind` whenever needed).
+**Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword (keep in mind that it is still an alpha, so default back to `bind` whenever needed).
 
 Please help make [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) better by providing feedback and [contributing](#contributing) whenever possible. Any feature suggestions that are accepted could be implemented within weeks if not days.
 
@@ -286,10 +286,16 @@ Thanks to Java and JRuby, Glimmer apps can be packaged as cross-platform JAR fil
 
 The Java Virtual Machine already supports OS-native threads, so Glimmer apps can have multiple things running in parallel with no problem.
 
-SWT supports Canvas graphics drawing, and Glimmer takes that further by provding a Canvas Shape/Transform/Animation DSL, making it very simple to decorate any existing widgets or add new widgets with a completely custom look and feel if needed for branding or entertainment (gaming) purposes.
+SWT supports Canvas graphics drawing, and Glimmer takes that further by provding a Canvas Shape/Transform/Animation DSL, making it very simple to decorate any existing widgets or add new widgets with a completely custom look and feel if needed for branding purposes.
 
 Audio is supported via the Java Sound library in a cross-platform approach and video is supported via a Glimmer custom widget, so any Glimmer app can be enhanced with audio and video where needed.
 
+### Remaining Challenges
+
+Startup time is long. Thankfully, [there are work-arounds](https://andymaleh.blogspot.com/2021/03/glimmer-dsl-for-swt-41900-halved.html) that could make apps start as fast as instantly.
+
+Contributors who appreciate Glimmer's ultra-high productivity, maintainability, and extensibility might want to help report and resolve remaining challenges in its software architecture.
+
 ## Platform Support
 
 Glimmer runs on the following platforms:
@@ -341,7 +347,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.0.4
+jgem install glimmer-dsl-swt -v 4.20.3.0
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -369,7 +375,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.20.0.4'
+gem 'glimmer-dsl-swt', '~> 4.20.3.0'
 ```
 
 And, then run:
@@ -390,7 +396,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.0.4
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.3.0
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.20.0.4
+4.20.3.0

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -2278,13 +2278,16 @@ Example from [samples/hello/hello_combo.rb](samples/hello_combo.rb) sample (you
 
 #### Shine
 
-**(EARLY ALPHA FEATURE)**
+**(ALPHA FEATURE)**
 
 The new Shine syntax for View/Model Attribute Mapping allows data-binding visually with simple arrow operators in Ruby.
 
 Use `<=> [model, attribute, options]` for bidirectional (two-way) data-binding instead of `bind(model, attribute, options)`.
 Use `<= [model, attribute, options]` for unidirectional (one-way) data-binding instead of `bind(model, attribute, read_only: true, more_options)`
 
+One thing special with the `table` widget is that `<=`, which makes data-binding unidirectional, stops the `table` from supporting automatic sorting by default since that involves modifying the model collection ordering (albeit not the content).
+To enable automatic sorting in a `table`, but still not permit edit actions to the data itself, you simply use `<=>` for bidirectional data-binding, but without passing the `:editable` style to the `table`.
+
 Examples:
 
 ```ruby
@@ -2299,7 +2302,7 @@ text <=> [@contact, :last_name]
 text <= [@contact, :name, computed_by: [:first_name, :last_name]]
 ```
 
-Note that `table`, `tree`, custom widgets, custom shapes, and animations are not supported by Shine syntax for data-binding yet, so continue to use `bind` with them for the time being.
+Note that custom widgets and custom shapes are not supported by Shine syntax for data-binding yet, so continue to use `bind` with them for the time being.
 
 Check out [sample code](/samples) for more examples of Shine syntax in action, such as [Hello, Computed!](/docs/reference/GLIMMER_SAMPLES.md#hello-computed).
 

data/docs/reference/GLIMMER_SAMPLES.md

@@ -2,6 +2,7 @@
   - [Hello Samples](#hello-samples)
     - [Hello, World!](#hello-world)
     - [Hello, Button!](#hello-button)
+    - [Hello, Text!](#hello-text)
     - [Hello, Composite!](#hello-composite)
     - [Hello, Layout!](#hello-layout)
     - [Hello, Shell!](#hello-shell)
@@ -116,6 +117,18 @@ Hello, Button! Incremented 7 times!
 
 ![Hello Button Incremented](/images/glimmer-hello-button-incremented.png)
 
+#### Hello, Text!
+
+This sample demonstrates the use of the `text` widget in Glimmer, including data-binding (e.g. via the `<=>` operator) and event handling.
+
+Code:
+
+[samples/hello/hello_text.rb](/samples/hello/hello_text.rb)
+
+Hello, Text!
+
+![Hello Text](/images/glimmer-hello-text.png)
+
 #### Hello, Composite!
 
 This sample demonstrates the `composite` widget, which is simply used as a container for visual layout and organization.

data/docs/reference/GLIMMER_STYLE_GUIDE.md

@@ -7,8 +7,9 @@
 - Widget properties are declared with underscored lowercase versions of the SWT properties
 - Widget property declarations always have arguments and never take a block
 - Widget property arguments are never wrapped inside parentheses
-- Widget listeners are always declared starting with `on_` prefix and affixing listener event method name afterwards in underscored lowercase form
+- Widget listeners are always declared starting with `on_` prefix and affixing listener event method name afterwards in underscored lowercase form. Their multi-line blocks rely on the `do; end` style.
 - Widget listeners are always followed by a block using curly braces (Only when declared in DSL. When invoked on widget object directly outside of GUI declarations, standard Ruby conventions apply)
 - Data-binding is done via `bind` keyword, which always takes arguments wrapped in parentheses
-- Custom widget body, before_body, and after_body blocks open their blocks and close them with curly braces.
-- Custom widgets receive additional arguments to SWT style called options. These are passed as the last argument inside the parentheses, a hash of option names pointing to values.
+- Custom widget `body`, `before_body`, and `after_body` blocks open their blocks and close them with curly braces.
+- Custom widgets receive additional keyword arguments called options, which come after the SWT styles.
+- Pure logic multi-line blocks that do not constitute GUI DSL view elements (such as `Thread.new`, `loop`, `each` and `observe` blocks) rely on the `do; end` style to clearly separate logic code from view code.

data/lib/glimmer/data_binding/shine.rb

@@ -33,8 +33,9 @@ module Glimmer
     
       def <=>(other)
         if other.is_a?(Array)
+          args_clone = other.clone
           @parent.content {
-            send(@parent_attribute, bind(*other))
+            send(@parent_attribute, bind(*args_clone))
           }
         else  # || other.is_a?(Hash) # TODO support hash e.g. {model: model_obj, attribute: :some_attribute, more-options...}
           original_compare(other)

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -34,11 +34,11 @@ module Glimmer
       include_package 'org.eclipse.swt'
       include_package 'org.eclipse.swt.widgets'
 
-      def initialize(parent, model_binding, column_properties)
+      def initialize(parent, model_binding, column_properties = nil)
         @table = parent
         @model_binding = model_binding
         @read_only_sort = @model_binding.binding_options[:read_only_sort]
-        @column_properties = column_properties
+        @column_properties = @model_binding.binding_options[:column_properties] || @model_binding.binding_options[:column_attributes] || column_properties
         if @table.respond_to?(:column_properties=)
           @table.column_properties = @column_properties
         else # assume custom widget

data/lib/glimmer/data_binding/tree_items_binding.rb

@@ -34,10 +34,10 @@ module Glimmer
       include_package 'org.eclipse.swt'
       include_package 'org.eclipse.swt.widgets'
       
-      def initialize(parent, model_binding, tree_properties)
+      def initialize(parent, model_binding, tree_properties = nil)
         @tree = parent
         @model_binding = model_binding
-        @tree_properties = [tree_properties].flatten.first.to_h
+        @tree_properties = @model_binding.binding_options[:tree_properties] || @model_binding.binding_options[:tree_attributes] || [tree_properties].compact.flatten.first.to_h
         if @tree.respond_to?(:tree_properties=)
           @tree.tree_properties = @tree_properties
         else # assume custom widget

data/lib/glimmer/dsl/swt/custom_widget_expression.rb

@@ -54,7 +54,7 @@ module Glimmer
         def add_content(parent, keyword, *args, &block)
           # TODO consider avoiding source_location
           return if block&.parameters&.count == 2
-          if block.source_location == parent.content&.__getobj__.source_location
+          if block.source_location == parent.content&.__getobj__&.source_location
             parent.content.call(parent) unless parent.content.called?
           else
             super

data/lib/glimmer/dsl/swt/radio_group_selection_data_binding_expression.rb

@@ -52,7 +52,7 @@ module Glimmer
           widget_binding.call(model_binding.evaluate_property)
           widget_binding.observe(model_binding)
   
-          raise(Glimmer::Error, "No radios found! Make sure radio selection is data-bound to a property having property_options as non-empty array!") if parent.items.empty?
+          raise(Glimmer::Error, "No radios found! Make sure radio selection is data-bound to a property having property_options as non-empty array!") if parent.get_items.empty?
           Glimmer::SWT::DisplayProxy.instance.auto_exec(override_sync_exec: model_binding.binding_options[:sync_exec], override_async_exec: model_binding.binding_options[:async_exec]) do
             parent.on_widget_selected do
               model_binding.call(widget_binding.evaluate_property)

data/lib/glimmer/dsl/swt/shine_data_binding_expression.rb

@@ -29,14 +29,15 @@ module Glimmer
   module DSL
     module SWT
       class ShineDataBindingExpression < Expression
+        include_package 'org.eclipse.swt.widgets'
+        
         def can_interpret?(parent, keyword, *args, &block)
           args.size == 0 and
             block.nil? and
-            parent.respond_to?(:set_attribute) and
-            parent.respond_to?(:has_attribute?) and
-            parent.has_attribute?(keyword, *args) and
-            !parent.is_a?(Glimmer::UI::CustomWidget) and
-            !parent.is_a?(Glimmer::UI::CustomShape) and
+            (
+              (parent.respond_to?(:has_attribute?) and parent.has_attribute?(keyword)) or
+              (parent.respond_to?(:swt_widget) and (parent.swt_widget.is_a?(Table) or parent.swt_widget.is_a?(Tree)))
+            ) and
             !(parent.respond_to?(:swt_widget) && parent.swt_widget.class == org.eclipse.swt.widgets.Canvas && keyword == 'image')
         end
   

data/lib/glimmer/dsl/swt/table_items_data_binding_expression.rb

@@ -35,10 +35,10 @@ module Glimmer
             block.nil? and
             parent.respond_to?(:swt_widget) and
             parent.swt_widget.is_a?(Table) and
-            args.size == 2 and
+            args.size.between?(1, 2) and
             args[0].is_a?(DataBinding::ModelBinding) and
             args[0].evaluate_property.is_a?(Array) and
-            args[1].is_a?(Array)
+            (args[1].nil? or args[1].is_a?(Array))
         end
   
         def interpret(parent, keyword, *args, &block)

data/lib/glimmer/dsl/swt/tree_items_data_binding_expression.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2021 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -30,15 +30,20 @@ module Glimmer
         include_package 'org.eclipse.swt.widgets'
   
         def can_interpret?(parent, keyword, *args, &block)
-          initial_condition = ((keyword == "items") and block.nil? and parent.respond_to?(:swt_widget) and parent.swt_widget.is_a?(Tree))
-          return false unless initial_condition
-          raise Glimmer::Error, 'Tree items args must be 2' unless args.size == 2
-          raise Glimmer::Error, 'Tree items first arg must be a bind expression' unless args[0].is_a?(DataBinding::ModelBinding)
-          raise Glimmer::Error, 'Tree items data-binding initial value must not be an array yet a single item representing tree root' unless !args[0].evaluate_property.is_a?(Array)
-          raise Glimmer::Error, 'Tree items second arg must be an array' unless args[1].is_a?(Array)
-          raise Glimmer::Error, 'Tree items second arg must not be empty' unless !args[1].empty?
-          raise Glimmer::Error, 'Tree items second arg array elements must be of type hash' unless args[1].first.is_a?(Hash)
-          true
+          keyword == 'items' and
+            block.nil? and
+            parent.respond_to?(:swt_widget) and
+            parent.swt_widget.is_a?(Tree) and
+            args.size.between?(1, 2)
+          # TODO delete these checks if they are too granular
+#           return false unless initial_condition
+#           raise Glimmer::Error, 'Tree items args must be 1 or 2' unless args.size.between?(1, 2)
+#           raise Glimmer::Error, 'Tree items first arg must be a bind expression' unless args[0].is_a?(DataBinding::ModelBinding)
+#           raise Glimmer::Error, 'Tree items data-binding initial value must not be an array yet a single item representing tree root' unless !args[0].evaluate_property.is_a?(Array)
+#           raise Glimmer::Error, 'Tree items second arg must be an array' unless args[1].is_a?(Array)
+#           raise Glimmer::Error, 'Tree items second arg must not be empty' unless !args[1].empty?
+#           raise Glimmer::Error, 'Tree items second arg array elements must be of type hash' unless args[1].first.is_a?(Hash)
+#           true
         end
   
         def interpret(parent, keyword, *args, &block)

data/lib/glimmer/dsl/swt/widget_listener_expression.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2021 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/lib/glimmer/rake_task/scaffold.rb

@@ -642,7 +642,7 @@ module Glimmer
             custom_shell_file_content += <<-MULTI_LINE_STRING
           grid_layout
           label(:center) {
-            text bind(self, :greeting)
+            text <= [self, :greeting]
             font height: 40
             layout_data :fill, :center, true, true
           }
@@ -712,7 +712,7 @@ module Glimmer
             ].each do |greeting_text|
               button(:radio) {
                 text greeting_text
-                selection bind(self, :greeting) { |g| g == greeting_text }
+                selection <= [self, :greeting, on_read: ->(g) { g == greeting_text }]
                 layout_data {
                   width 160
                 }

data/lib/glimmer/swt/custom/animation.rb

@@ -99,6 +99,12 @@ module Glimmer
           end
         end
         
+        def content(&block)
+          Glimmer::SWT::DisplayProxy.instance.auto_exec do
+            Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::AnimationExpression.new, 'animation', &block)
+          end
+        end
+                
         # Starts an animation that is indefinite or has never been started before (i.e. having `started: false` option).
         # Otherwise, resumes a stopped animation that has not been completed.
         def start

data/lib/glimmer/swt/custom/checkbox_group.rb

@@ -29,7 +29,7 @@ module Glimmer
         include Glimmer::UI::CustomWidget
         
         body {
-          composite # just an empty composite to hold checkboxs upon data-binding `selection`
+          composite {} # just an empty composite to hold checkboxs upon data-binding `selection`
         }
         
         def items=(text_array)

data/lib/glimmer/swt/custom/radio_group.rb

@@ -29,7 +29,7 @@ module Glimmer
         include Glimmer::UI::CustomWidget
         
         body {
-          composite # just an empty composite to hold radios upon data-binding `selection`
+          composite {} # just an empty composite to hold radios upon data-binding `selection`
         }
         
         def items=(text_array)
@@ -41,6 +41,7 @@ module Glimmer
         def items
           @items || []
         end
+        alias get_items items
         
         def selection=(text)
           radios.count.times do |index|

data/lib/glimmer/swt/display_proxy.rb

@@ -42,7 +42,7 @@ module Glimmer
       
       OBSERVED_MENU_ITEMS = ['about', 'preferences', 'quit']
       
-      class FilterListener
+      class ConcreteListener
         include org.eclipse.swt.widgets.Listener
         
         def initialize(&listener_block)
@@ -194,15 +194,17 @@ module Glimmer
         observation_request = observation_request.to_s
         if observation_request.start_with?('on_swt_')
           constant_name = observation_request.sub(/^on_swt_/, '')
-          add_swt_event_filter(constant_name, &block)
+          swt_event_reg = add_swt_event_filter(constant_name, &block)
+          Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(swt_event_reg)
+          swt_event_reg
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')
           if OBSERVED_MENU_ITEMS.include?(event_name) && OS.mac?
             system_menu = swt_display.getSystemMenu
             menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
-            display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], &block)
-            # TODO enable this code and test on the Mac to ensure automatic cleanup of mac event registrations in custom widgets
-#             Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
+            listener = ConcreteListener.new(&block)
+            display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], listener)
+            Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
             display_mac_event_registration
           end
         end
@@ -210,15 +212,16 @@ module Glimmer
 
       def add_swt_event_filter(swt_constant, &block)
         event_type = SWTProxy[swt_constant]
-        @swt_display.addFilter(event_type, FilterListener.new(&block))
+        swt_listener = ConcreteListener.new(&block)
+        @swt_display.addFilter(event_type, swt_listener)
         #WidgetListenerProxy.new(@swt_display.getListeners(event_type).last)
         WidgetListenerProxy.new(
           swt_display: @swt_display,
           event_type: event_type,
           filter: true,
-          swt_listener: block,
+          swt_listener: swt_listener,
           widget_add_listener_method: 'addFilter',
-          swt_listener_class:  FilterListener,
+          swt_listener_class:  ConcreteListener,
           swt_listener_method: 'handleEvent'
         )
       end