wxruby3 0.9.0.pre.rc.3 → 0.9.1

data/lib/wx/core/colour.rb

@@ -1,3 +1,11 @@
+# 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
+
 class Wx::Colour
   # Redefine the initialize method so it raises an exception if an
   # invalid colour value is given. This might be an unknown colour

data/lib/wx/core/combo_ctrl.rb

@@ -0,0 +1,110 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+  class OwnerDrawnComboBox
+
+    # Make this a Ruby enumerable so find, find_all, map etc are available
+    include Enumerable
+
+    # Passes each valid item index into the passed block
+    def each
+      get_count.times { | i | yield i }
+    end
+
+    # We need to cache client data in Ruby variables as we cannot access items
+    # during the GC mark phase as for some platforms (WXMSW at least) that would
+    # involve calling methods that would break in that phase.
+
+    def client_data_store
+      @client_data ||= []
+    end
+    private :client_data_store
+
+    wx_set_client_data = instance_method :set_client_data
+    define_method :set_client_data do |item, data|
+      item = item.to_i
+      wx_set_client_data.bind(self).call(item, data)
+      client_data_store[item] = data
+    end
+
+    def get_client_data(item)
+      client_data_store[item.to_i]
+    end
+
+    wx_append = instance_method :append
+    define_method :append do |item, data=nil|
+      if data
+        if ::Array === item
+          if !(::Array === data)
+            ::Kernel.raise ::TypeError.new("Expected Array for argument 3")
+          elsif data.size != item.size
+            ::Kernel.raise ::ArgumentError.new("item and data array must be equal size")
+          end
+          offs = get_count
+          wx_append.bind(self).call(item)
+          item.size.times { |ix| set_client_data(offs+ix, data[ix]) }
+        else
+          wx_append.bind(self).call(item, data)
+          client_data_store[get_count-1] = data
+        end
+      else
+        wx_append.bind(self).call(item)
+        # no changes to data store
+      end
+    end
+
+    wx_insert = instance_method :insert
+    define_method :insert do |item, pos, data=nil|
+      if data
+        if ::Array === item
+          if !(::Array === data)
+            ::Kernel.raise ::TypeError.new("Expected Array for argument 3")
+          elsif data.size != item.size
+            ::Kernel.raise ::ArgumentError.new("item and data array must be equal size")
+          end
+          wx_insert.bind(self).call(item, pos)
+          client_data_store.insert(pos, *::Array.new(item.size))
+          item.size.times { |ix| set_client_data(pos+ix, data[ix]) }
+        else
+          wx_insert.bind(self).call(item, pos, data)
+          client_data_store.insert(pos, data)
+        end
+      else
+        wx_insert.bind(self).call(item, pos)
+        if ::Array === item
+          client_data_store.insert(pos, *::Array.new(item.size))
+        else
+          client_data_store.insert(pos, nil)
+        end
+      end
+    end
+
+    wx_set = instance_method :set
+    define_method :set do |items, data=nil|
+      if data
+        if !(::Array === data)
+          ::Kernel.raise ::TypeError.new("Expected Array for argument 2")
+        elsif data.size != items.size
+          ::Kernel.raise ::ArgumentError.new("items and data array must be equal size")
+        end
+      end
+      wx_set.bind(self).call(items)
+      client_data_store.clear
+      items.each_with_index { |item, ix| set_client_data(item, data[ix]) }
+    end
+
+    wx_clear = instance_method :clear
+    define_method :clear do
+      wx_clear.bind(self).call
+      client_data_store.clear
+    end
+
+    wx_delete = instance_method :delete
+    define_method :delete do |item|
+      wx_delete.bind(self).call(item.to_i)
+      client_data_store.slice!(item.to_i)
+    end
+  end
+end

data/lib/wx/core/combobox.rb

@@ -1,3 +1,10 @@
+# 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
 
 require_relative './controlwithitems'
 

data/lib/wx/core/config.rb

@@ -0,0 +1,303 @@
+# 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
+
+module Wx
+
+  class Config < Wx::ConfigBase
+
+    SEPARATOR = '/'.freeze
+
+    module Interface
+
+      def each(&block)
+        if block_given?
+          @data.each_pair(&block)
+        else
+          @data.each_pair
+        end
+      end
+
+      def each_entry(&block)
+        if block_given?
+          @data.keys.select { |k| !@data[k].is_a?(::Hash) }.each(&block)
+        else
+          ::Enumerator.new { |y| @data.keys.each { |k| y << k if !@data[k].is_a?(::Hash) } }
+        end
+      end
+
+      def each_group(&block)
+        if block_given?
+          @data.select { |_,g| g.is_a?(::Hash) }.each { |k,g| block.call(k, Group.new(self, self.path.dup.push(k), g)) }
+        else
+          ::Enumerator.new { |y| @data.each { |k,g| y << [k,Group.new(self, self.path.dup.push(k), g)] if g.is_a?(::Hash) } }
+        end
+      end
+
+      def number_of_entries(recurse: false)
+        if recurse
+          each_group.inject(each_entry.inject(0) { |c, _| c + 1 }) { |c, (_, g)| c + g.number_of_entries(recurse: true) }
+        else
+          each_entry.inject(0) { |c, _| c + 1 }
+        end
+      end
+
+      def number_of_groups(recurse: false)
+        if recurse
+          each_group.inject(0) { |c, (_,g)| c + 1 + g.number_of_groups(recurse: true) }
+        else
+          each_group.inject(0) { |c, _| c + 1 }
+        end
+      end
+
+      def has_entry?(path_str)
+        segments, abs = get_path(path_str)
+        return false if segments.empty?
+        entry = segments.pop
+        group_data = if segments.empty?
+                       @data
+                     else
+                       unless abs || root?
+                         segments = self.path + segments
+                       end
+                       get_group_at(segments)
+                     end
+        !!(group_data && group_data.has_key?(entry) && !group_data[entry].is_a?(::Hash))
+      end
+
+      def has_group?(path_str)
+        segments, abs = get_path(path_str)
+        return root? if segments.empty?
+        unless abs || root?
+          segments = self.path + segments
+        end
+        !!get_group_at(segments)
+      end
+
+      def get(key)
+        key = key.to_s
+        elem = @data[key]
+        if elem.is_a?(::Hash)
+          Group.new(self, self.path.dup.push(key), elem)
+        else
+          elem
+        end
+      end
+
+      def set(key, val)
+        key = key.to_s
+        exist = @data.has_key?(key)
+        elem = exist ? @data[key] : nil
+        if val.nil?
+          @data.delete(key) if exist
+          nil
+        elsif val.is_a?(::Hash)
+          raise ArgumentError, 'Cannot change existing value entry to group.' if exist && !elem.is_a?(::Hash)
+          elem  = @data[key] = {} unless elem
+          group = Group.new(self, self.path.dup.push(key), elem)
+          val.each_pair { |k, v| group.set(k, v) }
+          group
+        else
+          raise ArgumentError, 'Cannot change existing group to value entry.' if exist && elem.is_a?(::Hash)
+          @data[key] = sanitize_value(val)
+        end
+      end
+
+      def delete(key)
+        @data.delete(key.to_s)
+      end
+
+      def rename(old_key, new_key)
+        old_key = old_key.to_s
+        new_key = new_key.to_s
+        if @data.has_key?(old_key) && !@data.has_key?(new_key)
+          @data[new_key] = @data.delete(old_key)
+          true
+        else
+          false
+        end
+      end
+
+      def [](path_str)
+        segments, abs = get_path(path_str)
+        return nil if segments.empty?
+        last = segments.pop
+        group_data = if segments.empty?
+                       @data
+                     else
+                       unless abs || root?
+                         segments = self.path + segments
+                       end
+                       get_group_at(segments, create_missing_groups: true)
+                     end
+        raise ArgumentError, "Unable to resolve path #{segments+[last]}" unless group_data
+        elem = group_data[last]
+        if elem.is_a?(::Hash)
+          Group.new(self, segments.dup.push(last), elem)
+        else
+          elem
+        end
+      end
+
+      def []=(path_str, val)
+        segments, abs = get_path(path_str)
+        return false if segments.empty?
+        last = segments.pop
+        group_data = if segments.empty?
+                       @data
+                     else
+                       unless abs || root?
+                         segments = self.path + segments
+                       end
+                       get_group_at(segments, create_missing_groups: true)
+                     end
+        raise ArgumentError, "Unable to resolve path #{segments+[last]}" unless group_data
+        exist = group_data.has_key?(last)
+        elem = exist ? group_data[last] : nil
+        if val.nil?
+          group_data.delete(last) if exist
+          nil
+        elsif val.is_a?(::Hash)
+          raise ArgumentError, 'Cannot change existing value entry to group.' if exist && !elem.is_a?(::Hash)
+          elem  = group_data[last] = {} unless elem
+          group = Group.new(self, segments.dup.push(last), elem)
+          val.each_pair { |key, val| group.set(key, val) }
+          group
+        else
+          raise ArgumentError, 'Cannot change existing group to value entry.' if exist && elem.is_a?(::Hash)
+          group_data[last] = sanitize_value(val)
+        end
+      end
+
+      def to_s
+        SEPARATOR+self.path.join(SEPARATOR)
+      end
+
+      def to_h
+        @data
+      end
+
+      def get_path(path_str)
+        path_str = path_str.to_s
+        abs = path_str.start_with?(SEPARATOR)
+        segs = path_str.split(SEPARATOR)
+        segs.shift if abs
+        [segs, abs]
+      end
+      protected :get_path
+
+      def sanitize_value(val)
+        case val
+        when TrueClass, FalseClass, Numeric, String
+          val
+        else
+          if val.respond_to?(:to_int)
+            val.to_int
+          elsif val.respond_to?(:to_f)
+            val.to_f
+          else
+            val.to_s
+          end
+        end
+      end
+      protected :sanitize_value
+
+    end
+
+    class Group
+
+      include Interface
+
+      def initialize(parent, path, data)
+        @parent = parent
+        @path = path.freeze
+        @data = data
+      end
+
+      def root?
+        false
+      end
+
+      def root
+        @parent.root
+      end
+
+      def path
+        @path
+      end
+
+      def parent
+        @parent
+      end
+
+      def get_group_at(segments, create_missing_groups: false)
+        root.__send__(:get_group_at, segments)
+      end
+      protected :get_group_at
+
+    end
+
+    include Interface
+
+    def initialize(hash = nil)
+      @data = {}
+      replace(hash) if hash
+    end
+
+    def root?
+      true
+    end
+
+    def root
+      self
+    end
+
+    def path
+      []
+    end
+
+    def parent
+      nil
+    end
+
+    def replace(hash)
+      raise ArgumentError, 'Expected Hash' unless hash.is_a?(::Hash)
+      @data.clear
+      hash.each_pair { |k,v| self.set(k, v) }
+      self
+    end
+
+    def get_group_at(segments, create_missing_groups: false)
+      # prune segments (process relative segments)
+      segments = segments.inject([]) do |lst, seg|
+        case seg
+        when '..'
+          lst.pop # remove previous
+          # forget ..
+        when '.'
+          # forget
+        else
+          lst << seg
+        end
+        lst
+      end
+      # find group matching segments
+      segments.inject(@data) do |hsh, seg|
+        if hsh.has_key?(seg)
+          return nil unless hsh[seg].is_a?(::Hash)
+          hsh[seg]
+        else
+          return nil unless create_missing_groups
+          hsh[seg] = {}
+        end
+      end
+    end
+    protected :get_group_at
+
+  end
+
+end

data/lib/wx/core/const.rb

@@ -0,0 +1,83 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+
+module Wx
+
+=begin
+  These constants are not documented in the wxWidgets interface headers
+  although they are referenced in various argument defaults which *are*
+  in the interface header declarations so.
+=end
+
+  DEFAULT_DATE_TIME_FORMAT = '%c'
+  DEFAULT_TIME_SPAN_FORMAT = '%H:%M:%S'
+
+  CHOICE_NAME_STR = 'choice'
+  COLOUR_PICKER_CTRL_NAME_STR = 'colourpicker'
+  COLOUR_PICKER_WIDGET_NAME_STR = 'colourpickerwidget'
+  HYPERLINK_CTRL_NAME_STR = 'hyperlink'
+  PANEL_NAME_STR = 'panel'
+  LIST_BOX_NAME_STR = 'listBox'
+  FRAME_NAME_STR = 'frame'
+  STATUS_LINE_NAME_STR = 'status_line'
+  STATIC_BITMAP_NAME_STR = 'staticBitmap'
+  WEB_VIEW_NAME_STR = 'wxWebView'
+  ANIMATION_CTRL_NAME_STR = 'animationctrl'
+  TOOL_BAR_NAME_STR = 'toolbar'
+  TEXT_CTRL_NAME_STR = 'text'
+  LIST_CTRL_NAME_STR = 'listCtrl'
+  FILE_PICKER_CTRL_NAME_STR = 'filepicker'
+  FILE_PICKER_WIDGET_NAME_STR = 'filepickerwidget'
+  DIR_PICKER_CTRL_NAME_STR = 'dirpicker'
+  DIR_PICKER_WIDGET_NAME_STR = 'dirpickerwidget'
+  FILE_CTRL_NAME_STR = 'wxfilectrl'
+  FILE_SELECTOR_PROMPT_STR = 'Select a file'
+  STATIC_BOX_NAME_STR = 'groupBox'
+  BUTTON_NAME_STR = 'button'
+  RADIO_BOX_NAME_STR = 'radioBox'
+  STATIC_LINE_NAME_STR = 'staticLine'
+  RADIO_BUTTON_NAME_STR = 'radioButton'
+  BITMAP_RADIO_BUTTON_NAME_STR = 'radioButton'
+  GAUGE_NAME_STR = 'gauge'
+  DATA_VIEW_CTRL_NAME_STR = 'dataviewCtrl'
+  FONT_PICKER_CTRL_NAME_STR = 'fontpicker'
+  FONT_PICKER_WIDGET_NAME_STR = 'fontpickerwidget'
+  REARRANGE_LIST_NAME_STR = 'wxRearrangeList'
+  REARRANGE_DIALOG_NAME_STR = 'wxRearrangeDlg'
+  NOTEBOOK_NAME_STR = 'notebook'
+  CONTROL_NAME_STR = 'control'
+  SCROLL_BAR_NAME_STR = 'scrollBar'
+  STATUS_BAR_NAME_STR = 'statusBar'
+  SLIDER_NAME_STR = 'slider'
+  HEADER_CTRL_NAME_STR = 'wxHeaderCtrl'
+  BITMAP_COMBO_BOX_NAME_STR = 'bitmapComboBox'
+  CHECK_BOX_NAME_STR = 'check'
+  FILE_DIALOG_NAME_STR = 'filedlg'
+  ADD_REMOVE_CTRL_NAME_STR = 'wxAddRemoveCtrl'
+  STATIC_TEXT_NAME_STR = 'staticText'
+  COMBO_BOX_NAME_STR = 'comboBox'
+  SEARCH_CTRL_NAME_STR = 'searchCtrl'
+  TREE_CTRL_NAME_STR = 'treeCtrl'
+  DIALOG_NAME_STR = 'dialog'
+  COLLAPSIBLE_HEADER_CTRL_NAME_STR = 'collapsibleHeader'
+  COLLAPSIBLE_PANE_NAME_STR = 'collapsiblePane'
+  BANNER_WINDOW_NAME_STR = 'bannerwindow'
+  GRID_NAME_STR = 'grid'
+  TREE_LIST_CTRL_NAME_STR = 'wxTreeListCtrl'
+  HTML_LIST_BOX_NAME_STR = 'htmlListBox'
+  SIMPLE_HTML_LIST_BOX_NAME_STR = 'simpleHtmlListBox'
+  EDITABLE_LIST_BOX_NAME_STR = 'editableListBox'
+  V_LIST_BOX_NAME_STR = 'wxVListBox'
+
+  if Wx::PLATFORM == 'WXMSW'
+    # wxMSW only
+    MSW_HEADER_CTRL_NAME_STR = 'wxMSWHeaderCtrl'
+  end
+
+  PROPERTY_GRID_MANAGER_NAME_STR = 'wxPropertyGridManager'
+  PROPERTY_GRID_NAME_STR = 'wxPropertyGrid'
+  STC_NAME_STR = 'stcwindow'
+
+end

data/lib/wx/core/controlwithitems.rb

@@ -1,5 +1,14 @@
+# 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
+
 # Superclass of a variety of controls that display lists of items (eg
 # Choice, ListBox, CheckListBox)
+
 class Wx::ControlWithItems
 
   # Make these Ruby enumerables so find, find_all, map etc are available
@@ -127,7 +136,9 @@ class Wx::ControlWithItems
     end
     wx_set.bind(self).call(items)
     client_data_store.clear
-    items.each_with_index { |item, ix| set_client_data(item, data[ix]) }
+    if data
+      items.each_with_index { |item, ix| set_client_data(item, data[ix]) }
+    end
   end
 
   wx_clear = instance_method :clear

data/lib/wx/core/cursor.rb

@@ -1,10 +1,20 @@
+# 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
 
 module Wx
 
-  def self.Cursor(name, bmp_type = nil, *rest)
-    art_path = File.dirname(caller_path = caller_locations(1).first.absolute_path || caller_locations(1).first.path)
-    art_owner = File.basename(caller_path, '.*')
-    art_file = ArtLocator.find_art(name, art_type: :icon, art_path: art_path, art_section: art_owner, bmp_type: bmp_type)
+  def self.Cursor(name, bmp_type = nil, *rest, art_path: nil, art_section: nil)
+    unless art_path && art_section
+      caller_path = caller_locations(1).first.absolute_path || caller_locations(1).first.path
+      art_path = File.dirname(caller_path) unless art_path
+      art_section = File.basename(caller_path, '.*') unless art_section
+    end
+    art_file = ArtLocator.find_art(name, art_type: :cursor, art_path: art_path, art_section: art_section, bmp_type: bmp_type)
     ::Kernel.raise ArgumentError, "Cannot locate art file for #{name}:Cursor" unless art_file
     Cursor.new(art_file, bmp_type || Wx::Bitmap::BITMAP_TYPE_GUESS[File.extname(art_file).sub(/\A\./,'')], *rest)
   end

data/lib/wx/core/data_object.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
 

data/lib/wx/core/dataformat.rb

@@ -1,5 +1,14 @@
+# 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
+
 # Make this easier to use for multi-typed data objects. Comparison
 # doesn't work correctly in the SWIG binding
+
 class Wx::DataFormat
   def ==(other)
     if self.get_type > Wx::DataFormatId::DF_INVALID

data/lib/wx/core/datetime.rb

@@ -0,0 +1,14 @@
+# 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
+
+module Wx
+
+  DEFAULT_DATE_TIME = nil
+  DefaultDateTime = DEFAULT_DATE_TIME
+
+end

data/lib/wx/core/dc.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
   # Class for drawing primitives and bitmaps on various outputs (screen, paper)

data/lib/wx/core/dialog.rb

@@ -1,8 +1,25 @@
+# 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 - Dialog functors for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 class Wx::Dialog
 
+  class << self
+
+    wx_set_layout_adapter = instance_method :set_layout_adapter
+    define_method :set_layout_adapter do |adapter|
+      prev_adapter = wx_set_layout_adapter.bind(self).call(adapter)
+      @adapter = adapter # cache here to prevent premature GC collection
+    end
+
+  end
+
   module Functor
     def self.included(klass)
       scope = klass.name.split('::')

data/lib/wx/core/enum.rb

@@ -1,3 +1,10 @@
+# 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
 
 class Wx::Enum
 

data/lib/wx/core/event.rb

@@ -1,3 +1,10 @@
+# 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
 
 require_relative './evthandler'
 

data/lib/wx/core/event_blocker.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
 

data/lib/wx/core/event_loop.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx