glimmer-dsl-wx 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a58eca665a94827505984c32aca6e70f41b74227adefc3847d6c36272ccd0125
-  data.tar.gz: c92afe6e99a78d32b07df6f6e30a70cbd73a65f136dc4f20cdac02a591bc099c
+  metadata.gz: 9d5a658d9129e3c8ebf9c27f75d090d8d3f987a56866d1072d8ee17c757a7845
+  data.tar.gz: 31fc334221373c19a3461742fac4c201caf513b79413fa3738e09b4aa7a7b752
 SHA512:
-  metadata.gz: 4720d808e123c3a67baf8e0fc99b4a5c12c5d1929ba1279cc4ac47fdc24d7fffb61c1aa11d9d303bbbfcd2ad71cf5742b5073e36717ea31bda97b54776ef9b10
-  data.tar.gz: eed7d3e70d290ac90fe36a2a8502c516febccc4a09f8fc9667cd15886d250a3b3683c245cc72930fe99fe578e48588b7612bdb86a026e38226d3b61fd6667e79
+  metadata.gz: 1516d96c79fdcd492d647092af6eed155b36091b7c2499c60384c24666a16e2cb5d2f397d92dd4c5f408d5d9cb947d24b50f7797ca70c644831ceafd89b6225a
+  data.tar.gz: e55a50420ee69b41e8406367151320aa29dd9d1d4ba57481475877e6e1624b2fcd1e157c00705ae9f43fb0b417ec4214079a8fa0377f32095c75c06300995368

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## 0.0.5
+
+- Nested child control support
+- Listener support
+- `about_box` keyword for displaying an about dialog box
+- samples/glimmer_new/hello_button.rb
+- samples/glimmer_new/hello_button2.rb
+- Fix again the issue with complaining about not finding `frame` `app_name` when not specified despite it being optional
+
+## 0.0.4
+
+- Fix issue with complaining about not finding `frame` `app_name` when not specified despite it being optional
+
+## 0.0.3
+
+- Support control arguments and properties
+- girb (Glimmer IRB)
+- Use frame title argument in samples/minimal/nothing.rb
+- Support `app_name` argument/property on `frame`
+- Automatically set `app_name` to `frame` `title` if `frame` `app_name` is not specified
+- samples/glimmer_new/hello_world.rb
+- samples/glimmer_new/hello_world2.rb
+
 ## 0.0.2
 
 - Remove forgotten occurrences of pd (puts_debuggerer) from code

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 WX 0.0.2
+# [<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 WX 0.0.5
 ## wxWidgets Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-wx.svg)](http://badge.fury.io/rb/glimmer-dsl-wx)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -14,14 +14,80 @@
 - Scaffolding for new custom controls, apps, and gems
 - Native-Executable packaging on Mac, Windows, and Linux.
 
-Nothing Sample:
+**Hello, World!**
+
+![Hello, World!](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-world.png?raw=true)
+
+```ruby
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame(title: 'Hello, World!')
+```
+
+Alternate Syntax:
+
+```ruby
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame {
+  title 'Hello, World!'
+}
+```
+
+**Hello Button!**
+
+
+![Hello, Button!](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-button.png?raw=true)
+
+![Hello, Button! Clicked](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-button-clicked.png?raw=true)
+
+
+```ruby
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame(title: 'Hello, Button!') { |f|
+  button(label: 'Click To Find Who Built This!') {
+    on_button do
+      about_box(
+        name: f.title,
+        version: Wx::WXRUBY_VERSION,
+        description: "This is the Hello, Button! sample",
+        developers: ['The Glimmer DSL for WX Development Team']
+      )
+    end
+  }
+}
+```
+
+Alternate Syntax:
 
 ```ruby
 require 'glimmer-dsl-wx'
 
 include Glimmer
 
-frame
+frame { |f|
+  title 'Hello, Button!'
+  
+  button {
+    label 'Click To Find Who Built This!'
+    
+    on_button do
+      about_box(
+        name: f.title,
+        version: Wx::WXRUBY_VERSION,
+        description: "This is the Hello, Button! sample",
+        developers: ['The Glimmer DSL for WX Development Team']
+      )
+    end
+  }
+}
 ```
 
 **[Glimmer](https://rubygems.org/gems/glimmer) DSL Comparison Table:**
@@ -42,6 +108,7 @@ DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
 ## Table of Contents
 
 - [Glimmer DSL for WX](#)
+  - [Usage](#usage)
   - [Process](#process)
   - [Resources](#resources)
   - [Help](#help)
@@ -53,6 +120,35 @@ DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
   - [Contributors](#contributors)
   - [License](#license)
 
+## Usage
+
+Follow instructions for installing [wxruby3](https://github.com/mcorino/wxRuby3) on a supported platform (Linux or Windows):
+https://github.com/mcorino/wxRuby3/blob/master/INSTALL.md
+
+Install [glimmer-dsl-wx](https://rubygems.org/gems/glimmer-dsl-wx) gem directly into a [maintained Ruby version](https://www.ruby-lang.org/en/downloads/):
+
+```
+gem install glimmer-dsl-wx
+```
+ 
+Or install via Bundler `Gemfile`:
+
+```ruby
+gem 'glimmer-dsl-wx', '~> 0.0.5'
+```
+
+Test that installation worked by running a sample:
+
+```
+ruby -r glimmer-dsl-wx -e "require 'samples/glimmer_new/hello_world'"
+```
+
+If you cloned project, test by running a sample locally:
+
+```
+ruby -r ./lib/glimmer-dsl-wx.rb samples/glimmer_new/hello_world.rb
+```
+
 ## Process
 
 [Glimmer Process](https://github.com/AndyObtiva/glimmer/blob/master/PROCESS.md)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.5

data/bin/girb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/bin/girb_runner.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,7 +23,7 @@
 require 'fileutils'
 require 'etc'
 
-require_relative '../lib/glimmer-dsl-libui'
+require_relative '../lib/glimmer-dsl-wx'
 
 include Glimmer
 

data/lib/glimmer/dsl/wx/about_box_expression.rb

@@ -0,0 +1,34 @@
+# Copyright (c) 2023 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# 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
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/static_expression'
+
+module Glimmer
+  module DSL
+    module Wx
+      class AboutBoxExpression < StaticExpression
+        def interpret(parent, keyword, *args, &block)
+          ::Wx.about_box(*args)
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 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/wx/control_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -29,35 +29,34 @@ module Glimmer
         include ParentExpression
   
         def can_interpret?(parent, keyword, *args, &block)
-#           Glimmer::Wx::ControlProxy.exists?(keyword)
-          ::Wx.constants.include?(keyword.capitalize.to_sym)
+          Glimmer::Wx::ControlProxy.exists?(keyword)
         end
   
         def interpret(parent, keyword, *args, &block)
-#           Glimmer::Wx::ControlProxy.create(keyword, parent, args, &block)
-          control = ::Wx.const_get(keyword.capitalize.to_sym).new(nil)
-          control.show if keyword == 'frame'
-          control
+          Glimmer::Wx::ControlProxy.create(keyword, parent, args, &block)
         end
         
         def around(parent, keyword, args, block, &interpret_and_add_content)
           if keyword == 'frame'
             ::Wx::App.run do
-              interpret_and_add_content.call
+              frame_proxy = interpret_and_add_content.call
+              app_name = frame_proxy.app_name || frame_proxy.title
+              self.app_name = app_name unless app_name.nil?
             end
           else
             interpret_and_add_content.call
           end
         end
         
-#         def add_content(parent, keyword, *args, &block)
-#           options = args.last.is_a?(Hash) ? args.last : {post_add_content: true}
-#           super
-#           parent&.post_add_content if options[:post_add_content]
-#         end
+        def add_content(parent, keyword, *args, &block)
+          options = args.last.is_a?(Hash) ? args.last : {post_add_content: true}
+          options[:post_add_content] = true if options[:post_add_content].nil?
+          super
+          parent&.post_add_content if options[:post_add_content]
+        end
       end
     end
   end
 end
 
-# require 'glimmer/wx/control_proxy'
+require 'glimmer/wx/control_proxy'

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 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/wx/dsl.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,8 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/dsl/engine'
-# Dir[File.expand_path('*_expression.rb', __dir__)].each {|f| require f}
-require 'glimmer/dsl/wx/control_expression'
+Dir[File.expand_path('*_expression.rb', __dir__)].each {|f| require f}
 
 # Glimmer DSL expression configuration module
 #
@@ -41,7 +40,10 @@ module Glimmer
 #           shine_data_binding
 #           property
 #           operation
+#           control
         %w[
+          listener
+          property
           control
         ]
       )

data/lib/glimmer/dsl/wx/listener_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -19,23 +19,23 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# require 'glimmer/dsl/expression'
-# require 'glimmer/libui/control_proxy'
-#
-# module Glimmer
-#   module DSL
-#     module Libui
-#       class ListenerExpression < Expression
-#         def can_interpret?(parent, keyword, *args, &block)
-#           (parent.is_a?(Glimmer::LibUI::ControlProxy) or parent.is_a?(Glimmer::LibUI::Shape)) and
-#             block_given? and
-#             parent.can_handle_listener?(keyword)
-#         end
-#
-#         def interpret(parent, keyword, *args, &block)
-#           parent.handle_listener(keyword, &block)
-#         end
-#       end
-#     end
-#   end
-# end
+require 'glimmer/dsl/expression'
+require 'glimmer/wx/control_proxy'
+
+module Glimmer
+  module DSL
+    module Wx
+      class ListenerExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          parent.is_a?(Glimmer::Wx::ControlProxy) and
+            block_given? and
+            parent&.can_handle_listener?(keyword)
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          parent.handle_listener(keyword, &block)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/wx/observe_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 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/wx/operation_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 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/wx/property_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -19,30 +19,23 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# require 'glimmer/dsl/expression'
-# require 'glimmer/libui/control_proxy'
-# require 'glimmer/libui/shape'
-# require 'glimmer/libui/attributed_string'
-#
-# module Glimmer
-#   module DSL
-#     module Libui
-#       class PropertyExpression < Expression
-#         def can_interpret?(parent, keyword, *args, &block)
-#           (
-#             parent.is_a?(Glimmer::LibUI::ControlProxy) or
-#               parent.is_a?(Glimmer::LibUI::Shape) or
-#               parent.is_a?(Glimmer::LibUI::AttributedString) or
-#               parent.is_a?(Glimmer::LibUI::CustomControl)
-#           ) and
-#             block.nil? and
-#             parent.respond_to?("#{keyword}=", *args)
-#         end
-#
-#         def interpret(parent, keyword, *args, &block)
-#           parent.send("#{keyword}=", *args)
-#         end
-#       end
-#     end
-#   end
-# end
+require 'glimmer/dsl/expression'
+require 'glimmer/wx/control_proxy'
+
+module Glimmer
+  module DSL
+    module Wx
+      class PropertyExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          parent.is_a?(Glimmer::Wx::ControlProxy) and
+            block.nil? and
+            parent.respond_to?("#{keyword}=", *args)
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          parent.send("#{keyword}=", *args)
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 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/wx/control_proxy/frame_proxy.rb

@@ -0,0 +1,52 @@
+# Copyright (c) 2023 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# 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
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/wx/parent'
+
+module Glimmer
+  module Wx
+    class ControlProxy
+      # Proxy for Wx frame objects
+      #
+      # Follows the Proxy Design Pattern
+      class FrameProxy < ControlProxy
+        include Parent
+        
+        attr_accessor :app_name
+        
+        def initialize(keyword, parent, args, &block)
+          self.app_name = options.delete(:app_name)
+          super(keyword, parent, args, &block)
+        end
+        
+        def title=(value)
+          # wxWidgets does not allow setting a frame title if set already
+          super if (options[:title] || options['title']).nil?
+        end
+        
+        def post_add_content
+          super
+          show
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/wx/control_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -19,53 +19,43 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'glimmer/libui/data_bindable'
+require 'glimmer/wx/data_bindable'
+require 'glimmer/wx/parent'
 
 module Glimmer
-  module LibUI
-    # Proxy for LibUI control objects
+  module Wx
+    # Proxy for Wx control objects
     #
     # Follows the Proxy Design Pattern
     class ControlProxy
       class << self
         def exists?(keyword)
-          ::LibUI.respond_to?("new_#{keyword}") or
-            ::LibUI.respond_to?(keyword) or
+          ::Wx.constants.include?(wx_constant_symbol(keyword)) or
             descendant_keyword_constant_map.keys.include?(keyword)
         end
         
         def create(keyword, parent, args, &block)
-          widget_proxy_class(keyword).new(keyword, parent, args, &block).tap {|c| control_proxies << c}
+          control_proxy_class(keyword).new(keyword, parent, args, &block)
         end
         
-        def widget_proxy_class(keyword)
+        def control_proxy_class(keyword)
           descendant_keyword_constant_map[keyword] || ControlProxy
         end
         
-        # autosave all controls in this array to avoid garbage collection
-        def control_proxies
-          @@control_proxies = [] unless defined?(@@control_proxies)
-          @@control_proxies
-        end
-        
-        def main_window_proxy
-          control_proxies.find {|c| c.is_a?(WindowProxy)}
-        end
-        
-        def menu_proxies
-          control_proxies.select {|c| c.keyword == 'menu' }
-        end
-        
-        def image_proxies
-          control_proxies.select {|c| c.keyword == 'image' }
+        def new_control(keyword, parent, args)
+          args = args.clone || []
+          if args.last.is_a?(Hash)
+            args[-1] = args[-1].clone
+          end
+          ::Wx.const_get(wx_constant_symbol(keyword)).new(parent, *args)
         end
         
-        def new_control(keyword, args)
-          ::LibUI.send("new_#{keyword}", *args)
+        def wx_constant_symbol(keyword)
+          keyword.to_s.camelcase(:upper).to_sym
         end
         
         def constant_symbol(keyword)
-          "#{keyword.camelcase(:upper)}Proxy".to_sym
+          "#{keyword.to_s.camelcase(:upper)}Proxy".to_sym
         end
         
         def keyword(constant_symbol)
@@ -73,7 +63,7 @@ module Glimmer
         end
         
         def descendant_keyword_constant_map
-          @descendant_keyword_constant_map ||= add_aliases_to_keyword_constant_map(map_descendant_keyword_constants_for(self))
+          @descendant_keyword_constant_map ||= map_descendant_keyword_constants_for(self)
         end
         
         def reset_descendant_keyword_constant_map
@@ -92,41 +82,12 @@ module Glimmer
           end
           accumulator
         end
-        
-        private
-        
-        def add_aliases_to_keyword_constant_map(keyword_constant_map)
-          KEYWORD_ALIASES.each do |keyword, alias_keyword|
-            keyword_constant_map[alias_keyword] = keyword_constant_map[keyword]
-          end
-          keyword_constant_map
-        end
       end
       
       include DataBindable
       
-      KEYWORD_ALIASES = {
-        'msg_box'       => 'message_box',
-        'msg_box_error' => 'message_box_error',
-      }
-      
-      BOOLEAN_PROPERTIES = %w[
-        padded
-        checked
-        enabled toplevel visible
-        read_only
-        margined
-        borderless fullscreen
-        stretchy
-      ]
-      
-      STRING_PROPERTIES = %w[
-        text
-        title
-      ]
-      
-      # libui returns the contained LibUI object
-      attr_reader :parent_proxy, :libui, :args, :keyword, :block, :content_added
+      # wx returns the contained LibUI object
+      attr_reader :parent_proxy, :wx, :args, :keyword, :block, :content_added
       alias content_added? content_added
       
       def initialize(keyword, parent, args, &block)
@@ -134,11 +95,14 @@ module Glimmer
         @parent_proxy = parent
         @args = args
         @block = block
-        @enabled = true
         build_control
         post_add_content if @block.nil?
       end
       
+      def options
+        @args&.last&.is_a?(Hash) ? @args.last : {}
+      end
+      
       # Subclasses may override to perform post add_content work (normally must call super)
       def post_add_content
         unless @content_added
@@ -152,7 +116,7 @@ module Glimmer
         # No Op by default
       end
       
-      def window_proxy
+      def frame_proxy
         found_proxy = self
         until found_proxy.nil? || found_proxy.is_a?(WindowProxy)
           found_proxy = found_proxy.parent_proxy
@@ -161,31 +125,17 @@ module Glimmer
       end
 
       def can_handle_listener?(listener_name)
-        ::LibUI.respond_to?("#{libui_api_keyword}_#{listener_name}") ||
-          ::LibUI.respond_to?("control_#{listener_name}") ||
-          has_custom_listener?(listener_name)
+        listener_name.to_s.start_with?('on_')
+        # TODO figure out if there is a way to check this in Wx or not.
+#           has_custom_listener?(listener_name)
       end
       
       def handle_listener(listener_name, &listener)
-        # replace first listener argument (control libui pointer) with actual Ruby libui object
-        safe_listener = Proc.new { |*args| listener.call(self, *args[1..-1]) }
-        if ::LibUI.respond_to?("#{libui_api_keyword}_#{listener_name}")
-          if listeners[listener_name].nil?
-            ::LibUI.send("#{libui_api_keyword}_#{listener_name}", libui) do |*args|
-              listeners_for(listener_name).map { |listener| listener.call(*args) }.last
-            end
-          end
-          listeners_for(listener_name) << safe_listener
-        elsif ::LibUI.respond_to?("control_#{listener_name}")
-          if listeners[listener_name].nil?
-            ::LibUI.send("control_#{listener_name}", libui) do |*args|
-              listeners_for(listener_name).map { |listener| listener.call(*args) }.last
-            end
-          end
-          listeners_for(listener_name) << safe_listener
-        elsif has_custom_listener?(listener_name)
-          handle_custom_listener(listener_name, &listener)
-        end
+        event = listener_name.to_s.sub('on_', '')
+        @parent_proxy.wx.send("evt_#{event}", @wx, &listener)
+#         elsif has_custom_listener?(listener_name)
+#           handle_custom_listener(listener_name, &listener)
+#         end
       end
       
       def listeners
@@ -238,31 +188,14 @@ module Glimmer
       end
       
       def respond_to?(method_name, *args, &block)
-        respond_to_libui?(method_name, *args, &block) ||
-          (
-            append_properties.include?(method_name.to_s) ||
-            (append_properties.include?(method_name.to_s.sub(/\?$/, '')) && BOOLEAN_PROPERTIES.include?(method_name.to_s.sub(/\?$/, ''))) ||
-            append_properties.include?(method_name.to_s.sub(/=$/, ''))
-          ) ||
+        @wx.respond_to?(method_name, true) ||
           can_handle_listener?(method_name.to_s) ||
           super(method_name, true)
       end
       
-      def respond_to_libui?(method_name, *args, &block)
-        ::LibUI.respond_to?("control_#{method_name}") or
-          (::LibUI.respond_to?("control_#{method_name.to_s.sub(/\?$/, '')}") && BOOLEAN_PROPERTIES.include?(method_name.to_s.sub(/\?$/, '')) ) or
-          ::LibUI.respond_to?("control_set_#{method_name.to_s.sub(/=$/, '')}") or
-          ::LibUI.respond_to?("#{libui_api_keyword}_#{method_name}") or
-          (::LibUI.respond_to?("#{libui_api_keyword}_#{method_name.to_s.sub(/\?$/, '')}") && BOOLEAN_PROPERTIES.include?(method_name.to_s.sub(/\?$/, '')) ) or
-          ::LibUI.respond_to?("#{libui_api_keyword}_set_#{method_name.to_s.sub(/=$/, '')}")
-      end
-      
       def method_missing(method_name, *args, &block)
-        if respond_to_libui?(method_name, *args, &block)
-          send_to_libui(method_name, *args, &block)
-        elsif append_properties.include?(method_name.to_s) ||
-            append_properties.include?(method_name.to_s.sub(/(=|\?)$/, ''))
-          append_property(method_name, *args)
+        if @wx.respond_to?(method_name, true)
+          @wx.send(method_name, *args, &block)
         elsif can_handle_listener?(method_name.to_s)
           handle_listener(method_name.to_s, &block)
         else
@@ -270,116 +203,6 @@ module Glimmer
         end
       end
       
-      def send_to_libui(method_name, *args, &block)
-        if ::LibUI.respond_to?("#{libui_api_keyword}_#{method_name.to_s.sub(/\?$/, '')}") && args.empty?
-          property = method_name.to_s.sub(/\?$/, '')
-          value = ::LibUI.send("#{libui_api_keyword}_#{property}", libui, *args)
-          handle_string_property(property, handle_boolean_property(property, value))
-        elsif ::LibUI.respond_to?("#{libui_api_keyword}_get_#{method_name.to_s.sub(/\?$/, '')}") && args.empty?
-          property = method_name.to_s.sub(/\?$/, '')
-          value = ::LibUI.send("#{libui_api_keyword}_get_#{property}", libui, *args)
-          handle_string_property(property, handle_boolean_property(property, value))
-        elsif ::LibUI.respond_to?("#{libui_api_keyword}_set_#{method_name.to_s.sub(/=$/, '')}") && !args.empty?
-          property = method_name.to_s.sub(/=$/, '')
-          args[0] = Glimmer::LibUI.boolean_to_integer(args.first) if BOOLEAN_PROPERTIES.include?(property) && (args.first.is_a?(TrueClass) || args.first.is_a?(FalseClass))
-          args[0] = '' if STRING_PROPERTIES.include?(property) && args.first == nil
-          if property.to_s == 'checked'
-            current_value = Glimmer::LibUI.integer_to_boolean(::LibUI.send("#{libui_api_keyword}_checked", libui), allow_nil: false)
-            new_value = Glimmer::LibUI.integer_to_boolean(args[0], allow_nil: false)
-            ::LibUI.send("#{libui_api_keyword}_set_#{property}", libui, *args) if new_value != current_value
-          else
-            ::LibUI.send("#{libui_api_keyword}_set_#{property}", libui, *args)
-          end
-        elsif ::LibUI.respond_to?("#{libui_api_keyword}_#{method_name}") && !args.empty?
-          ::LibUI.send("#{libui_api_keyword}_#{method_name}", libui, *args)
-        elsif ::LibUI.respond_to?("control_#{method_name.to_s.sub(/\?$/, '')}") && args.empty?
-          property = method_name.to_s.sub(/\?$/, '')
-          value = ::LibUI.send("control_#{property}", libui, *args)
-          handle_string_property(property, handle_boolean_property(property, value))
-        elsif ::LibUI.respond_to?("control_set_#{method_name.to_s.sub(/=$/, '')}")
-          property = method_name.to_s.sub(/=$/, '')
-          args[0] = Glimmer::LibUI.boolean_to_integer(args.first) if BOOLEAN_PROPERTIES.include?(property) && (args.first.is_a?(TrueClass) || args.first.is_a?(FalseClass))
-          args[0] = '' if STRING_PROPERTIES.include?(property) && args.first == nil
-          ::LibUI.send("control_set_#{method_name.to_s.sub(/=$/, '')}", libui, *args)
-        elsif ::LibUI.respond_to?("control_#{method_name}") && !args.empty?
-          ::LibUI.send("control_#{method_name}", libui, *args)
-        end
-      end
-      
-      def append_properties
-        @parent_proxy&.class&.constants&.include?(:APPEND_PROPERTIES) ? @parent_proxy.class::APPEND_PROPERTIES : []
-      end
-      
-      def append_property(property, value = nil)
-        property = property.to_s.sub(/(=|\?)$/, '')
-        @append_property_hash ||= {}
-        if value.nil?
-          value = @append_property_hash[property]
-          handle_string_property(property, handle_boolean_property(property, value))
-        else
-          value = Glimmer::LibUI.boolean_to_integer(value) if BOOLEAN_PROPERTIES.include?(property) && (value.is_a?(TrueClass) || value.is_a?(FalseClass))
-          @append_property_hash[property] = value
-        end
-      end
-      
-      def libui_api_keyword
-        @keyword
-      end
-      
-      def destroy
-        # TODO exclude menus from this initial return
-        return if !is_a?(ControlProxy::WindowProxy) && ControlProxy.main_window_proxy&.destroying?
-        data_binding_model_attribute_observer_registrations.each(&:deregister)
-        if parent_proxy.nil?
-          default_destroy
-        else
-          parent_proxy.destroy_child(self)
-        end
-      end
-      
-      def destroy_child(child)
-        child.default_destroy
-        children.delete(child)
-      end
-      
-      def default_destroy
-        deregister_all_custom_listeners
-        send_to_libui('destroy')
-        ControlProxy.control_proxies.delete(self)
-      end
-            
-      def enabled(value = nil)
-        if value.nil?
-          @enabled
-        elsif value != @enabled
-          @enabled = value == 1 || value
-          if value == 1 || value
-            send_to_libui('enable')
-          else
-            send_to_libui('disable')
-          end
-        end
-      end
-      alias enabled? enabled
-      alias set_enabled enabled
-      alias enabled= enabled
-      
-      def visible(value = nil)
-        current_value = send_to_libui('visible')
-        if value.nil?
-          current_value
-        elsif value != current_value
-          if value == 1 || value
-            send_to_libui('show')
-          else
-            send_to_libui('hide')
-          end
-        end
-      end
-      alias visible? visible
-      alias set_visible visible
-      alias visible= visible
-      
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::ControlExpression.new, @keyword, {post_add_content: @content_added}, &block)
       end
@@ -387,20 +210,15 @@ module Glimmer
       private
       
       def build_control
-        @libui = if ::LibUI.respond_to?("new_#{keyword}")
-          ControlProxy.new_control(@keyword, @args)
-        elsif ::LibUI.respond_to?(keyword)
-          @args[0] = @args.first.libui if @args.first.is_a?(ControlProxy)
-          ::LibUI.send(@keyword, *@args)
+        if is_a?(Parent)
+          @wx = ControlProxy.new_control(@keyword, @parent_proxy&.wx, @args)
+        else
+          sizer = ::Wx::HBoxSizer.new
+          @parent_proxy.sizer = sizer
+          @wx = ControlProxy.new_control(@keyword, @parent_proxy&.wx, @args)
+          sizer.add @wx, 0, ::Wx::RIGHT, 8
         end
-      end
-      
-      def handle_boolean_property(property, value)
-        BOOLEAN_PROPERTIES.include?(property) ? Glimmer::LibUI.integer_to_boolean(value) : value
-      end
-      
-      def handle_string_property(property, value)
-        STRING_PROPERTIES.include?(property) ? value.to_s : value
+        @wx
       end
     end
   end

data/lib/glimmer/wx/data_bindable.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,7 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Glimmer
-  module LibUI
+  module Wx
     # Parent controls and shapes who have children and add child post_initialize_child
     module DataBindable
       # Sets up read/write (bidirectional) data-binding

data/lib/glimmer/wx/parent.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,7 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Glimmer
-  module LibUI
+  module Wx
     # Parent controls and shapes who have children and add child post_initialize_child
     module Parent
       # Subclasses can override and must call super (passing add_child: false to cancel adding child to children)

data/lib/glimmer-dsl-wx.rb

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

data/samples/glimmer_new/hello_button.rb

@@ -0,0 +1,37 @@
+# Copyright (c) 2023 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# 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
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame(title: 'Hello, Button!') { |f|
+  button(label: 'Click To Find Who Built This!') {
+    on_button do
+      about_box(
+        name: f.title,
+        version: Wx::WXRUBY_VERSION,
+        description: "This is the Hello, Button! sample",
+        developers: ['The Glimmer DSL for WX Development Team']
+      )
+    end
+  }
+}

data/samples/glimmer_new/hello_button2.rb

@@ -0,0 +1,41 @@
+# Copyright (c) 2023 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# 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
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame { |f|
+  title 'Hello, Button!'
+  
+  button {
+    label 'Click To Find Who Built This!'
+    
+    on_button do
+      about_box(
+        name: f.title,
+        version: Wx::WXRUBY_VERSION,
+        description: "This is the Hello, Button! sample",
+        developers: ['The Glimmer DSL for WX Development Team']
+      )
+    end
+  }
+}

data/samples/glimmer_new/hello_world.rb

@@ -0,0 +1,26 @@
+# Copyright (c) 2023 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# 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
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame(title: 'Hello, World!')

data/samples/glimmer_new/hello_world2.rb

@@ -0,0 +1,28 @@
+# Copyright (c) 2023 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# 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
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame {
+  title 'Hello, World!'
+}

data/samples/minimal/nothing.rb

@@ -1,24 +1,29 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
-# Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
-###
- 
-# require 'wx'
+# Copyright (c) 2023 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# 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
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# This is the minimum code to start a WxRuby app - create a Frame, and
-# show it.
-# Wx::App.run do
-###     self.app_name = 'Nothing'
-###     frame = Wx::Frame.new(nil, title: "Empty wxRuby App")
-#   frame = Wx::Frame.new(nil)
-#   frame.title = "Empty wxRuby App"
-#   frame.show
-#   frame
-# end
-
-require './lib/glimmer-dsl-wx'
+require 'glimmer-dsl-wx'
 
 include Glimmer
 
-frame
+frame {
+  app_name 'Nothing'
+  title 'Empty wxRuby App'
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-wx
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Andy Maleh
@@ -230,6 +230,7 @@ files:
 - icons/glimmer.png
 - lib/glimmer-dsl-wx.rb
 - lib/glimmer-dsl-wx/ext/glimmer.rb
+- lib/glimmer/dsl/wx/about_box_expression.rb
 - lib/glimmer/dsl/wx/bind_expression.rb
 - lib/glimmer/dsl/wx/control_expression.rb
 - lib/glimmer/dsl/wx/data_binding_expression.rb
@@ -241,6 +242,7 @@ files:
 - lib/glimmer/dsl/wx/shine_data_binding_expression.rb
 - lib/glimmer/proc_tracker.rb
 - lib/glimmer/wx/control_proxy.rb
+- lib/glimmer/wx/control_proxy/frame_proxy.rb
 - lib/glimmer/wx/data_bindable.rb
 - lib/glimmer/wx/parent.rb
 - samples/art/wxruby-128x128.png
@@ -248,6 +250,10 @@ files:
 - samples/art/wxruby-64x64.png
 - samples/art/wxruby.ico
 - samples/art/wxruby.png
+- samples/glimmer_new/hello_button.rb
+- samples/glimmer_new/hello_button2.rb
+- samples/glimmer_new/hello_world.rb
+- samples/glimmer_new/hello_world2.rb
 - samples/minimal/mondrian.ico
 - samples/minimal/mondrian.png
 - samples/minimal/nothing.rb