glimmer-dsl-opal 0.28.3 → 0.29.0

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -56,7 +56,7 @@ module Glimmer
         old_item_ids_per_model = old_items.reduce({}) {|hash, item| hash.merge(item.get_data.hash => item.id) }
         parent.remove_all
         model_collection.each do |model|
-          table_item = Glimmer::SWT::TableItemProxy.new(parent)
+          table_item = Glimmer::SWT::TableItemProxy.new(parent, [], nil)
           for index in 0..(column_properties.size-1)
             table_item.set_text(index, model.send(column_properties[index]).to_s)
           end

data/lib/glimmer/dsl/opal/async_exec_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/bind_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/block_property_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/checkbox_group_selection_data_binding_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/color_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -52,7 +52,7 @@ module Glimmer
           # TODO clean code by extracting methods into CustomShell
           if !Glimmer::UI::CustomShell.requested? && custom_widget_class&.ancestors&.to_a.include?(Glimmer::UI::CustomShell)
             if Glimmer::SWT::DisplayProxy.instance.shells.empty? || Glimmer::SWT::DisplayProxy.open_custom_shells_in_current_window?
-              custom_widget_class.new(parent, *args, {}, &block)
+              custom_widget_class.new(parent, args, {}, &block)
             else
               options = args.last.is_a?(Hash) ? args.pop : {}
               options = options.merge('swt_style' => args.join(',')) unless args.join(',').empty?
@@ -75,7 +75,7 @@ module Glimmer
               # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method
               Glimmer::SWT::MakeShiftShellProxy.new
             else
-              custom_widget_class&.new(parent, *args, {}, &block)
+              custom_widget_class&.new(parent, args, {}, &block)
             end
           end
         end

data/lib/glimmer/dsl/opal/data_binding_expression.rb

@@ -26,7 +26,7 @@ module Glimmer
           #TODO make this options observer dependent and all similar observers in element specific data binding handlers
           element_binding.observe(model_binding)
           # TODO simplify this logic and put it where it belongs
-          parent.add_observer(model_binding, keyword) if parent.respond_to?(:add_observer, [model_binding, keyword])
+          parent.add_observer(model_binding, keyword) if parent.respond_to?(:add_observer)
         end
       end
     end

data/lib/glimmer/dsl/opal/dialog_expression.rb

@@ -12,7 +12,7 @@ module Glimmer
 
         def interpret(parent, keyword, *args, &block)
           parent = args.delete_at(0)
-          Glimmer::SWT::DialogProxy.new(parent, args)
+          Glimmer::SWT::DialogProxy.new(parent, args, block)
         end
       end
     end

data/lib/glimmer/dsl/opal/display_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/exec_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/font_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/image_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -55,7 +55,7 @@ module Glimmer
 
         def add_content(parent, keyword, *args, &block)
           return if @create_pixel_by_pixel || block&.parameters&.count == 2
-          super
+          super(parent, keyword, *args, &block)
           parent.post_add_content
         end
       end

data/lib/glimmer/dsl/opal/menu_bar_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/menu_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -48,7 +48,7 @@ module Glimmer
         end
         
         def add_content(parent, keyword, *args, &block)
-          super(parent, &block)
+          super(parent, keyword, *args, &block)
           parent.post_add_content
         end
         

data/lib/glimmer/dsl/opal/message_box_expression.rb

@@ -12,7 +12,7 @@ module Glimmer
 
         def interpret(parent, keyword, *args, &block)
           parent = args.delete_at(0) if !textual?(args.first)
-          Glimmer::SWT::MessageBoxProxy.new(parent, args)
+          Glimmer::SWT::MessageBoxProxy.new(parent, args, block)
         end
       end
     end

data/lib/glimmer/dsl/opal/property_expression.rb

@@ -9,7 +9,7 @@ module Glimmer
           parent and
             (!args.empty?) and
             parent.respond_to?(:set_attribute) and
-            parent.respond_to?(keyword, *args) and
+            parent.respond_to?(keyword) and
             keyword and
             block.nil?
         end

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/rgb_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/rgba_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/shape_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -32,6 +32,7 @@ module Glimmer
         include ParentExpression
         
         def can_interpret?(parent, keyword, *args, &block)
+          # TODO consider parent as WidgetProxy too just like SWT
           (parent.is_a?(Glimmer::SWT::CanvasProxy) or parent.is_a?(Glimmer::SWT::Custom::Shape)) and
             Glimmer::SWT::Custom::Shape.valid?(parent, keyword, args, &block) and
             ((keyword != 'text' && keyword != 'image') || args.size >= 3 || (args.empty? && block_given?))

data/lib/glimmer/dsl/opal/shell_expression.rb

@@ -23,12 +23,12 @@ module Glimmer
             # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method
             Glimmer::SWT::MakeShiftShellProxy.new
           else
-            Glimmer::SWT::ShellProxy.new(*args)
+            Glimmer::SWT::ShellProxy.new(args)
           end
         end
         
         def add_content(parent, keyword, *args, &block)
-          super(parent, &block)
+          super(parent, keyword, *args, &block)
           parent.post_add_content
         end
       end

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/swt_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/sync_exec_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/dsl/opal/widget_expression.rb

@@ -22,7 +22,7 @@ module Glimmer
         
         def add_content(parent, keyword, *args, &block)
           if parent.rendered? || parent.skip_content_on_render_blocks?
-            super(parent, &block)
+            super(parent, keyword, *args, &block)
             parent.post_add_content
           else
             parent.add_content_on_render(&block)

data/lib/glimmer/engine.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/arrow_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,6 +25,12 @@ require 'glimmer/swt/button_proxy'
 module Glimmer
   module SWT
     class ArrowProxy < ButtonProxy
+      STYLE = <<~CSS
+        .arrow {
+          position: relative;
+        }
+      CSS
+      
       def initialize(parent, args, block)
         if args.to_a.include?(:left)
           @text = '<'

data/lib/glimmer/swt/button_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -79,12 +79,13 @@ module Glimmer
       def dom
         input_text = @text
         input_id = id
-        input_style = css
+        input_style = "min-width: 32px; min-height: 32px; #{css}"
         input_args = {}
         input_disabled = @enabled ? {} : {'disabled': 'disabled'}
         input_args = input_args.merge(type: 'password') if has_style?(:password)
         @dom ||= html {
-          button(input_args.merge(id: input_id, class: name, style: input_style, style: 'min-width: 32px; min-height: 32px;').merge(input_disabled)) {
+          # TODO `:style` key is duplicated twice
+          button(input_args.merge(id: input_id, class: name, style: input_style).merge(input_disabled)) {
             input_text.to_s == '' ? ' ' : input_text
           }
         }.to_s

data/lib/glimmer/swt/c_combo_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/c_tab_folder_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/c_tab_item_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/checkbox_proxy.rb

@@ -57,10 +57,11 @@ module Glimmer
       def dom
         check_text = @text
         check_id = id
-        check_style = css
+        check_style = "min-width: 27px; #{css}"
         check_class = name
         check_selection = @selection
-        options = {type: 'checkbox', id: check_id, name: parent.id, style: check_style, class: check_class, value: check_text, style: 'min-width: 27px;'}
+        # TODO `:style` key is duplicated twice
+        options = {type: 'checkbox', id: check_id, name: parent.id, style: check_style, class: check_class, value: check_text}
         options[checked: 'checked'] if check_selection
         @dom ||= html {
           span {

data/lib/glimmer/swt/color_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/composite_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/control_editor.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/custom/shape/arc.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/custom/shape/image.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/custom/shape/line.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/custom/shape/oval.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/custom/shape/point.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/custom/shape/polygon.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/custom/shape/polyline.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/custom/shape/rectangle.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/custom/shape/text.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2021 Andy Maleh
+# Copyright (c) 2007-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -40,9 +40,9 @@ module Glimmer
           def create(parent, keyword, args, &property_block)
             potential_shape_class_name = keyword.to_s.camelcase(:upper).to_sym
             if constants.include?(potential_shape_class_name)
-              const_get(potential_shape_class_name).new(parent, args, &property_block)
+              const_get(potential_shape_class_name).new(parent, args, property_block)
             else
-              new(parent, args, &property_block)
+              new(parent, args, property_block)
             end
           end
         
@@ -163,7 +163,7 @@ module Glimmer
           if !super_invocation && has_attribute?(method_name)
             true
           else
-            super(method_name, *args, &block)
+            super(method_name, (args.first if args.first == true), &block)
           end
         end
         

data/lib/glimmer/swt/date_time_proxy.rb

@@ -34,10 +34,10 @@ module Glimmer
             showNowButton: true,
             showCloseButton: true,
             button: "##{time_button_id}",
-            onClose: ->(v) {
+            onClose: proc do |v|
               @timepicker_done = true
               dom_element.trigger('change')
-            },
+            end,
           })
         else
           options = {}

data/lib/glimmer/swt/dialog_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/font_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/label_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/latest_dialog_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/latest_message_box_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/latest_shell_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -24,7 +24,7 @@ require 'glimmer/swt/shell_proxy'
 module Glimmer
   module SWT
     class LatestShellProxy < ShellProxy
-      def initialize(parent, args, block)
+      def initialize
         # No Op
       end
       
@@ -36,8 +36,8 @@ module Glimmer
         end
       end
       
-      def respond_to?(method, *args, &block)
-        super || latest_shell&.respond_to?(method, *args, &block)
+      def respond_to?(method_name, include_private = false)
+        super(method_name, include_private) || latest_shell&.respond_to?(method_name, include_private)
       end
       
       def open

data/lib/glimmer/swt/layout_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/make_shift_shell_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/glimmer/swt/menu_item_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -43,9 +43,9 @@ module Glimmer
       
       attr_accessor :accelerator # TODO consider doing something with it
     
-      def initialize(parent, args)
+      def initialize(parent, args, block)
         args.push(:push) if args.empty?
-        super(parent, args)
+        super(parent, args, block)
         # TODO do not add the following event till post_add_content to avoid adding if already one on_widget_selected event existed
         on_widget_selected {
           # No Op, just trigger selection