wxruby3 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ea544cb7fe32dce3bbef74d16dc56ebe6fe8cb0ff381cbeee3a5ee9a37471d5
-  data.tar.gz: 2afddf4097dffcf4ee6bb4ed649d86165dd5e1decea9f330c27792e95eb2447d
+  metadata.gz: 74651be50bce49af8e8f2f5cfa6b75a103719aa06ac0cec8846a19397e6e32e8
+  data.tar.gz: aa9b54f0317028cf4677723c32926223115c0672b95484cec7586a42bf290ed5
 SHA512:
-  metadata.gz: 03f848a8b259e10f1a7dfe74505361825e2819cbc8fd2f20d5ca1f1990afa9d9fea4abecaa5bbdda4129864c4f24aa22fb7b1508fc2632839f0d7ffa89919cba
-  data.tar.gz: e187a4d0fd6c3f4985afae321228e6956e56df349001e2f6478ea458bafaf4bd5e8210d94de963270820eaedc7ff8de9f3b60684cc493415ce5ad67d4741a228
+  metadata.gz: daf1119a3e6c64bb5c42b2ab52ea9c553852e165392f8f98d51f89e0600edddfce5b1a9c4c57753f72c8b4da7a7eb8a883f0f01ec81c139c4cebb30b818a74a6
+  data.tar.gz: 682f3174d7accd03170735daf81d570f3895fec6594d7713db4fa99b9adfc21e5b91b9f85a670c5a2764369e59cebdc0978dabad37fb26c34d0bb62fcd8a9b34

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

@@ -55,7 +55,7 @@ class Wx::Dialog
       functor_nm = scope.pop
       code = <<~__CODE
         def #{functor_nm}(*args, **kwargs, &block)
-          dlg = #{klass.name}.new(*args, **kwargs)
+          dlg = kwargs.empty? ? #{klass.name}.new(*args) : #{klass.name}.new(*args, **kwargs)
           begin
             if block_given?
               return block.call(dlg)

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

@@ -41,12 +41,21 @@ class Wx::Point
   end
 
   def <=>(other)
+    this_x, this_y = to_ary
     if Wx::Point === other
-      (x*y) <=> (other.x*other.y)
+      that_x, that_y = other.to_ary
     elsif Array === other && other.size == 2
-      (x*y) <=> (other.first.to_i*other.last.to_i)
+      that_x, that_y = other
     else
-      nil
+      return nil
+    end
+
+    if this_y < that_y
+      -1
+    elsif that_y < this_y
+      1
+    else
+      this_x <=> that_x
     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/sizer.rb

@@ -10,44 +10,71 @@
 
 module Wx
   class Sizer
-    # Generic method to add items, supporting positional and named
+    # Redefine #add and #insert methods to support positional and named
     # arguments
-    ADD_ITEM_PARAMS = [Wx::Parameter[:index, -1],
-                       Wx::Parameter[:proportion, 0],
-                       Wx::Parameter[:flag, 0],
-                       Wx::Parameter[:border, 0]]
+    SIZER_ADD_PARAMS = [Wx::Parameter[:proportion, 0],
+                        Wx::Parameter[:flag, 0],
+                        Wx::Parameter[:border, 0],
+                        Wx::Parameter[:userData, nil]]
 
-    def add_item(item, *mixed_args)
+    wx_sizer_add = instance_method :add
+    wx_redefine_method :add do |*args, **kwargs|
 
-      begin
-        args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
-      rescue => err
-        err.set_backtrace(caller)
-        Kernel.raise err
-      end
+      if args.last.is_a?(Wx::SizerFlags)  # using 'flags' variant?
+        wx_sizer_add.bind(self).call(*args) # no need for keyword scanning
+      else
+        full_args = []
 
-      full_args = []
+        full_args << args.shift # get first argument
 
-      # extract the width and the height in the case of a spacer
-      # defined as an array
-      if item.kind_of?(Array)
-        Kernel.raise ArgumentError,
-                     "Invalid Sizer specification : [width, height] expected" if item.size != 2
-        full_args << item[0] << item[1]
-      else
-        full_args << item
+        unless full_args.first.is_a?(Wx::Window) || full_args.first.is_a?(Wx::Sizer)
+          full_args << args.shift # must be spacer variant, get height argument as well
+        end
+
+        begin
+          args = Wx::args_as_list(SIZER_ADD_PARAMS, *args, **kwargs)
+        rescue => err
+          err.set_backtrace(caller)
+          Kernel.raise err
+        end
+
+        # update the full arguments list with the optional arguments
+        full_args.concat(args)
+
+        # Call original add with full args
+        wx_sizer_add.bind(self).call(*full_args)
       end
 
-      # update the full arguments list with the optional arguments (except index)
-      idx = args.shift
-      full_args.concat(args)
+    end
 
-      # Call add to append if default position
-      if idx == -1
-        add(*full_args)
+    wx_sizer_insert = instance_method :insert
+    wx_redefine_method :insert do |index, *args, **kwargs|
+
+      if args.last.is_a?(Wx::SizerFlags)  # using 'flags' variant?
+        wx_sizer_insert.bind(self).call(index, *args) # no need for keyword scanning
       else
-        insert(idx, *full_args)
+        full_args = []
+
+        full_args << args.shift # get first argument after index
+
+        unless full_args.first.is_a?(Wx::Window) || full_args.first.is_a?(Wx::Sizer)
+          full_args << args.shift # must be spacer variant, get height argument as well
+        end
+
+        begin
+          args = Wx::args_as_list(SIZER_ADD_PARAMS, *args, **kwargs)
+        rescue => err
+          err.set_backtrace(caller)
+          Kernel.raise err
+        end
+
+        # update the full arguments list with the optional arguments
+        full_args.concat(args)
+
+        # Call original insert with full args
+        wx_sizer_insert.bind(self).call(index, *full_args)
       end
+
     end
 
     # Overload to provide Enumerator without block
@@ -169,6 +196,42 @@ module Wx
 
   class GridBagSizer < FlexGridSizer
 
+    # Redefine #add method to support positional and named
+    # arguments
+    GBSIZER_ADD_PARAMS = [Wx::Parameter[:span, Wx::DEFAULT_SPAN],
+                          Wx::Parameter[:flag, 0],
+                          Wx::Parameter[:border, 0],
+                          Wx::Parameter[:userData, nil]]
+
+    wx_gbsizer_add = instance_method :add
+    wx_redefine_method :add do |*args, **kwargs|
+
+      full_args = []
+
+      full_args << args.shift # get first argument
+
+      unless full_args.first.is_a?(Wx::Window) || full_args.first.is_a?(Wx::Sizer)
+        full_args << args.shift # must be spacer variant, get height argument as well
+      end
+
+      # get mandatory pos arg
+      full_args << args.shift
+
+      begin
+        args = Wx::args_as_list(GBSIZER_ADD_PARAMS, *args, **kwargs)
+      rescue => err
+        err.set_backtrace(caller)
+        Kernel.raise err
+      end
+
+      # update the full arguments list with the optional arguments
+      full_args.concat(args)
+
+      # Call original add with full args
+      wx_gbsizer_add.bind(self).call(*full_args)
+
+    end
+
     wx_initialize = instance_method :initialize
     wx_redefine_method :initialize do |*args, &block|
       wx_initialize.bind(self).call(*args)
@@ -186,4 +249,76 @@ module Wx
 
   end
 
+  class GBPosition
+
+    include Comparable
+
+    # make GBPosition 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::GBPosition === 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::GBPosition.new(*self.to_ary)
+    end
+
+  end
+
+  class GBSpan
+
+    # make GBSpan usable for parallel assignments like `r, c = span`
+    def to_ary
+      [rowspan, colspan]
+    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::GBSpan.new(*self.to_ary)
+    end
+
+  end
+
 end

data/lib/wx/core/splash_screen.rb

@@ -15,15 +15,15 @@ class Wx::SplashScreen
   end
 
   # now redefine the overridden ctor to account for deviating arglist
-  wx_redefine_method :initialize do |bitmap, splashstyle, milliseconds, parent = nil, *mixed_args, &block|
+  wx_redefine_method :initialize do |bitmap, splashstyle, milliseconds, parent = nil, *args, **kwargs, &block|
     # no zero-args ctor for use with XRC!
 
     real_args = begin
-                  [ bitmap, splashstyle, milliseconds, parent ] + self.class.args_as_list(*mixed_args)
+                  [ bitmap, splashstyle, milliseconds, parent ] + self.class.args_as_list(*args, **kwargs)
                 rescue => err
                   msg = "Error initializing #{self.inspect}\n"+
                     " : #{err.message} \n" +
-                    "Provided are #{[ bitmap, splashstyle, milliseconds, parent ] + mixed_args} \n" +
+                    "Provided are #{[ bitmap, splashstyle, milliseconds, parent ] + args + [kwargs]} \n" +
                     "Correct parameters for #{self.class.name}.new are:\n" +
                     self.class.describe_constructor(
                       ":bitmap => (Wx::Bitmap)\n:splashstyle => (Integer)\n:milliseconds => (Integer)\n:parent => (Wx::Window)\n")

data/lib/wx/core/toolbar.rb

@@ -21,10 +21,10 @@ class Wx::ToolBar
                       Wx::Parameter[ :long_help, "" ], 
                       Wx::Parameter[ :client_data, nil ] ]
   
-  def add_item(bitmap1, *mixed_args)
+  def add_item(bitmap1, *args, **kwargs)
 
     begin
-      args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
+      args = Wx::args_as_list(ADD_ITEM_PARAMS, *args, **kwargs)
     rescue => err
       err.set_backtrace(caller)
       Kernel.raise err

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).