wxruby3 0.9.0.pre.rc.3 → 0.9.1

data/lib/wx/html/htmlhelpcontroller.rb

@@ -1,6 +1,32 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+
+  module HTML
+
+    class HtmlHelpController
+
+      def self.instance(*args)
+        @instance ||= new(*args)
+      end
+
+      # cache any explicitly assigned config for GC protection
+      wx_use_config = instance_method(:use_config)
+      define_method :use_config do |cfg, *args|
+        @configuration = cfg
+        if get_help_window
+          # also set config var for any associated help window (as wxWidgets propagates it too)
+          # so the instance remains GC protected whether or not the help window is destructed before
+          # or after the controller
+          get_help_window.instance_variable_set('@configuration', cfg)
+        end
+        wx_use_config.bind(self).call(cfg, *args)
+      end
+
+    end
 
-class Wx::HTML::HtmlHelpController
-  def self.instance(*args)
-    @instance ||= new(*args)
   end
+
 end

data/lib/wx/html/htmlwindow.rb

@@ -1,19 +1,30 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
-class Wx::HTML::HtmlWindow
+module Wx
 
-  # Need to override HtmlWindow.add_filter to provide cashing
-  # for the added custom html filters to prevent premature GC
-  class << self
-    def html_filters
-      @html_filters ||= []
-    end
-    private :html_filters
+  module HTML
+
+    class HtmlWindow
+
+      # Need to override HtmlWindow.add_filter to provide cashing
+      # for the added custom html filters to prevent premature GC
+      class << self
+        def html_filters
+          @html_filters ||= []
+        end
+        private :html_filters
+
+        wx_add_filter = instance_method(:add_filter)
+        define_method(:add_filter) do |filter|
+          html_filters << filter
+          wx_add_filter.bind(self).call(filter)
+        end
+      end
 
-    wx_add_filter = instance_method(:add_filter)
-    define_method(:add_filter) do |filter|
-      html_filters << filter
-      wx_add_filter.bind(self).call(filter)
     end
+
   end
 
 end

data/lib/wx/html/keyword_defs.rb

@@ -1,6 +1,13 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # = WxSugar - Keyword Constructors Classes
 # Wx::HTML sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 
 # wxHtmlWindow - Control for displaying HTML

data/lib/wx/html/require.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::HTML sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 #require_relative './ext'
 require_relative './events/evt_list'

data/lib/wx/html/simple_html_listbox.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 class Wx::HTML::SimpleHtmlListBox
 

data/lib/wx/html.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::HTML sub package loader for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 
 require 'wx/core'

data/lib/wx/keyword_ctors.rb

@@ -1,5 +1,12 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # WxRuby Extensions - Keyword Constructors for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 # Adapted from wxRuby2.
 
 module Wx
@@ -191,15 +198,27 @@ module Wx
             return
           end
 
+          real_args = begin
+                        [ parent ] + self.class.args_as_list(*mixed_args)
+                      rescue => err
+                        msg = "Error initializing #{self.inspect}\n"+
+                          " : #{err.message} \n" +
+                          "Provided are #{[parent] + mixed_args} \n" +
+                          "Correct parameters for #{self.class.name}.new are:\n" +
+                          self.class.describe_constructor(":parent => (Wx::Window)\n")
+
+                        new_err = err.class.new(msg)
+                        new_err.set_backtrace(caller)
+                        Kernel.raise new_err
+                      end
           begin
-            real_args = [ parent ] + self.class.args_as_list(*mixed_args)
             pre_wx_kwctor_init(*real_args)
           rescue => err
             msg = "Error initializing #{self.inspect}\n"+
                   " : #{err.message} \n" +
                   "Provided are #{real_args} \n" +
                   "Correct parameters for #{self.class.name}.new are:\n" +
-                   self.class.describe_constructor()
+                   self.class.describe_constructor(":parent => (Wx::Window)\n")
 
             new_err = err.class.new(msg)
             new_err.set_backtrace(caller)

data/lib/wx/keyword_defs.rb

@@ -1,5 +1,12 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Wx keyword ctor definitions for core classes
-# Copyright (c) M.J.N. Corino, The Netherlands
 # Adapted from wxRuby2.
 
 # Window : base class for all widgets and frames
@@ -214,7 +221,6 @@ Wx::define_keyword_ctors(Wx::SingleChoiceDialog) do
   wx_ctor_params :message => ''
   wx_ctor_params :caption => ''
   wx_ctor_params :choices => []
-  wx_ctor_params :data => nil
   wx_ctor_params :style => Wx::DEFAULT_DIALOG_STYLE|Wx::RESIZE_BORDER|
                            Wx::OK|Wx::CANCEL|Wx::CENTRE
   wx_ctor_params :pos
@@ -273,6 +279,14 @@ Wx::define_keyword_ctors(Wx::BitmapButton) do
   wx_ctor_params :validator, :name => 'button'
 end
 
+# Push button control, similar behavior as hyperlinks
+Wx::define_keyword_ctors(Wx::CommandLinkButton) do
+  wx_ctor_params :id, :mainLabel => ''
+  wx_ctor_params :note => ''
+  wx_ctor_params :pos, :size, :style
+  wx_ctor_params :validator, :name => 'commandLinkButton'
+end
+
 # A button which stays pressed when clicked by user.
 Wx::define_keyword_ctors(Wx::ToggleButton) do
   wx_ctor_params :id, :label, :pos, :size, :style
@@ -328,7 +342,12 @@ Wx::define_keyword_ctors(Wx::BitmapComboBox) do
   wx_ctor_params :validator, :name => 'comboBox'
 end
 
-# wxDatePickerCtrl 	Small date picker control
+# wxComboCtrl
+Wx::define_keyword_ctors(Wx::ComboCtrl) do
+  wx_ctor_params :id, :value => ''
+  wx_ctor_params :pos, :size, :style
+  wx_ctor_params :validator, :name => 'comboCtrl'
+end
 
 # wxGauge 	A control to represent a varying quantity, such as time
 # remaining
@@ -372,6 +391,17 @@ Wx::define_keyword_ctors(Wx::SpinCtrl) do
   wx_ctor_params :name => 'spinCtrl'
 end
 
+# wxSpinCtrlDouble 	A spin control - i.e. spin button and text control
+Wx::define_keyword_ctors(Wx::SpinCtrlDouble) do
+  wx_ctor_params :id, :value => ''
+  wx_ctor_params :pos, :size, :style => Wx::SP_ARROW_KEYS
+  wx_ctor_params :min => 0
+  wx_ctor_params :max => 100
+  wx_ctor_params :initial => 0
+  wx_ctor_params :inc => 1
+  wx_ctor_params :name => 'spinCtrlDouble'
+end
+
 # One or more lines of non-editable text
 Wx::define_keyword_ctors(Wx::StaticText) do
   wx_ctor_params :id, :label, :pos, :size, :style, :name => 'staticText'
@@ -445,7 +475,7 @@ end
 Wx::define_keyword_ctors(Wx::HyperlinkCtrl) do
   wx_ctor_params :id, :label => ''
   wx_ctor_params :url => ''
-  wx_ctor_params :pos, :size, :style => 0
+  wx_ctor_params :pos, :size, :style => Wx::HL_DEFAULT_STYLE
   wx_ctor_params :name => 'hyperlink'
 end
 
@@ -482,8 +512,50 @@ Wx::define_keyword_ctors(Wx::VListBox) do
   wx_ctor_params :id, :pos, :size, :style, :name => 'VListBoxNameStr'
 end
 
+# wxDatePickerCtrl 	Small date picker control
 Wx::define_keyword_ctors(Wx::DatePickerCtrl) do
-  wx_ctor_params :id, :dt, :pos, :size, :style, :validator, :name => 'dateCtrl'
+  wx_ctor_params :id, :dt, :pos, :size, :style => Wx::DP_DEFAULT|Wx::DP_SHOWCENTURY
+  wx_ctor_params :validator, :name => 'datePickerCtrl'
+end
+
+Wx::define_keyword_ctors(Wx::TimePickerCtrl) do
+  wx_ctor_params :id, :dt, :pos, :size, :style => Wx::TP_DEFAULT
+  wx_ctor_params :validator, :name => 'timePickerCtrl'
+end
+
+Wx::define_keyword_ctors(Wx::ColourPickerCtrl) do
+  wx_ctor_params :id, :colour => :BLACK
+  wx_ctor_params :pos, :size, :style => Wx::CLRP_DEFAULT_STYLE
+  wx_ctor_params :validator, :name => 'colourPickerCtrl'
+end
+
+Wx::define_keyword_ctors(Wx::FontPickerCtrl) do
+  wx_ctor_params :id, :font => Wx::NULL_FONT
+  wx_ctor_params :pos, :size, :style => Wx::FNTP_DEFAULT_STYLE
+  wx_ctor_params :validator, :name => 'fontPickerCtrl'
+end
+
+Wx::define_keyword_ctors(Wx::FilePickerCtrl) do
+  wx_ctor_params :id, :path => ''
+  wx_ctor_params :message => Wx::FILE_SELECTOR_PROMPT_STR
+  wx_ctor_params :wildcard => Wx::FILE_SELECTOR_DEFAULT_WILDCARD_STR
+  wx_ctor_params :pos, :size, :style => Wx::FLP_DEFAULT_STYLE
+  wx_ctor_params :validator, :name => 'filePickerCtrl'
+end
+
+Wx::define_keyword_ctors(Wx::DirPickerCtrl) do
+  wx_ctor_params :id, :path => ''
+  wx_ctor_params :message => Wx::DIR_SELECTOR_PROMPT_STR
+  wx_ctor_params :pos, :size, :style => Wx::DIRP_DEFAULT_STYLE
+  wx_ctor_params :validator, :name => 'dirPickerCtrl'
+end
+
+Wx::define_keyword_ctors(Wx::FileCtrl) do
+  wx_ctor_params :id, :defaultDirectory => ''
+  wx_ctor_params :defaultFilename => ''
+  wx_ctor_params :wildcard => Wx::FILE_SELECTOR_DEFAULT_WILDCARD_STR
+  wx_ctor_params :style => Wx::FC_DEFAULT_STYLE
+  wx_ctor_params :pos, :size, :name => 'fileCtrl'
 end
 
 Wx::define_keyword_ctors(Wx::ActivityIndicator) do
@@ -491,5 +563,22 @@ Wx::define_keyword_ctors(Wx::ActivityIndicator) do
   wx_ctor_params :name => 'activityIndicator'
 end
 
-# FIXME - SymbolPickerDialog is hard to because the parent argument is
-# in a strange place.
+Wx::define_keyword_ctors(Wx::BannerWindow) do
+  wx_ctor_params :id, :dir => Wx::Direction::LEFT
+  wx_ctor_params :pos, :size, :style
+  wx_ctor_params :name => 'bannerwindow'
+end
+
+Wx::define_keyword_ctors(Wx::InfoBar) do
+  wx_ctor_params :id
+end
+
+Wx::define_keyword_ctors(Wx::RearrangeList) do
+  wx_ctor_params :id, :pos, :size, :order, :items, :style
+  wx_ctor_params :validator, :name => 'rearrangeList'
+end
+
+Wx::define_keyword_ctors(Wx::RearrangeCtrl) do
+  wx_ctor_params :id, :pos, :size, :order, :items, :style
+  wx_ctor_params :validator, :name => 'rearrangeCtrl'
+end

data/lib/wx/pg/events.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::PG sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 require_relative './events/evt_list'
 

data/lib/wx/pg/keyword_defs.rb

@@ -1,6 +1,13 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # = WxSugar - Keyword Constructors Classes
 # Wx::PG sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 # wxPropertyGrid
 Wx::define_keyword_ctors(Wx::PG::PropertyGrid) do

data/lib/wx/pg/pg_editor.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 module Wx::PG
 

data/lib/wx/pg/pg_properties.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::PG property (and related) classes
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 module Wx::PG
 

data/lib/wx/pg/pg_property.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::PG::PGProperty
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 module Wx::PG
 
@@ -14,14 +17,24 @@ module Wx::PG
   class PGProperty
 
     wx_each_attribute = instance_method :each_attribute
-    define_method :each_attribute do |id|
+    define_method :each_attribute do
       if block_given?
-        wx_each_attribute.bind(self).call(id)
+        wx_each_attribute.bind(self).call
       else
-        ::Enumerator.new { |y| wx_each_attribute.bind(self).call(id) { |variant| y << variant } }
+        ::Enumerator.new { |y| wx_each_attribute.bind(self).call { |variant| y << variant } }
       end
     end
-    alias :attributes :each_attribute
+
+    def get_attributes
+      each_attribute.inject({}) { |map, v| map[v.name] = v; map }
+    end
+    alias :attributes :get_attributes
+
+    def set_attributes(map)
+      raise ArgumentError, 'Expected Hash' unless map.is_a?(::Hash)
+      map.each_pair { |nm, v| set_attribute(nm, v) }
+    end
+    alias :attributes= :set_attributes
   end
 
 end

data/lib/wx/pg/property_grid.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::PG::PropertyGrid
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 module Wx::PG
 

data/lib/wx/pg/property_grid_interface.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 module Wx::PG
 

data/lib/wx/pg/require.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::PG sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 require_relative './events'
 require_relative './keyword_defs'

data/lib/wx/pg.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::AUI sub package loader for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 
 require 'wx/core'

data/lib/wx/prt/keyword_defs.rb

@@ -1,6 +1,13 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # = WxSugar - Keyword Constructors Classes
 # Wx::PRT sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 # wxPrintDialog 	Standard print dialog
 Wx::define_keyword_ctors(Wx::PRT::PrintDialog) do

data/lib/wx/prt/page_setup_dialog.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 module Wx::PRT
 

data/lib/wx/prt/previewframe.rb

@@ -1,4 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Frame that displays a print preview
+
 class Wx::PRT::PreviewFrame
   # a PreviewFrame has a preview associated with it that must be
   # protected from Ruby's GC. However, there is no C++ method to access

data/lib/wx/prt/require.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::PRT sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 require_relative './keyword_defs'
 require_relative './previewframe'

data/lib/wx/prt.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::PRT sub package loader for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 
 require 'wx/core'

data/lib/wx/rbn/events.rb

@@ -1,4 +1,7 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::RBN sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 require_relative './events/evt_list'

data/lib/wx/rbn/keyword_defs.rb

@@ -1,6 +1,13 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # = WxSugar - Keyword Constructors Classes
 # Wx::RBN sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 # wxRibbonControl
 Wx::define_keyword_ctors(Wx::RBN::RibbonControl) do

data/lib/wx/rbn/require.rb

@@ -1,9 +1,13 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::RBN sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 require_relative './events'
 require_relative './keyword_defs'
 require_relative './ribbon_art_provider'
+require_relative './ribbon_bar'
 require_relative './ribbon_control'
 require_relative './ribbon_page'
 require_relative './ribbon_panel'

data/lib/wx/rbn/ribbon_art_provider.rb

@@ -1,4 +1,6 @@
-
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 module Wx::RBN
   # TODO - set default for OSX art provider when implemented

data/lib/wx/rbn/ribbon_bar.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 class Wx::RBN::RibbonBar
 

data/lib/wx/rbn/ribbon_button_bar.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 class Wx::RBN::RibbonButtonBar
 

data/lib/wx/rbn/ribbon_control.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 class Wx::RBN::RibbonControl
 

data/lib/wx/rbn/ribbon_gallery.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 class Wx::RBN::RibbonGallery
 
@@ -15,6 +18,13 @@ class Wx::RBN::RibbonGallery
   end
   alias :item_client_data :get_item_client_data
 
+  wx_append = instance_method :append
+  define_method :append do |bmp, item_id, data=nil|
+    item = wx_append.bind(self).call(bmp, item_id)
+    set_item_client_data(item, data) if item && data
+    item
+  end
+
   def items
     if block_given?
       count.times { |i| yield item(i) }

data/lib/wx/rbn/ribbon_page.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 class Wx::RBN::RibbonPage
 

data/lib/wx/rbn/ribbon_panel.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 class Wx::RBN::RibbonPanel
 

data/lib/wx/rbn/ribbon_tool_bar.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 class Wx::RBN::RibbonToolBar
 

data/lib/wx/rbn.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::RBN sub package loader for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 
 require 'wx/core'

data/lib/wx/rtc/ext.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Constant extension loader for Wx::RTC
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 module Wx::RTC
   if !defined?(::WxGlobalConstants)