wxruby3 1.5.4 → 1.6.0

data/lib/wx/doc/notebook.rb

@@ -12,9 +12,12 @@ module Wx
     # Iterate each notebook page.
     # Passes each page to the given block.
     # Returns an Enumerator if no block given.
-    # @yieldparam [Wx::Window] page notebook page
-    # @return [Object,Enumerator] last result of block or Enumerator if no block given.
-    def each_page; end
+    # @overload each_page(&block)
+    #   @yieldparam [Wx::Window] page notebook page
+    #   @return [Object] last result of block
+    # @overload each_page()
+    #   @return [Enumerator] enumerator
+    def each_page(*) end
 
   end
 

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

@@ -16,9 +16,12 @@ module Wx::PG
     # Iterate each attribute.
     # Passes the variant for each attribute to the given block.
     # Returns an Enumerator if no block given.
-    # @yieldparam [Wx::Variant] variant attribute's variant
-    # @return [Object,Enumerator] last result of block or Enumerator if no block given.
-    def each_attribute; end
+    # @overload each_attribute(&block)
+    #   @yieldparam [Wx::Variant] variant attribute's variant
+    #   @return [Object] last result of block
+    # @overload each_attribute()
+    #   @return [Enumerator] enumerator
+    def each_attribute(*) end
 
   end
 
@@ -27,16 +30,22 @@ module Wx::PG
     # Iterate each label.
     # Passes each label string to the given block.
     # Returns an Enumerator if no block given.
-    # @yieldparam [String] label label string
-    # @return [Object,Enumerator] last result of block or Enumerator if no block given.
-    def each_label; end
+    # @overload each_label(&block)
+    #   @yieldparam [String] label label string
+    #   @return [Object] last result of block
+    # @overload each_label()
+    #   @return [Enumerator] enumerator
+    def each_label(*) end
 
     # Iterate each choice entry.
     # Passes each choice entry to the given block.
     # Returns an Enumerator if no block given.
-    # @yieldparam [Wx::PG::ChoiceEntry] entry choice entry
-    # @return [Object,Enumerator] last result of block or Enumerator if no block given.
-    def each_entry; end
+    # @overload each_entry(&block)
+    #   @yieldparam [Wx::PG::ChoiceEntry] entry choice entry
+    #   @return [Object] last result of block
+    # @overload each_entry()
+    #   @return [Enumerator] enumerator
+    def each_entry(*) end
 
   end
 

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

@@ -13,18 +13,18 @@ module Wx::PG
     # each property to the block.
     # Returns an enumerator when no block is given.
     # The start position defaults to Wx::TOP for forward iteration and Wx::BOTTOM for reverse iteration.
-    # @overload each_property(flags, start, reverse: , &block)
+    # @overload each_property(flags, start, reverse, &block)
     #   @param flags [Integer] flags specifying iteration (see {Wx::PG::PG_ITERATOR_FLAGS})
     #   @param start [Integer,Wx::PG::Property] start position (either {Wx::Direction::TOP} or {Wx::Direction::BOTTOM} or the property to start at)
     #   @param reverse [true,false] iterate properties in reverse
     #   @yieldparam item [Wx::PG::PGProperty] property
     #   @return [::Object] result of last block execution
-    # @overload each_property(flags, start, reverse:)
+    # @overload each_property(flags, start, reverse)
     #   @param flags [Integer] flags specifying iteration (see {Wx::PG::PG_ITERATOR_FLAGS})
     #   @param start [Integer,Wx::PG::Property] start position (either {Wx::Direction::TOP} or {Wx::Direction::BOTTOM} or the property to start at)
     #   @param reverse [true,false] iterate properties in reverse
     #   @return [Enumerator] an enumerator
-    def each_property(flags = Wx::PG::PG_ITERATE_DEFAULT, start = nil, reverse: false, &block) end
+    def each_property(flags = Wx::PG::PG_ITERATE_DEFAULT, start = nil, reverse = false, &block) end
     alias :properties :each_property
 
     # Convenience method to perform reverse iteration.
@@ -54,7 +54,7 @@ module Wx::PG
     # @overload each_property_attribute(id)
     #   @param id [String,Wx::PG::PGProperty] (name of) property to iterate attributes of
     #   @return [Enumerator] an enumerator
-    def each_property_attribute; end
+    def each_property_attribute(id) end
     alias :property_attributes :each_property_attribute
 
     # Returns the current grid state.

data/lib/wx/doc/region_iterator.rb

@@ -34,7 +34,7 @@ module Wx
     #   @return [::Object]
     # @overload each()
     #   @return [Enumerator]
-    def each; end
+    def each(*) end
 
   end
 

data/lib/wx/doc/rtc/rich_text_composite_object.rb

@@ -13,9 +13,12 @@ module Wx
 
       # Yield each child object to the given block.
       # Returns an Enumerator if no block given.
-      # @yieldparam [Wx::RTC::RichTextObject] child the child object yielded
-      # @return [Object,Enumerator] last result of block or Enumerator if no block given.
-      def each_child; end
+      # @overload each_child(&block)
+      #   @yieldparam [Wx::RTC::RichTextObject] child the child object yielded
+      #   @return [Object] last result of block
+      # @overload each_child()
+      #   @return [Enumerator] enumerator
+      def each_child(*) end
 
     end
 

data/lib/wx/doc/rtc/rich_text_ctrl.rb

@@ -13,9 +13,12 @@ module Wx
 
       # Yield each line to the given block.
       # Returns an Enumerator if no block given.
-      # @yieldparam [String] line the line yielded
-      # @return [Object,Enumerator] last result of block or Enumerator if no block given.
-      def each_line; end
+      # @overload each_line(&block)
+      #   @yieldparam [String] line the line yielded
+      #   @return [Object] last result of block
+      # @overload each_line()
+      #   @return [Enumerator] enumerator
+      def each_line(*) end
 
     end
 

data/lib/wx/doc/rtc/rich_text_paragraph.rb

@@ -13,9 +13,12 @@ module Wx
 
       # Yield each line to the given block.
       # Returns an Enumerator if no block given.
-      # @yieldparam [Wx::RTC::RichTextLine] line the line yielded
-      # @return [Object,Enumerator] last result of block or Enumerator if no block given.
-      def each_line; end
+      # @overload each_line(&block)
+      #   @yieldparam [Wx::RTC::RichTextLine] line the line yielded
+      #   @return [Object] last result of block
+      # @overload each_line()
+      #   @return [Enumerator] enumerator
+      def each_line(*) end
 
     end
 

data/lib/wx/doc/sizer.rb

@@ -11,9 +11,12 @@ module Wx
 
     # Yield each child item to the given block.
     # Returns an Enumerator if no block given.
-    # @yieldparam [Wx::SizerItem] child the child item yielded
-    # @return [Object,Enumerator] last result of block or Enumerator if no block given.
-    def each_child; end
+    # @overload each_child(&block)
+    #   @yieldparam [Wx::SizerItem] child the child item yielded
+    #   @return [Object] last result of block
+    # @overload each_child()
+    #   @return [Enumerator] enumerator
+    def each_child(*) end
 
   end
 

data/lib/wx/doc/stc/styled_text_ctrl.rb

@@ -13,9 +13,12 @@ module Wx
 
       # Yield each line to the given block.
       # Returns an Enumerator if no block given.
-      # @yieldparam [String] line the line yielded
-      # @return [Object,Enumerator] last result of block or Enumerator if no block given.
-      def each_line; end
+      # @overload each_line(&block)
+      #   @yieldparam [String] line the line yielded
+      #   @return [Object] last result of block
+      # @overload each_line()
+      #   @return [Enumerator] enumerator
+      def each_line(*) end
 
     end
 

data/lib/wx/doc/textctrl.rb

@@ -68,9 +68,12 @@ module Wx
 
     # Yield each line to the given block.
     # Returns an Enumerator if no block given.
-    # @yieldparam [String] line the line yielded
-    # @return [Object,Enumerator] last result of block or Enumerator if no block given.
-    def each_line; end
+    # @overload each_line(&block)
+    #   @yieldparam [String] line the line yielded
+    #   @return [Object] last result of block
+    # @overload each_line()
+    #   @return [Enumerator] enumerator
+    def each_line(*) end
 
     # @overload enable_proof_check(text_proof_options = Wx::TextProofOptions.default)
     #   Enable or disable native spell checking on this text control if it is available on the current platform.

data/lib/wx/doc/tree_ctrl.rb

@@ -43,9 +43,13 @@ module Wx
 
     # Iterate all child items of the given parent and yield it's id to the given block.
     # Returns an Enumerator if no block given.
-    # @param [Wx::TreeItemId] parent_id
-    # @yieldparam [Wx::TreeItemId] child_id the child tree item id yielded
-    # @return [Object,Enumerator] last result of block or Enumerator if no block given.
+    # @overload each_item_child(parent_id, &block)
+    #   @param [Wx::TreeItemId] parent_id
+    #   @yieldparam [Wx::TreeItemId] child_id the child tree item id yielded
+    #   @return [Object] last result of block
+    # @overload each_item_child(parent_id)
+    #   @param [Wx::TreeItemId] parent_id
+    #   @return [Enumerator] enumerator
     def each_item_child(parent_id) end
 
     # Returns an array of tree item ids of the child items of the given parent.

data/lib/wx/doc/v_list_box.rb

@@ -10,9 +10,12 @@ module Wx
   class VListBox
 
     # Iterate selected items. Returns Enumerator if no block given.
-    # @yieldparam [Integer] sel selected item index
-    # @return [Enumerator,Object] if block given returns last return value of block, Enumerator otherwise
-    def each_selected; end
+    # @overload each_selected(&block)
+    #   @yieldparam [Integer] sel selected item index
+    #   @return [Object] last return value of block
+    # @overload each_selected()
+    #   @return [Enumerator] enumerator
+    def each_selected(*) end
 
   end
 

data/lib/wx/doc/variant.rb

@@ -17,7 +17,7 @@ module Wx
     # @overload each(&block)
     #   @yieldparam item [Wx::Variant] variant list item
     #   @return [::Object] result of last block execution
-    # @overload each
+    # @overload each()
     #   @return [Enumerator] an enumerator
     def each; end
 

data/lib/wx/doc/vboxsizer.rb

@@ -11,8 +11,39 @@ module Wx
   class VBoxSizer < Wx::BoxSizer
 
     # Constructor for a {Wx::VBoxSizer}.
-    # @return [Wx::VBoxSizer]
-    def initialize; end
+    # @overload initialize(&block)
+    #   @yieldparam [Wx::VBoxSizer] sizer new VBoxSizer instance
+    #   @return [Wx::VBoxSizer]
+    # @overload initialize()
+    #   @return [Wx::VBoxSizer]
+    def initialize(*) end
+
+  end
+
+  # Just a shortcut version for creating a vertical staticbox sizer
+  class VStaticBoxSizer < StaticBoxSizer
+
+    # @overload initialize(box, &block)
+    #   This constructor uses an already existing static box.
+    #   @param box [Wx::StaticBox]  The static box to associate with the sizer (which will take its ownership).
+    #   @yieldparam [Wx::VStaticBoxSizer] sizer new VStaticBoxSizer instance
+    #   @return [Wx::VStaticBoxSizer]
+    # @overload initialize(box)
+    #   This constructor uses an already existing static box.
+    #   @param box [Wx::StaticBox]  The static box to associate with the sizer (which will take its ownership).
+    #   @return [Wx::VStaticBoxSizer]
+    # @overload initialize(parent, label=(''), &block)
+    #   This constructor creates a new static box with the given label and parent window.
+    #   @param parent [Wx::Window]
+    #   @param label [String]
+    #   @yieldparam [Wx::VStaticBoxSizer] sizer new VStaticBoxSizer instance
+    #   @return [Wx::VStaticBoxSizer]
+    # @overload initialize(parent, label=(''))
+    #   This constructor creates a new static box with the given label and parent window.
+    #   @param parent [Wx::Window]
+    #   @param label [String]
+    #   @return [Wx::VStaticBoxSizer]
+    def initialize(*args) end
 
   end
 
@@ -24,9 +55,14 @@ module Wx
     # item on each line to use any remaining space on that line and {Wx::REMOVE_LEADING_SPACES} which removes any spacer
     # elements from the beginning of a row.
     # Both of these flags are on by default.
-    # @param flags [Integer]
-    # @return [Wx::VWrapSizer]
-    def initialize(flags=Wx::WRAPSIZER_DEFAULT_FLAGS) end
+    # @overload initialize(flags=Wx::WRAPSIZER_DEFAULT_FLAGS, &block)
+    #   @param flags [Integer]
+    #   @yieldparam [Wx::VWrapSizer] sizer new VWrapSizer instance
+    #   @return [Wx::VWrapSizer]
+    # @overload initialize(flags=Wx::WRAPSIZER_DEFAULT_FLAGS)
+    #   @param flags [Integer]
+    #   @return [Wx::VWrapSizer]
+    def initialize(flags) end
 
   end
 

data/lib/wx/doc/window.rb

@@ -56,9 +56,12 @@ module Wx
 
     # Yield each child window to the given block.
     # Returns an Enumerator if no block given.
-    # @yieldparam [Wx::Window] child the child window yielded
-    # @return [Object,Enumerator] last result of block or Enumerator if no block given.
-    def each_child; end
+    # @overload each_child(&block)
+    #   @yieldparam [Wx::Window] child the child window yielded
+    #   @return [Object] last result of block
+    # @overload each_child()
+    #   @return [Enumerator] enumerator
+    def each_child(*) end
 
     # Locks the window from updates while executing the given block.
     # @param [Proc] block

data/lib/wx/helpers.rb

@@ -66,4 +66,32 @@ module Wx
   def self.has_feature?(featsym)
     Wx::Setup.const_defined?(featsym) && !!Wx::Setup.const_get(featsym)
   end
+
+  # returns true if WXWIDGETS_VERSION >= ver
+  # ver can be string or array of 3 integers
+  def self.at_least_wxwidgets?(ver)
+    ver = ver.split('.').collect {|s| s.to_i } unless ::Array === ver
+    ([ Wx::WXWIDGETS_MAJOR_VERSION, Wx::WXWIDGETS_MINOR_VERSION, Wx::WXWIDGETS_RELEASE_NUMBER ] <=> ver) >= 0
+  end
+
+  # returns true if WXWIDGETS_VERSION <= ver
+  # ver can be string or array of 3 integers
+  def self.up_to_wxwidgets?(ver)
+    ver = ver.split('.').collect {|s| s.to_i } unless ::Array === ver
+    ([ Wx::WXWIDGETS_MAJOR_VERSION, Wx::WXWIDGETS_MINOR_VERSION, Wx::WXWIDGETS_RELEASE_NUMBER ] <=> ver) <= 0
+  end
+
+  # returns true if WXWIDGETS_VERSION < ver
+  # ver can be string or array of 3 integers
+  def self.before_wxwidgets?(ver)
+    ver = ver.split('.').collect {|s| s.to_i } unless ::Array === ver
+    ([ Wx::WXWIDGETS_MAJOR_VERSION, Wx::WXWIDGETS_MINOR_VERSION, Wx::WXWIDGETS_RELEASE_NUMBER ] <=> ver) < 0
+  end
+
+  # returns true if WXWIDGETS_VERSION > ver
+  # ver can be string or array of 3 integers
+  def self.after_wxwidgets?(ver)
+    ver = ver.split('.').collect {|s| s.to_i } unless ::Array === ver
+    ([ Wx::WXWIDGETS_MAJOR_VERSION, Wx::WXWIDGETS_MINOR_VERSION, Wx::WXWIDGETS_RELEASE_NUMBER ] <=> ver) > 0
+  end
 end

data/lib/wx/keyword_ctors.rb

@@ -71,7 +71,7 @@ module Wx
     # by the Rails #class_attribute method.
     module ParamSpec
 
-      if RUBY_VERSION < '2.7.0'
+      if (RUBY_VERSION.split('.').collect {|v| v.to_i} <=> [2,7,0]) < 0
         PARAM_SPEC_ARG = [:param_spec]
       else
         PARAM_SPEC_ARG = [:param_spec, false]
@@ -164,7 +164,7 @@ module Wx
         end
       end
 
-      if RUBY_VERSION < '3.0.0'
+      if (RUBY_VERSION.split('.').collect {|v| v.to_i} <=> [3,0,0]) <= 0
         def args_as_list(*mixed_args)
           Wx::args_as_list(param_spec, *mixed_args)
         end

data/lib/wx/keyword_defs.rb

@@ -389,8 +389,7 @@ end
 
 # wxGenericDirCtrl 	A control for displaying a directory tree
 Wx::define_keyword_ctors(Wx::GenericDirCtrl) do
-  # TODO :dir => Wx::DIR_DIALOG_DEFAULT_FOLDER_STR
-  wx_ctor_params :id, :dir => ''
+  wx_ctor_params :id, :dir => Wx::DIR_DIALOG_DEFAULT_FOLDER_STR
   wx_ctor_params :pos, :size,
                  :style => Wx::DIRCTRL_3D_INTERNAL|Wx::SUNKEN_BORDER
   wx_ctor_params :filter => ''
@@ -517,6 +516,16 @@ Wx::define_keyword_ctors(Wx::HyperlinkCtrl) do
   wx_ctor_params :name => Wx::HYPERLINK_CTRL_NAME_STR
 end
 
+# HyperlinkCtrl is identical to GenericHyperlinkCtrl on MacOS
+unless Wx::PLATFORM == 'WXOSX'
+  Wx::define_keyword_ctors(Wx::GenericHyperlinkCtrl) do
+    wx_ctor_params :id, :label => ''
+    wx_ctor_params :url => ''
+    wx_ctor_params :pos, :size, :style => Wx::HL_DEFAULT_STYLE
+    wx_ctor_params :name => Wx::HYPERLINK_CTRL_NAME_STR
+  end
+end
+
 Wx::define_keyword_ctors(Wx::CollapsiblePane) do
   wx_ctor_params :id, :label => ''
   wx_ctor_params :pos, :size, :style => 0

data/lib/wx/pg/pg_property.rb

@@ -14,7 +14,7 @@ module Wx::PG
 
   PG_DEFAULT_IMAGE_SIZE = Wx::DEFAULT_SIZE
 
-  if Wx::WXWIDGETS_VERSION >= '3.3.0'
+  if Wx.at_least_wxwidgets?('3.3.0')
     # backward compatibility constants
     PG_FULL_VALUE                     = PGPropValFormatFlags::FullValue
     PG_REPORT_ERROR                   = PGPropValFormatFlags::ReportError

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.0'
 end

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

@@ -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/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/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'