wxruby3 1.5.4 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 365785c8c4a67019170ce82f52b08eef0c29c1eeaf83f9868edaf5883e5ca2a2
-  data.tar.gz: 48ea3a4a58c2f3f4cb2abab5a935a4b62b933f9413d007dc154aa92e038dc0ac
+  metadata.gz: 25ead08d281891ae9ad295a8181908c163677a4b9e0686249185941866118d49
+  data.tar.gz: 552bef0440f00907f30b273411dbfed19b8430bfbf49538efac2cd6104e6021b
 SHA512:
-  metadata.gz: b5921c7a072a6d44baa1afeea45718abf9e632e7b23ed5a24a431589dcc889bda5bafeb3b78d09cb9aebdfc07e752796849a9dbee95259abc7260a2d09974f85
-  data.tar.gz: ab2d3f5579f563a37f7eb61256c4ad95d1498f4b6adf23cb732c6675826c2869d351f049dc91d544427ce0b218e7b1327b8a179ab1dde8c4ed5b1025ce80b206
+  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/RubyStockObjects.i

@@ -28,6 +28,7 @@ extern VALUE mWxCore;
 %constant wxPen* const     wxRED_PEN;
 %constant wxPen* const     wxCYAN_PEN;
 %constant wxPen* const     wxGREEN_PEN;
+%constant wxPen* const     wxBLUE_PEN;
 %constant wxPen* const     wxBLACK_PEN;
 %constant wxPen* const     wxWHITE_PEN;
 %constant wxPen* const     wxTRANSPARENT_PEN;

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/aui/auifloatframe.rb

@@ -9,7 +9,7 @@ class Wx::AUI::AuiFloatingFrame
   # Before wxWidgets 3.3 the AUI manager of this control would prevent
   # WindowDestroyEvent propagation so we 'patch' in a std event handler
   # that designates the event skipped.
-  if Wx::WXWIDGETS_VERSION < '3.3'
+  if Wx.before_wxwidgets?('3.3')
     wx_initialize = instance_method :initialize
     wx_redefine_method :initialize do |*args|
       wx_initialize.bind(self).call(*args)

data/lib/wx/aui/auimanager.rb

@@ -31,7 +31,7 @@ module Wx
       end
     end
 
-    if WXWIDGETS_VERSION >= '3.3.0'
+    if Wx.at_least_wxwidgets?('3.3.0')
 
       class AuiTabLayoutInfo < AuiDockLayoutInfo
 

data/lib/wx/aui/auinotebook.rb

@@ -7,7 +7,7 @@
 module  Wx
   module AUI
 
-    if Wx::WXWIDGETS_VERSION >= '3.3'
+    if Wx.at_least_wxwidgets?('3.3.0')
       AuiDefaultTabArt = AuiFlatTabArt
     end
 
@@ -16,7 +16,7 @@ module  Wx
       # Before wxWidgets 3.3 the AUI manager of this control would prevent
       # WindowDestroyEvent propagation so we 'patch' in a std event handler
       # that designates the event skipped.
-      if Wx::WXWIDGETS_VERSION < '3.3'
+      if Wx.before_wxwidgets?('3.3')
         wx_initialize = instance_method :initialize
         wx_redefine_method :initialize do |*args|
           wx_initialize.bind(self).call(*args)

data/lib/wx/core/animation.rb

@@ -27,7 +27,7 @@ module Wx
     end
   end
 
-  if Wx::WXWIDGETS_VERSION >= '3.3.0'
+  if Wx.at_least_wxwidgets?('3.3.0')
 
     class AnimationCtrl
 

data/lib/wx/core/cursor.rb

@@ -19,4 +19,14 @@ module Wx
     Cursor.new(art_file, bmp_type || Wx::Bitmap::BITMAP_TYPE_GUESS[File.extname(art_file).sub(/\A\./,'')], *rest)
   end
 
+  if at_least_wxwidgets?('3.3.0')
+    class << self
+
+      wx_set_cursor = instance_method :set_cursor
+      wx_redefine_method :set_cursor do |cursor|
+        wx_set_cursor.bind(self).call(cursor.is_a?(Wx::Cursor) ? Wx::CursorBundle.new(cursor) :  cursor)
+      end
+    end
+  end
+
 end

data/lib/wx/core/dataformat.rb

@@ -37,7 +37,7 @@ module Wx
   end
   DF_FILENAME    = DataFormat.new( Wx::DataFormatId::DF_FILENAME )
   DF_UNICODETEXT = DataFormat.new( Wx::DataFormatId::DF_UNICODETEXT )
-  if Wx.has_feature?(:USE_HTML) && Wx::WXWIDGETS_VERSION >= '3.3'
+  if Wx.has_feature?(:USE_HTML) && Wx.at_least_wxwidgets?('3.3.0')
     DF_HTML        = DataFormat.new( Wx::DataFormatId::DF_HTML )
   end
 end

data/lib/wx/core/file_dialog.rb

@@ -23,7 +23,7 @@ module Wx
   class FileDialogCustomizeHook
 
     # prevent construction of abstract base
-    if RUBY_VERSION < '2.7.0'
+    if (RUBY_VERSION.split('.').collect {|v| v.to_i} <=> [2,7,0]) < 0
       def self.new(*)
         raise NotImplementedError, 'Wx::FileDialogCustomizeHook is an abstract class.' if self == Wx::FileDialogCustomizeHook
         super

data/lib/wx/core/geometry.rb

@@ -28,6 +28,10 @@ module Wx
       self
     end
 
+    def to_ary
+      [self.x, self.y]
+    end
+
     def add!(pt)
       add(pt)
       self
@@ -81,6 +85,10 @@ module Wx
       self
     end
 
+    def to_ary
+      [self.x, self.y]
+    end
+
     def add!(pt)
       add(pt)
       self
@@ -118,4 +126,30 @@ module Wx
     end
 
   end
+
+  class Rect2DDouble
+
+    wx_assign = instance_method :assign
+    wx_redefine_method :assign do |pt|
+      wx_assign.bind(self).call(pt)
+      self
+    end
+
+    def to_ary
+      [self.x, self.y, self.width, self.height]
+    end
+
+    def self.intersect(src1, src2)
+      int = Rect2DDouble.new(src1.to_ary)
+      int.intersect(src2)
+      int
+    end
+
+    def self.union(src1, src2)
+      u = Rect2DDouble.new(src1.to_ary)
+      u.union(src2)
+      u
+    end
+
+  end
 end

data/lib/wx/core/hboxsizer.rb

@@ -24,6 +24,28 @@ class Wx::HBoxSizer < Wx::BoxSizer
   end
 end
 
+class Wx::HStaticBoxSizer < Wx::StaticBoxSizer
+  def initialize(box_or_window, *rest, &block)
+    if box_or_window.is_a?(Wx::StaticBox)
+      raise ArgumentError, "Unexpected argument(s) #{rest}" unless rest.empty?
+      super(box_or_window, Wx::HORIZONTAL, &nil)
+    else
+      raise ArgumentError, "Unexpected argument(s) #{rest}" unless rest.size <= 1
+      super(Wx::HORIZONTAL, box_or_window, *rest, &block)
+    end
+    if block
+      if block.arity == -1 or block.arity == 0
+        self.instance_eval(&block)
+      elsif block.arity == 1
+        block.call(self)
+      else
+        Kernel.raise ArgumentError,
+                     "Block to initialize should accept a single argument or none"
+      end
+    end
+  end
+end
+
 # Just a shortcut version for creating a horizontal wrap sizer
 class Wx::HWrapSizer < Wx::WrapSizer
   def initialize(flags=Wx::WRAPSIZER_DEFAULT_FLAGS, &block)

data/lib/wx/core/hyperlink_ctrl.rb

@@ -0,0 +1,18 @@
+# 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
+
+  if Wx::PLATFORM == 'WXOSX'
+
+    # functionally identical for MacOS
+    GenericHyperlinkCtrl = HyperlinkCtrl
+
+  end
+
+end

data/lib/wx/core/position.rb

@@ -0,0 +1,58 @@
+# 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 Position
+
+    include Comparable
+
+    # make Position usable for parallel assignments like `r, c = pos`
+    def to_ary
+      [row, col]
+    end
+
+    # Compare with another position value
+    def <=>(other)
+      this_row, this_col = to_ary
+      if Wx::Position === other
+        that_row, that_col = other.to_ary
+      elsif Array === other and other.size == 2
+        that_row, that_col = other
+      else
+        return nil
+      end
+
+      if this_row < that_row
+        -1
+      elsif that_row < this_row
+        1
+      else
+        this_col <=> that_col
+      end
+    end
+
+    def eql?(other)
+      if other.instance_of?(self.class)
+        self == other
+      else
+        false
+      end
+    end
+
+    def hash
+      to_ary.hash
+    end
+
+    def dup
+      Wx::Position.new(*self.to_ary)
+    end
+
+  end
+
+end

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/core/vboxsizer.rb

@@ -24,6 +24,28 @@ class Wx::VBoxSizer < Wx::BoxSizer
   end
 end
 
+class Wx::VStaticBoxSizer < Wx::StaticBoxSizer
+  def initialize(box_or_window, *rest, &block)
+    if box_or_window.is_a?(Wx::StaticBox)
+      raise ArgumentError, "Unexpected argument(s) #{rest}" unless rest.empty?
+      super(box_or_window, Wx::VERTICAL, &nil)
+    else
+      raise ArgumentError, "Unexpected argument(s) #{rest}" unless rest.size <= 1
+      super(Wx::VERTICAL, box_or_window, *rest, &block)
+    end
+    if block
+      if block.arity == -1 or block.arity == 0
+        self.instance_eval(&block)
+      elsif block.arity == 1
+        block.call(self)
+      else
+        Kernel.raise ArgumentError,
+                     "Block to initialize should accept a single argument or none"
+      end
+    end
+  end
+end
+
 # Just a shortcut version for creating a vertical wrap sizer
 class Wx::VWrapSizer < Wx::WrapSizer
   def initialize(flags=Wx::WRAPSIZER_DEFAULT_FLAGS, &block)

data/lib/wx/doc/aui/auimanager.rb

@@ -13,9 +13,12 @@ module Wx
 
       # Yield each pane to the given block.
       # If no block passed returns an Enumerator.
-      # @yieldparam [Wx::AUI::AuiPaneInfo] pane the Aui pane info yielded
-      # @return [::Object, ::Enumerator] result of last block execution or enumerator
-      def each_pane; end
+      # @overload each_pane(&block)
+      #   @yieldparam [Wx::AUI::AuiPaneInfo] pane the Aui pane info yielded
+      #   @return [::Object] result of last block execution
+      # @overload each_pane()
+      #   @return [::Enumerator] enumerator
+      def each_pane(*) end
 
       # Returns an array of all panes managed by the frame manager.
       # @return [Array<Wx::AUI::AuiPaneInfo>] all managed panes

data/lib/wx/doc/aui/auinotebook.rb

@@ -14,9 +14,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
 
       # Finds tab control and its tab index associated with a given window.
       # @param [Wx::Window] page the notebook page window

data/lib/wx/doc/config.rb

@@ -45,17 +45,23 @@ module Wx
 
       # Iterate all value entries at the current object (no recursion).
       # Passes key/value pairs to the given block or returns an Enumerator is no block given.
-      # @yieldparam [String] key entry key
-      # @yieldparam [Boolean,String,Integer,Float] value entry value
-      # @return [Object,Enumerator] either the last result of the executed block or an enumerator if no block given
-      def each_entry(&block) end
+      # @overload each_entry(&block)
+      #   @yieldparam [String] key entry key
+      #   @yieldparam [Boolean,String,Integer,Float] value entry value
+      #   @return [Object] the last result of the executed block
+      # @overload each_entry()
+      #   @return [Enumerator] enumerator
+      def each_entry(*) end
 
       # Iterate all group entries at the current object (no recursion).
       # Passes key/value pairs to the given block or returns an Enumerator is no block given.
-      # @yieldparam [String] key entry key
-      # @yieldparam [Wx::Config::Group] value entry value
-      # @return [Object,Enumerator] either the last result of the executed block or an enumerator if no block given
-      def each_group(&block) end
+      # @overload each_group(&block)
+      #   @yieldparam [String] key entry key
+      #   @yieldparam [Wx::Config::Group] value entry value
+      #   @return [Object] the last result of the executed block
+      # @overload each_group()
+      #   @return [Enumerator] enumerator
+      def each_group(*) end
 
       # Returns the total number of value entries at the current object only (if recurse is false) or including
       # any nested groups (if recurse is true)

data/lib/wx/doc/controlwithitems.rb

@@ -19,9 +19,13 @@ module Wx
 
     # Yield each string to the given block.
     # Returns an Enumerator if no block given.
-    # @yieldparam [String] string the string yielded
-    # @return [Object,Enumerator] last result of block or Enumerator if no block given.
-    def each_string; end
+    # @overload each_string(&block)
+    #   @yieldparam [String] string the string yielded
+    #   @return [Object] last result of block
+    # @overload each_string()
+    #   @yieldparam [String] string the string yielded
+    #   @return [Enumerator] enumerator
+    def each_string(*) end
 
     # Returns true if the items in the control are sorted
     # (style Wx::LB_SORT for list boxes or Wx::CB_SORT for combo boxes).

data/lib/wx/doc/core.rb

@@ -12,6 +12,27 @@ module Wx
     # In case #wxrb_debug returns true #wxrb_trace_level= is also defined)
     # @return [Integer]
     attr_reader :wrb_trace_level
+
+    # Returns true if WXWIDGETS_VERSION >= ver
+    # @param [String,Array(Integer)] ver version string or integer array (1-3)
+    # @return [Boolean] true if WXWIDGETS_VERSION >= ver, false otherwise
+    def self.at_least_wxwidgets?(ver) end
+
+    # Returns true if WXWIDGETS_VERSION <= ver
+    # @param [String,Array(Integer)] ver version string or integer array (1-3)
+    # @return [Boolean] true if WXWIDGETS_VERSION <= ver, false otherwise
+    def self.up_to_wxwidgets?(ver) end
+
+    # Returns true if WXWIDGETS_VERSION < ver
+    # @param [String,Array(Integer)] ver version string or integer array (1-3)
+    # @return [Boolean] true if WXWIDGETS_VERSION < ver, false otherwise
+    def before_wxwidgets?(ver) end
+
+    # Returns true if WXWIDGETS_VERSION > ver
+    # @param [String,Array(Integer)] ver version string or integer array (1-3)
+    # @return [Boolean] true if WXWIDGETS_VERSION > ver, false otherwise
+    def after_wxwidgets?(ver) end
+
   end
 
 end

data/lib/wx/doc/geometry.rb

@@ -80,23 +80,23 @@ module Wx
 
   class Point2DDouble
 
-    # @return [Integer]
+    # @return [Float]
     def get_x; end
     alias :x :get_x
-    # @param [Integer] v
-    # @return [Integer]
+    # @param [Float] v
+    # @return [Float]
     def set_x(v) end
     alias :x= :set_x
 
-    # @return [Integer]
+    # @return [Float]
     def get_y; end
     alias :y :get_y
-    # @param [Integer] v
-    # @return [Integer]
+    # @param [Float] v
+    # @return [Float]
     def set_y(v) end
     alias :y= :set_y
 
-    # @param [Wx::Point2DInt] pt
+    # @param [Wx::Point2DDouble] pt
     # @return [self]
     def assign(pt) end
 
@@ -133,4 +133,44 @@ module Wx
     def /(v) end
 
   end
+
+  class Rect2DDouble
+
+    # @return [Float]
+    def get_x; end
+    alias :x :get_x
+    # @param [Float] v
+    # @return [Float]
+    def set_x(v) end
+    alias :x= :set_x
+
+    # @return [Float]
+    def get_y; end
+    alias :y :get_y
+    # @param [Float] v
+    # @return [Float]
+    def set_y(v) end
+    alias :y= :set_y
+
+    # @return [Float]
+    def get_width; end
+    alias :width :get_width
+    # @param [Float] v
+    # @return [Float]
+    def set_width(v) end
+    alias :width= :set_width
+
+    # @return [Float]
+    def get_height; end
+    alias :height :get_height
+    # @param [Float] v
+    # @return [Float]
+    def set_height(v) end
+    alias :y= :set_height
+
+    # @param [Wx::Rect2DDouble] pt
+    # @return [self]
+    def assign(pt) end
+
+  end
 end

data/lib/wx/doc/graphics_object.rb

@@ -0,0 +1,24 @@
+# :stopdoc:
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# :startdoc:
+
+
+module Wx
+
+  class GraphicsMatrix < GraphicsObject
+
+    # Applies this matrix to a point.
+    # @param [Wx::Point2DDouble,Array(Float,Float)] pt
+    # @return [Wx::Point2DDouble]
+    def transform_point(pt); end
+
+    # Applies this matrix to a distance (i.e., performs all transforms except translations)..
+    # @param [Wx::Point2DDouble,Array(Float,Float)] p
+    # @return [Wx::Point2DDouble]
+    def transform_distance(p); end
+
+  end
+
+end

data/lib/wx/doc/grid/grid.rb

@@ -26,27 +26,36 @@ module Wx::GRID
     # Notice that the blocks returned by this method are not ordered in any particular way and may overlap.
     # For grids using rows or columns-only selection modes, #each_selected_row_block or #each_selected_col_block
     # can be more convenient, as they return ordered and non-overlapping blocks.
-    # @yieldparam [Wx::GRID::GridBlockCoords] selected_block
-    # @return [Object,Enumerator] result of last block execution or an Enumerator if no block given
-    def each_selected_block; end
+    # @overload each_selected_block(&block)
+    #   @yieldparam [Wx::GRID::GridBlockCoords] selected_block
+    #   @return [Object] result of last block execution
+    # @overload each_selected_block()
+    #   @return [Enumerator] enumerator
+    def each_selected_block(*) end
 
     # Iterates an ordered range of non-overlapping selected rows passing each corresponding Wx::GRID::GridBlockCoords
     # to the given block or returns an enumerator if no block given.
     #
     # For the grids using GridSelectRows selection mode, iterates (possibly none) the coordinates of non-overlapping
     # selected row blocks in the natural order, i.e. from smallest to the biggest row indices.
-    # @yieldparam [Wx::GRID::GridBlockCoords] selected_block
-    # @return [Object,Enumerator] result of last block execution or an Enumerator if no block given
-    def each_selected_row_block; end
+    # @overload each_selected_row_block(&block)
+    #   @yieldparam [Wx::GRID::GridBlockCoords] selected_block
+    #   @return [Object] result of last block execution
+    # @overload each_selected_row_block(&block)
+    #   @return [Enumerator] enumerator
+    def each_selected_row_block(*) end
 
     # Iterates an ordered range of non-overlapping selected columns passing each corresponding Wx::GRID::GridBlockCoords
     # to the given block or returns an enumerator if no block given.
     #
     # For the grids using GridSelectColumn selection mode, iterates (possibly none) the coordinates of non-overlapping
     # selected column blocks in the natural order, i.e. from smallest to the biggest column indices.
-    # @yieldparam [Wx::GRID::GridBlockCoords] selected_block
-    # @return [Object,Enumerator] result of last block execution or an Enumerator if no block given
-    def each_selected_col_block; end
+    # @overload each_selected_col_block(&block)
+    #   @yieldparam [Wx::GRID::GridBlockCoords] selected_block
+    #   @return [Object] result of last block execution
+    # @overload each_selected_col_block(&block)
+    #   @return [Enumerator] enumerator
+    def each_selected_col_block(*) end
 
   end