wxruby3 1.5.4 → 1.6.1

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::WXWIDGETS_VERSION >= '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.5.4'
+  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/mingw.rb

@@ -177,7 +177,7 @@ module WXRuby3
           @rescomp << ' --define __WXMSW__ --define wxUSE_DPI_AWARE_MANIFEST=2 --define wxUSE_RC_MANIFEST=1 --define ISOLATION_AWARE_ENABLED'
           @rescomp << ' --define WXUSINGDLL'
           @extra_cflags << '-DISOLATION_AWARE_ENABLED'
-          if @wx_version >= '3.3.0'
+          if wx_version_check('3.3.0') >= 0
             @extra_cflags << '-D_UNICODE' << '-DUNICODE'
           end
         end

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
 
@@ -728,6 +728,12 @@ module WXRuby3
             @wx_version || ''
           end
 
+          def wx_version_check(ver)
+            @wx_version_list ||= (@wx_version || '0.0.0').split('.').collect {|s| s.to_i }
+            ver = ver.split('.').collect {|s| s.to_i }  unless ::Array === ver
+            @wx_version_list <=> ver
+          end
+
           def mingw?
             @platform == :mingw
           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/affine_matrix.rb

@@ -19,6 +19,39 @@ module WXRuby3
         spec.disable_proxies
 
         spec.map_apply 'int * OUTPUT' => ['wxDouble *']
+        spec.ignore 'wxAffineMatrix2DBase::TransformPoint(wxDouble*, wxDouble*)',
+                    'wxAffineMatrix2DBase::TransformDistance(wxDouble*, wxDouble*)'
+
+        spec.map 'wxPoint2DDouble&' => 'Array(Float, Float), Wx::Point2DDouble' do
+          add_header_code '#include <memory>'
+          map_in temp: 'std::unique_ptr<$1_basetype> tmp', code: <<~__CODE
+            if ( TYPE($input) == T_DATA )
+            {
+              void* argp$argnum;
+              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0);
+              $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
+            }
+            else if ( TYPE($input) == T_ARRAY )
+            {
+              $1 = new $1_basetype( NUM2DBL( rb_ary_entry($input, 0) ),
+                                    NUM2DBL( rb_ary_entry($input, 1) ) );
+              tmp.reset($1); // auto destruct when method scope ends 
+            }
+            else
+            {
+              rb_raise(rb_eTypeError, "Wrong type for $1_basetype parameter");
+            }
+            __CODE
+          map_typecheck precedence: 'POINTER', code: <<~__CODE
+            void *vptr = 0;
+            $1 = 0;
+            if (TYPE($input) == T_ARRAY && RARRAY_LEN($input) == 2)
+              $1 = 1;
+            else if (TYPE($input) == T_DATA && SWIG_CheckState (SWIG_ConvertPtr ($input, &vptr, $1_descriptor, 0)))
+              $1 = 1;
+            __CODE
+        end
+
         spec.map 'wxPoint2DDouble *' => 'Wx::Point2DDouble' do
           map_in ignore: true, temp: 'wxPoint2DDouble tmp', code: '$1 = &tmp;'
 

data/rakelib/lib/director/animation_ctrl.rb

@@ -21,7 +21,7 @@ module WXRuby3
         spec.items << 'wxGenericAnimationCtrl'
         spec.include 'wx/animate.h'
         spec.include 'wx/generic/animate.h'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.items << 'wxAnimationBundle'
           spec.ignore 'wxAnimationBundle::GetAll', ignore_doc: false
           spec.add_extend_code 'wxAnimationBundle', <<~__HEREDOC

data/rakelib/lib/director/app.rb

@@ -16,7 +16,7 @@ module WXRuby3
 
       def setup
         spec.items << 'wxAppConsole' << 'wxEventFilter'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.items << 'wxDarkModeSettings'
           spec.ignore_unless('WXMSW', 'wxDarkModeSettings', 'wxMenuColour')
           if Config.instance.features_set?('WXMSW')

data/rakelib/lib/director/aui_manager.rb

@@ -17,7 +17,7 @@ module WXRuby3
       def setup
         super
         spec.gc_as_object 'wxAuiManager'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.items  << 'wxAuiBookSerializer' << 'wxAuiSerializer' <<
                          'wxAuiDockLayoutInfo' << 'wxAuiPaneLayoutInfo' << 'wxAuiTabLayoutInfo' <<
                          'wxAuiBookDeserializer' << 'wxAuiDeserializer'
@@ -303,7 +303,7 @@ module WXRuby3
 
       def gen_class_doc_members(fdoc, clsdef, cls_members, alias_methods)
         super
-        if Config.instance.wx_version >= '3.3.0' && clsdef.name == 'wxAuiTabLayoutInfo'
+        if Config.instance.wx_version_check('3.3.0') >= 0 && clsdef.name == 'wxAuiTabLayoutInfo'
           fdoc.doc.puts 'Returns the indices of the pages in this tab control in their order on screen.'
           fdoc.doc.puts 'If this array is empty, it means that the tab control contains all notebook pages in natural order.'
           fdoc.doc.puts '@return [::Array<Integer>] indices of the pages in this tab control'

data/rakelib/lib/director/aui_notebook.rb

@@ -24,7 +24,7 @@ module WXRuby3
                          wxAuiNotebookPage::tooltip
                          wxAuiNotebookPage::bitmap
                          wxAuiNotebookPage::active]
-          if Config.instance.wx_version >= '3.3.0'
+          if Config.instance.wx_version_check('3.3.0') >= 0
             spec.items << 'wxAuiNotebookPosition'
             spec.regard 'wxAuiNotebookPosition::tabCtrl',
                         'wxAuiNotebookPosition::tabIdx'

data/rakelib/lib/director/aui_tab_art.rb

@@ -14,7 +14,7 @@ module WXRuby3
 
       def setup
         super
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.items << 'wxAuiFlatTabArt' << 'wxAuiSimpleTabArt'
           spec.ignore 'wxAuiDefaultTabArt', 'wxAuiNativeTabArt'
         else
@@ -117,7 +117,7 @@ module WXRuby3
 
     def gen_interface_classes(fout)
       super
-      if Config.instance.wx_version >= '3.3.0'
+      if Config.instance.wx_version_check('3.3.0') >= 0
         fout.puts
         fout.puts 'class wxAuiNativeTabArt : public wxAuiTabArt'
         fout.puts '{'
@@ -130,7 +130,7 @@ module WXRuby3
   class AuiTabArtDocGenerator < DocGenerator
     def gen_class_doc(fdoc)
       super
-      if Config.instance.wx_version >= '3.3.0'
+      if Config.instance.wx_version_check('3.3.0') >= 0
         fdoc.doc.puts 'Wx::AUI::AuiNativeTabArt is either an art provider providing native-like appearance (WXMSW and WXGTK) or a generic Tab Art provider if not available.'
         fdoc.puts 'class AuiNativeTabArt < AuiTabArt; end'
         fdoc.puts
@@ -138,7 +138,7 @@ module WXRuby3
     end
     def gen_constants_doc(fdoc)
       super
-      if Config.instance.wx_version >= '3.3.0'
+      if Config.instance.wx_version_check('3.3.0') >= 0
         fdoc.doc.puts 'Wx::AUI::AuiDefaultTabArt is an alias for the tab art provider used by {Wx::AUI::AuiNotebook} by default.'
         fdoc.doc.puts 'Since wxWidgets 3.3.0, this is {Wx::AUI::AuiFlatTabArt} under all platforms. In the previous versions, this was wxAuiNativeTabArt.'
         fdoc.puts 'AuiDefaultTabArt = Wx::AUI::AuiFlatTabArt'

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/ctrl_with_items.rb

@@ -54,7 +54,7 @@ module WXRuby3
             'wxItemContainer::Append(const wxArrayString &, wxClientData **)',
             'wxItemContainer::Insert(const wxArrayString &, unsigned int, wxClientData **)',
             'wxItemContainer::Set(const wxArrayString &, wxClientData **)'], ignore_doc: false)
-          if Config.instance.wx_version < '3.3.0'
+          if Config.instance.wx_version_check('3.3.0') < 0
             # add undocumented method
             spec.extend_interface 'wxControlWithItems',
                                   'bool IsSorted() const'

data/rakelib/lib/director/cursor.rb

@@ -21,8 +21,18 @@ module WXRuby3
                          'wxCursor::wxCursor(const char *const *)',
                          'wxCursor::wxCursor(const wxCursor &)'
         spec.ignore 'wxCursor::wxCursor(const char *const *)'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.ignore 'wxCursor::wxCursor(const char[],int,int,int,int,const char[], const wxColour*, const wxColour*)'
+
+          spec.items << 'wxCursorBundle'
+          spec.gc_as_untracked 'wxCursorBundle'
+          # all but the default ctor require a running App
+          spec.require_app 'wxCursorBundle::wxCursorBundle(const wxBitmapBundle &, const wxPoint &)',
+                           'wxCursorBundle::wxCursorBundle(const wxBitmapBundle &, int, int)',
+                           'wxCursorBundle::wxCursorBundle(const wxCursorBundle &)'
+          # add undocumented but useful ctor
+          spec.extend_interface 'wxCursorBundle',
+                                'wxCursorBundle(const wxCursor& cursor)'
         else
           spec.ignore 'wxCursor::wxCursor(const char[],int,int,int,int,const char[])'
         end

data/rakelib/lib/director/dc.rb

@@ -16,7 +16,7 @@ module WXRuby3
 
       def setup
         super
-        _readDC = if Config.instance.wx_version >= '3.3.0'
+        _readDC = if Config.instance.wx_version_check('3.3.0') >= 0
                     spec.items.unshift 'wxReadOnlyDC' # prepend before wxDC
                     spec.items << 'wxInfoDC'
                     'wxReadOnlyDC'
@@ -70,7 +70,7 @@ module WXRuby3
         # for GetUserScale and GetLogicalScale
         spec.map_apply 'double * OUTPUT' => 'double *'
         spec.swig_import 'swig/classes/include/wxGDICommon.h'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           # add similar block-style creator as #draw_on methods
           spec.add_extend_code 'wxInfoDC', <<~__HEREDOC
             static VALUE inform_on(wxWindow* win)

data/rakelib/lib/director/defs.rb

@@ -32,7 +32,7 @@ module WXRuby3
           wxDELETEA
           wxSwap
         }
-        if Config.instance.wx_version >= '3.2.7'
+        if Config.instance.wx_version_check('3.2.7') >= 0
           spec.ignore %w[wxWARN_UNUSED]
         end
         spec.ignore 'wxOVERRIDE'