wxruby3 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74651be50bce49af8e8f2f5cfa6b75a103719aa06ac0cec8846a19397e6e32e8
-  data.tar.gz: aa9b54f0317028cf4677723c32926223115c0672b95484cec7586a42bf290ed5
+  metadata.gz: 25ead08d281891ae9ad295a8181908c163677a4b9e0686249185941866118d49
+  data.tar.gz: 552bef0440f00907f30b273411dbfed19b8430bfbf49538efac2cd6104e6021b
 SHA512:
-  metadata.gz: daf1119a3e6c64bb5c42b2ab52ea9c553852e165392f8f98d51f89e0600edddfce5b1a9c4c57753f72c8b4da7a7eb8a883f0f01ec81c139c4cebb30b818a74a6
-  data.tar.gz: 682f3174d7accd03170735daf81d570f3895fec6594d7713db4fa99b9adfc21e5b91b9f85a670c5a2764369e59cebdc0978dabad37fb26c34d0bb62fcd8a9b34
+  metadata.gz: 598918c1e5d613797115ede72de7cc8024bf6468ee81a51b567297c153df12da11390740fca827b67c15dae9e2e874b38969088bf27e808b644fc810abb1a6c0
+  data.tar.gz: bf26ee5eebeef682e88831df0a0bb7b260138e4cae2c6f41425a327133c7f60fce0b5897bb722b5eb05acbdbefa92fb6e860235d2942cd0e35ef42919ca2354d

data/INSTALL.md

@@ -73,7 +73,7 @@ The following tables lists the packages provided by the current wxRuby3 release
 
 | OS      | Distributions                          | Architectures           | Rubies                                             |
 |---------|----------------------------------------|-------------------------|----------------------------------------------------|
-| Linux   | OpenSuSE Leap (at least latest stable) | x86_64 <b>and</b> ARM64 | Distro provided Ruby <b>and</b> Latest stable Ruby |  
+| Linux   | OpenSuSE Leap (at least latest stable) | x86_64 <b>and</b> ARM64 | Latest stable Ruby |  
 | Linux   | Fedora (at least latest stable)        | x86_64 <b>and</b> ARM64 | Distro provided Ruby <b>and</b> Latest stable Ruby |  
 | Linux   | Debian (at least latest stable)        | x86_64 <b>and</b> ARM64 | Distro provided Ruby <b>and</b> Latest stable Ruby |  
 | Linux   | Ubuntu (at least latest stable)        | x86_64 <b>and</b> ARM64 | Distro provided Ruby <b>and</b> Latest stable Ruby |
@@ -101,7 +101,7 @@ The software requirements for setting up a wxRuby3 runtime environment are:
 
 | Sofware                                       | Notes                                                                                                                                                                                                                                                                                                                        |
 |-----------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Ruby                                          | A supported version of the Ruby interpreter needs to be installed. This is an absolute requirement for any installation as one cannot install gems without Ruby and building from source requires Ruby to drive the build process.                                                                                           |
+| Ruby >= 2.7                                   | A supported version of the Ruby interpreter needs to be installed. This is an absolute requirement for any installation as one cannot install gems without Ruby and building from source requires Ruby to drive the build process.                                                                                           |
 | C++ compiler<br>(incl. dev tools like `make`) | Required for a source based installation to build wxWidgets (optionally) and the wxRuby extension libraries.<br/>On linux a recent version of the GNU C++ compiler (with c++-14 support) is required.<br>On Windows the RubyInstaller MSYS2-Devkit would be required.<br>On MacOS XCode with commandline tools would be required. |
 | Git version control toolkit                   | Required for a source based installation in to (possibly) clone a copy of the wxWidgets Github repository or to clone the Github repository of wxRuby3 itself for a fully source based installation.                                                                                                                         |
 | Doxygen (>= 1.9.1)                            | Required for building the wxRuby3 extension libraries for a source based installation. [**1**]                                                                                                                                                                                                                               |

data/README.md

@@ -101,9 +101,9 @@ Currently the following are fully supported:
 
 | Platform                                                                                                                           | Ruby version(s)                                     | wxWidgets version(s) |
 |------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------|----------------------|
-| Windows >= 10                                                                                                                      | Ruby >= 2.5<br>(RubyInstaller MSYS2-DevKit)         | wxWidgets >= 3.2     |
-| Linux (tested; all major AMD64 and ARM64 distributions: Ubuntu, Debian, Fedora, OpenSuSE and ArchLinux)<br>(most likely also i686) | Ruby >= 2.5                                         | wxWidgets >= 3.2     |
-| MacOS >= 10.10 using Cocoa (tested on AMD64 and ARM64 M1/M2 Chip)                                                                  | Ruby >= 2.5 (MacPorts, Homebrew, ruby-install, RVM) | wxWidgets >= 3.2     |
+| Windows >= 10                                                                                                                      | Ruby >= 2.7<br>(RubyInstaller MSYS2-DevKit)         | wxWidgets >= 3.2     |
+| Linux (tested; all major AMD64 and ARM64 distributions: Ubuntu, Debian, Fedora, OpenSuSE and ArchLinux)<br>(most likely also i686) | Ruby >= 2.7                                         | wxWidgets >= 3.2     |
+| MacOS >= 10.10 using Cocoa (tested on AMD64 and ARM64 M1/M2 Chip)                                                                  | Ruby >= 2.7 (MacPorts, Homebrew, ruby-install, RVM) | wxWidgets >= 3.2     |
 
 Support for other platforms is not being actively developed at present,
 but patches are welcome. It is likely to be much simpler to get wxRuby

data/ext/wxruby3/swig/mark_free_impl.i

@@ -57,6 +57,8 @@ WXRUBY_EXPORT void GC_SetWindowDeleted(void *ptr)
   while (wxevh && wxevh != wxwin)
   {
     wxEvtHandler* wxevh_next = wxevh->GetNextHandler();
+    // disable these too
+    wxevh->SetEvtHandlerEnabled(false);
     VALUE rb_evh = SWIG_RubyInstanceFor(wxevh);
     // only remove tracked Ruby instantiated handlers since others are
     // handlers internally set by wxWidgets C++ code and will be removed there

data/lib/wx/core/variant.rb

@@ -40,6 +40,8 @@ module Wx
           return "[#{each.collect { |v| v.string? ? %Q{"#{v.to_s}"} : v.to_s }.join(', ')}]"
         when 'arrstring'
           return array_string.to_s
+        when 'wxArrayInt'
+          return array_int.to_s
         when 'wxFont'
           return font.to_s
         when 'wxColour'
@@ -97,6 +99,10 @@ module Wx
       !null? && is_type('arrstring');
     end
 
+    def array_int?
+      !null? && is_type('wxArrayInt');
+    end
+
     def font?
       !null? && is_type('wxFont');
     end

data/lib/wx/doc/pg/pg_property.rb

@@ -11,6 +11,11 @@ module Wx::PG
 
   PG_DEFAULT_IMAGE_SIZE = Wx::DEFAULT_SIZE
 
+  # Shifts mask << 16.
+  # @param [Wx::Enum, Integer]
+  # @return [Wx::Enum, Integer]
+  def self.PG_IT_CHILDREN(mask) end
+
   class PGProperty
 
     # Iterate each attribute.

data/lib/wx/doc/variant.rb

@@ -11,6 +11,28 @@ module Wx
 
     include ::Enumerable
 
+    # @overload initialize(val, name=(''))
+    #   Constructs a variant from a Array<Integer>.
+    #   @param val [Array<Integer>]
+    #   @param name [String]
+    #   @return [Wx::Variant]
+    # @overload initialize(val, name=(''))
+    #   Constructs a variant from a {Wx::Font}.
+    #   @param val [Wx::Font]
+    #   @param name [String]
+    #   @return [Wx::Variant]
+    # @overload initialize(val, name=(''))
+    #   Constructs a variant from a {Wx::Colour}.
+    #   @param val [Wx::Colour]
+    #   @param name [String]
+    #   @return [Wx::Variant]
+    # @overload initialize(val, name=(''))
+    #   Constructs a variant from a {Wx::ColourPropertyValue}.
+    #   @param val [Wx::ColourPropertyValue]
+    #   @param name [String]
+    #   @return [Wx::Variant]
+    def initialize(*args) end
+
     # When a block is given iterates all items of a variant list passing
     # each item to the block.
     # Returns an enumerator when no block is given.
@@ -68,6 +90,10 @@ module Wx
     #   @return [self]
     # @overload assign(value)
     #   Equality test operator.
+    #   @param value [Array<Integer>]
+    #   @return [self]
+    # @overload assign(value)
+    #   Equality test operator.
     #   @param value [Time,Date,DateTime]
     #   @return [self]
     def assign(*args) end
@@ -135,6 +161,10 @@ module Wx
     # @return [true,false]
     def array_string?; end
 
+    # Checks if Variant contains an ArrayInt (array of integer) value (not null).
+    # @return [true,false]
+    def array_int?; end
+
     # Checks if Variant contains a Font value (not null).
     # @return [true,false]
     def font?; end

data/lib/wx/pg/pg_property.rb

@@ -4,71 +4,78 @@
 
 # Wx::PG::PGProperty
 
-module Wx::PG
-
-  NullProperty = nil
-  PGChoicesEmptyData = nil
-
-  PG_LABEL_STRING = '@!' unless self.const_defined?(:PG_LABEL_STRING) # disappeared >= wxWidgets 3.3.0
-  PG_LABEL = Wx::PG::PG_LABEL_STRING
-
-  PG_DEFAULT_IMAGE_SIZE = Wx::DEFAULT_SIZE
-
-  if Wx.at_least_wxwidgets?('3.3.0')
-    # backward compatibility constants
-    PG_FULL_VALUE                     = PGPropValFormatFlags::FullValue
-    PG_REPORT_ERROR                   = PGPropValFormatFlags::ReportError
-    PG_PROPERTY_SPECIFIC              = PGPropValFormatFlags::PropertySpecific
-    PG_EDITABLE_VALUE                 = PGPropValFormatFlags::EditableValue
-    PG_COMPOSITE_FRAGMENT             = PGPropValFormatFlags::CompositeFragment
-    PG_UNEDITABLE_COMPOSITE_FRAGMENT  = PGPropValFormatFlags::UneditableCompositeFragment
-    PG_VALUE_IS_CURRENT               = PGPropValFormatFlags::ValueIsCurrent
-    PG_PROGRAMMATIC_VALUE             = PGPropValFormatFlags::ProgrammaticValue
-  end
+module Wx
+  module PG
 
-  class PGProperty
+    NullProperty = nil
+    PGChoicesEmptyData = nil
 
-    wx_each_attribute = instance_method :each_attribute
-    wx_redefine_method :each_attribute do
-      if block_given?
-        wx_each_attribute.bind(self).call
-      else
-        ::Enumerator.new { |y| wx_each_attribute.bind(self).call { |variant| y << variant } }
-      end
-    end
+    PG_LABEL_STRING = '@!' unless self.const_defined?(:PG_LABEL_STRING) # disappeared >= wxWidgets 3.3.0
+    PG_LABEL = Wx::PG::PG_LABEL_STRING
+
+    PG_DEFAULT_IMAGE_SIZE = Wx::DEFAULT_SIZE
 
-    def get_attributes
-      each_attribute.inject({}) { |map, v| map[v.name] = v; map }
+    if Wx.at_least_wxwidgets?('3.3.0')
+      # backward compatibility constants
+      PG_FULL_VALUE                     = PGPropValFormatFlags::FullValue
+      PG_REPORT_ERROR                   = PGPropValFormatFlags::ReportError
+      PG_PROPERTY_SPECIFIC              = PGPropValFormatFlags::PropertySpecific
+      PG_EDITABLE_VALUE                 = PGPropValFormatFlags::EditableValue
+      PG_COMPOSITE_FRAGMENT             = PGPropValFormatFlags::CompositeFragment
+      PG_UNEDITABLE_COMPOSITE_FRAGMENT  = PGPropValFormatFlags::UneditableCompositeFragment
+      PG_VALUE_IS_CURRENT               = PGPropValFormatFlags::ValueIsCurrent
+      PG_PROGRAMMATIC_VALUE             = PGPropValFormatFlags::ProgrammaticValue
     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) }
+    def self.PG_IT_CHILDREN(mask)
+      mask << 16
     end
-    alias :attributes= :set_attributes
-  end
 
-  class PGChoices
+    class PGProperty
+
+      wx_each_attribute = instance_method :each_attribute
+      wx_redefine_method :each_attribute do
+        if block_given?
+          wx_each_attribute.bind(self).call
+        else
+          ::Enumerator.new { |y| wx_each_attribute.bind(self).call { |variant| y << variant } }
+        end
+      end
 
-    wx_each_label = instance_method :each_label
-    wx_redefine_method :each_label do
-      if block_given?
-        wx_each_label.bind(self).call
-      else
-        ::Enumerator.new { |y| wx_each_label.bind(self).call { |lbl| y << lbl } }
+      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
 
-    wx_each_entry = instance_method :each_entry
-    wx_redefine_method :each_entry do
-      if block_given?
-        wx_each_entry.bind(self).call
-      else
-        ::Enumerator.new { |y| wx_each_entry.bind(self).call { |entry| y << entry } }
+    class PGChoices
+
+      wx_each_label = instance_method :each_label
+      wx_redefine_method :each_label do
+        if block_given?
+          wx_each_label.bind(self).call
+        else
+          ::Enumerator.new { |y| wx_each_label.bind(self).call { |lbl| y << lbl } }
+        end
+      end
+
+      wx_each_entry = instance_method :each_entry
+      wx_redefine_method :each_entry do
+        if block_given?
+          wx_each_entry.bind(self).call
+        else
+          ::Enumerator.new { |y| wx_each_entry.bind(self).call { |entry| y << entry } }
+        end
       end
+
     end
-    
+
   end
-  
+
 end

data/lib/wx/pg/property_grid_interface.rb

@@ -19,6 +19,16 @@ module Wx::PG
   
   module PropertyGridInterface
 
+    wx_set_property_value = instance_method :set_property_value
+    wx_redefine_method :set_property_value do |propid, value|
+      case value
+      when ::String
+        set_property_value_string(propid, value)
+      else
+        wx_set_property_value.bind(self).call(propid, value)
+      end
+    end
+
     wx_each_property = instance_method :each_property
     wx_redefine_method :each_property do |flags = Wx::PG::PG_ITERATE_DEFAULT, start = nil, reverse: false, &block|
       if block

data/lib/wx/version.rb

@@ -3,5 +3,5 @@
 # This software is released under the MIT license.
 
 module Wx
-  WXRUBY_VERSION    = '1.6.0'
+  WXRUBY_VERSION    = '1.6.1'
 end

data/rakelib/gem.rake

@@ -12,6 +12,8 @@ namespace :wxruby do
 
   namespace :gem do
 
+    task :srcgemspec => ['bin:build', WXRuby3::Gem.gemspec_file]
+
     task :srcgem => ['bin:build', WXRuby3::Gem.gem_file]
 
     # this task only exists for installed (source) gems (where run tasks have been removed)
@@ -60,72 +62,87 @@ namespace :wxruby do
 
 end
 
+file WXRuby3::Gem.gemspec_file => WXRuby3::Gem.manifest do |t|
+  code = <<~__GEMSPEC
+    Gem::Specification.new('wxruby3', '#{WXRuby3::WXRUBY_VERSION}') do |gem|
+      gem.summary = %Q{wxWidgets extension for Ruby}
+      gem.description = %Q{wxRuby3 is a Ruby library providing an extension for the wxWidgets C++ UI framework}
+      gem.email = 'mcorino@m2c-software.nl'
+      gem.homepage = "https://github.com/mcorino/wxRuby3"
+      gem.authors = ['Martin Corino']
+      gem.extensions = ['ext/mkrf_conf_ext.rb']
+      gem.files = [#{WXRuby3::Gem.manifest.collect {|f| "'#{f}'" }.join(',')}]
+      gem.require_paths = %w{lib}
+      gem.bindir = 'bin'
+      gem.executables = [#{WXRuby3::Bin.binaries.collect { |b| "'#{b}'" }.join(',')}]
+      gem.required_ruby_version = '>= 2.5'
+      gem.licenses = ['MIT']
+      gem.add_dependency 'nokogiri', '~> 1.12'
+      gem.add_dependency 'rake'
+      gem.add_dependency 'minitest', '~> 5.15'
+      gem.add_dependency 'test-unit', '~> 3.5'
+      gem.add_dependency 'plat4m', '~> 1.1'
+      gem.rdoc_options <<
+        '--exclude=\\.dll' <<
+        '--exclude=\\.so' <<
+        '--exclude=lib/wx.rb' <<
+        '--exclude=lib/wx/*.rb' <<
+        "'--exclude=lib/wx/(aui|core|grid|html|pg|prt|rbn|rtc|stc|wxruby)/.*'"
+      gem.metadata = {
+        "bug_tracker_uri"   => "https://github.com/mcorino/wxRuby3/issues",
+        "homepage_uri"      => "https://github.com/mcorino/wxRuby3/wiki",
+        "source_code_uri"   => "https://github.com/mcorino/wxRuby3",
+        "documentation_uri" => "https://mcorino.github.io/wxRuby3",
+        "github_repo"       => "https://github.com/mcorino/wxRuby3"
+      }
+      gem.post_install_message = <<~__MSG
+  
+        The wxRuby3 Gem has been successfully installed including the 'wxruby' utility.
+  
+        In case no suitable binary release package was available for your platform you  
+        will need to run the post-install setup process by executing:
+  
+        $ wxruby setup
+  
+        To check whether wxRuby3 is ready to run or not you can at any time execute the 
+        following command:
+  
+        $ wxruby check
+  
+        Run 'wxruby check -h' for more information.
+  
+        When the wxRuby3 setup has been fully completed you can start using wxRuby3.
+   
+        You can run the regression tests to verify the installation by executing:
+  
+        $ wxruby test
+  
+        The wxRuby3 sample explorer can be run by executing:
+  
+        $ wxruby sampler
+  
+        Have fun using wxRuby3.
+  
+        Run 'wxruby -h' to see information on the available commands.
+  
+        __MSG
+      gem.required_rubygems_version = '>= 0' if gem.respond_to? :required_rubygems_version=
+    end
+    __GEMSPEC
+  File.open(t.name, 'w') { |f| f.puts code }
+end
+
+
+CLOBBER.include WXRuby3::Gem.gemspec_file
+
+desc 'Build wxRuby 3 gemspec'
+task :gemspec => 'wxruby:gem:srcgemspec'
+
+directory 'pkg'
+
 # source gem file
-file WXRuby3::Gem.gem_file => WXRuby3::Gem.manifest do
-  gemspec = WXRuby3::Gem.define_spec do |gem|
-    gem.summary = %Q{wxWidgets extension for Ruby}
-    gem.description = %Q{wxRuby3 is a Ruby library providing an extension for the wxWidgets C++ UI framework}
-    gem.email = 'mcorino@m2c-software.nl'
-    gem.homepage = "https://github.com/mcorino/wxRuby3"
-    gem.authors = ['Martin Corino']
-    gem.extensions = ['ext/mkrf_conf_ext.rb']
-    gem.files = WXRuby3::Gem.manifest
-    gem.require_paths = %w{lib}
-    gem.bindir = 'bin'
-    gem.executables = WXRuby3::Bin.binaries
-    gem.required_ruby_version = '>= 2.5'
-    gem.licenses = ['MIT']
-    gem.add_dependency 'nokogiri', '~> 1.12'
-    gem.add_dependency 'rake'
-    gem.add_dependency 'minitest', '~> 5.15'
-    gem.add_dependency 'test-unit', '~> 3.5'
-    gem.add_dependency 'plat4m', '~> 1.1'
-    gem.rdoc_options <<
-      '--exclude=\\.dll' <<
-      '--exclude=\\.so' <<
-      '--exclude=lib/wx.rb' <<
-      '--exclude=lib/wx/*.rb' <<
-      "'--exclude=lib/wx/(aui|core|grid|html|pg|prt|rbn|rtc|stc|wxruby)/.*'"
-    gem.metadata = {
-      "bug_tracker_uri"   => "https://github.com/mcorino/wxRuby3/issues",
-      "homepage_uri"      => "https://github.com/mcorino/wxRuby3/wiki",
-      "source_code_uri"   => "https://github.com/mcorino/wxRuby3",
-      "documentation_uri" => "https://mcorino.github.io/wxRuby3",
-      "github_repo"       => "https://github.com/mcorino/wxRuby3"
-    }
-    gem.post_install_message = <<~__MSG
-
-      The wxRuby3 Gem has been successfully installed including the 'wxruby' utility.
-
-      In case no suitable binary release package was available for your platform you  
-      will need to run the post-install setup process by executing:
-
-      $ wxruby setup
-
-      To check whether wxRuby3 is ready to run or not you can at any time execute the 
-      following command:
-
-      $ wxruby check
-
-      Run 'wxruby check -h' for more information.
-
-      When the wxRuby3 setup has been fully completed you can start using wxRuby3.
- 
-      You can run the regression tests to verify the installation by executing:
-
-      $ wxruby test
-
-      The wxRuby3 sample explorer can be run by executing:
-
-      $ wxruby sampler
-
-      Have fun using wxRuby3.
-
-      Run 'wxruby -h' to see information on the available commands.
-
-      __MSG
-  end
-  WXRuby3::Gem.build_gem(gemspec)
+file WXRuby3::Gem.gem_file => ['wxruby:gem:srcgemspec', 'pkg'] do
+  WXRuby3.config.sh "gem build #{WXRuby3::Gem.gemspec_file} -o #{WXRuby3::Gem.gem_file}"
 end
 
 desc 'Build wxRuby 3 gem'
@@ -145,7 +162,7 @@ if File.file?(File.join(__dir__, 'run.rake'))
     end
 
     # binary package file
-    file WXRuby3::Gem.bin_pkg_file => WXRuby3::Gem.bin_pkg_manifest do |t|
+    file WXRuby3::Gem.bin_pkg_file => [*WXRuby3::Gem.bin_pkg_manifest, 'pkg'] do |t|
       WXRuby3::Install.install_wxwin_shlibs
       begin
         # create bin package

data/rakelib/gem.rb

@@ -8,11 +8,6 @@
 
 require 'set'
 require 'rubygems'
-require 'rubygems/package'
-begin
-  require 'rubygems/builder'
-rescue LoadError
-end
 require 'zlib'
 require 'tempfile'
 require 'json'
@@ -62,20 +57,12 @@ module WXRuby3
       end
       private :gem_name
 
-      def gem_file
-        File.join('pkg', "#{gem_name}.gem")
+      def gemspec_file
+        "#{gem_name}.gemspec"
       end
 
-      def build_gem(gemspec)
-        if defined?(::Gem::Package) && ::Gem::Package.respond_to?(:build)
-          gem_file_name = ::Gem::Package.build(gemspec)
-        else
-          gem_file_name = ::Gem::Builder.new(gemspec).build
-        end
-
-        FileUtils.mkdir_p('pkg')
-
-        FileUtils.mv(gem_file_name, 'pkg')
+      def gem_file
+        File.join('pkg', "#{gem_name}.gem")
       end
 
       # Binary package helpers
@@ -122,9 +109,6 @@ module WXRuby3
       end
 
       def build_bin_pkg
-        # make sure pkg directory exists
-        FileUtils.mkdir_p('pkg')
-
         fname = bin_pkg_file
 
         # package registry and essential config

data/rakelib/lib/config.rb

@@ -83,10 +83,10 @@ module WXRuby3
   CONFIG['autoinstall'] = (ENV['WXRUBY_AUTOINSTALL'] != '0') if ENV['WXRUBY_AUTOINSTALL']
   BUILD_CFG = '.wxconfig'
 
-  # Ruby 2.5 is the minimum version for wxRuby3
+  # Ruby 2.7 is the minimum version for wxRuby3
   __rb_ver = RUBY_VERSION.split('.').collect {|v| v.to_i}
-  if (__rb_major = __rb_ver.shift) < 2 || (__rb_major == 2 && __rb_ver.shift < 5)
-    $stderr.puts 'ERROR: wxRuby3 requires Ruby >= 2.5.0!'
+  if (__rb_major = __rb_ver.shift) < 2 || (__rb_major == 2 && __rb_ver.shift < 7)
+    $stderr.puts 'ERROR: wxRuby3 requires Ruby >= 2.7.0!'
     exit(1)
   end
 

data/rakelib/lib/core/spec.rb

@@ -102,7 +102,7 @@ module WXRuby3
       end
 
       def class_implementation(cls)
-        @class_implementations[cls] || cls
+        @class_implementations[classdef_name(cls)] || cls
       end
 
       def use_template_as_class(tpl, cls)

data/rakelib/lib/director/bitmap_combobox.rb

@@ -24,8 +24,10 @@ module WXRuby3
                                            wxWindow
                                            wxEvtHandler
                                            wxObject])
-        spec.ignore 'wxBitmapComboBox::Insert(const wxString &, const wxBitmap &, unsigned int, void *)',
-                    'wxBitmapComboBox::Append(const wxString &, const wxBitmap &, void *)'
+        if Config.instance.wx_version_check('3.3.0') <= 0
+          spec.ignore 'wxBitmapComboBox::Insert(const wxString &, const wxBitmap &, unsigned int, void *)',
+                      'wxBitmapComboBox::Append(const wxString &, const wxBitmap &, void *)'
+        end
         spec.map_apply 'long * OUTPUT' => [ 'long *from', 'long *to' ]
       end
 

data/rakelib/lib/director/html_listbox.rb

@@ -19,7 +19,11 @@ module WXRuby3
       def setup
         spec.items << 'wxSimpleHtmlListBox' << 'wxItemContainer'
         super
-        spec.override_inheritance_chain('wxHtmlListBox', ['wxVListBox', { 'wxVScrolledWindow' => 'wxHVScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        if Config.instance.wx_version_check('3.3.0') > 0
+          spec.override_inheritance_chain('wxHtmlListBox', ['wxVListBox', 'wxVScrolledWindow', 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        else
+          spec.override_inheritance_chain('wxHtmlListBox', ['wxVListBox', { 'wxVScrolledWindow' => 'wxHScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        end
         spec.make_abstract 'wxHtmlListBox'
         # provide base implementation for OnGetItem
         spec.add_header_code <<~__HEREDOC
@@ -62,10 +66,16 @@ module WXRuby3
                               'virtual void OnDrawBackground(wxDC &dc, const wxRect &rect, size_t n) const',
                               'virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const',
                               visibility: 'protected'
-        spec.no_proxy 'wxVListBox::OnGetRowHeight'
+        # optimize; no need for these virtuals here
+        spec.no_proxy 'wxHtmlListBox::OnGetRowHeight',
+                      'wxHtmlListBox::OnGetRowsHeightHint'
 
         # override inheritance chain
-        spec.override_inheritance_chain('wxSimpleHtmlListBox', ['wxHtmlListBox', 'wxVListBox', { 'wxVScrolledWindow' => 'wxHVScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        if Config.instance.wx_version_check('3.3.0') > 0
+          spec.override_inheritance_chain('wxSimpleHtmlListBox', ['wxHtmlListBox', 'wxVListBox', 'wxVScrolledWindow', 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        else
+          spec.override_inheritance_chain('wxSimpleHtmlListBox', ['wxHtmlListBox', 'wxVListBox', { 'wxVScrolledWindow' => 'wxHScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        end
         spec.fold_bases('wxSimpleHtmlListBox' => %w[wxItemContainer])
         # override SWIG's confusion
         spec.make_concrete 'wxSimpleHtmlListBox'
@@ -100,6 +110,9 @@ module WXRuby3
                       'wxItemContainer::Append(const wxArrayString &, wxClientData **)',
                       'wxItemContainer::Insert(const wxArrayString &, unsigned int, wxClientData **)',
                       'wxItemContainer::Set(const wxArrayString &, wxClientData **)'], ignore_doc: false)
+        # optimize; no need for these virtuals here
+        spec.no_proxy 'wxSimpleHtmlListBox::OnGetRowHeight',
+                      'wxSimpleHtmlListBox::OnGetRowsHeightHint'
         # for doc only
         spec.map 'void** clientData' => 'Array', swig: false do
           map_in code: ''