wxruby3 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c44502717c4bc43863f96c826432224a7cc81063d3768dcffa8a92c7bbead181
-  data.tar.gz: c002fc5f501cba71fa127585102916daca951424e986a265e740e7ca9cbc6e9e
+  metadata.gz: ed10da8feaf6d3e77a775f3386dd9970314810239e7e4ce1c2c447658f6f4106
+  data.tar.gz: 125e2ddedb7148987456508b887dacae1262753a408cd39503faff80fe6435cc
 SHA512:
-  metadata.gz: bdd8149612a7ef5637362c5e27a821afe3cd6f1f03c92c00529ab3df12e427a73af97aa1ffa6f89281e7ff259861aed925f3b737ff49bc7564f92b6369b97550
-  data.tar.gz: dcce12022c263d4b5955b2417ab415460f38e5d0418e0c53d64d677c9c9352de5e1ff3b53a7318066b8e8c0b4ff47bf6fefb27ae194e0955801aac0edf99cd59
+  metadata.gz: dbe29edc61e3c139efec7d90d5f80b17b3671c141f3f6f3421905320de87b2900e90785bd83550e6b9d502bb184bef4a58c5061c7271629dc5f83d4c2f55ac94
+  data.tar.gz: 2b420414ee1c4b8eefa3fa797c5452e8490048876bfe2172fa14f8ffdd4937c907a4714c6af1650768e91cab08f4746881b5c19989bf66778f4ed4a1d2506020

data/ext/wxruby3/swig/custom/director.swg

@@ -147,20 +147,14 @@ namespace Swig {
 
     DirectorTypeMismatchException(VALUE self, const char *method, VALUE error, const char *msg="");
 
-    static inline void raise(VALUE error, const char *msg)
-    {
-      throw DirectorTypeMismatchException(error, msg);
-    }
+    static void raise(VALUE error, const char *msg);
 
-    static inline void raise(const char *msg)
-    {
-      throw DirectorTypeMismatchException(msg);
-    }
+    static void raise(const char *msg);
 
-    static inline void raise(VALUE self, const char* method, VALUE error, const char *msg)
-    {
-      throw DirectorTypeMismatchException(self, method, error, msg);
-    }
+    static void raise(VALUE self, const char* method, VALUE error, const char *msg);
+
+  private:
+    static void print(const DirectorTypeMismatchException& ex);
   };
 
   /* Any Ruby exception that occurs during a director method call */
@@ -195,14 +189,6 @@ namespace Swig {
     }
   };
 
-  /* wxRuby customization */
-  class WXRUBY_EXPORT DirectorRubyException : public DirectorException
-  {
-  public:
-    DirectorRubyException(VALUE error, VALUE rcvr, ID fn_id);
-
-  };
-
   /* Simple thread abstraction for pthreads on win32 */
 #ifdef __THREAD__
 # define __PTHREAD__

data/lib/wx/core/animation.rb

@@ -6,21 +6,42 @@
 # Copyright 2004-2007, wxRuby development team
 # released under the MIT-like wxRuby2 license
 
-class Wx::Animation
-  # Redefine the initialize method so it raises an exception if a
-  # non-existent file is given to the constructor; otherwise, wx Widgets
-  # just carries on with an empty bitmap, which may cause faults later
-  wx_init = self.instance_method(:initialize)
-  define_method(:initialize) do | *args |
-    if args[0].kind_of? String
-      if not File.exist?( File.expand_path(args[0]) )
-        Kernel.raise( ArgumentError, 
-                      "Animation file does not exist: #{args[0]}" )
+module Wx
+
+  class Animation
+    # Redefine the initialize method so it raises an exception if a
+    # non-existent file is given to the constructor; otherwise, wx Widgets
+    # just carries on with an empty bitmap, which may cause faults later
+    wx_init = self.instance_method(:initialize)
+    define_method(:initialize) do | *args |
+      if args[0].kind_of? String
+        if not File.exist?( File.expand_path(args[0]) )
+          Kernel.raise( ArgumentError,
+                        "Animation file does not exist: #{args[0]}" )
+        end
+        res = wx_init.bind(self).call()
+        res.load_file(args[0], args[1] || Wx::ANIMATION_TYPE_ANY)
+      else
+        wx_init.bind(self).call(*args)
+      end
+    end
+  end
+
+  if Wx::WXWIDGETS_VERSION >= '3.3.0'
+
+    class AnimationCtrl
+
+      # Redefine this method to accept either a single animation or an animation bundle
+      wx_set_animation = self.instance_method(:set_animation)
+      define_method(:set_animation) do | arg |
+        if Wx::Animation === arg
+          arg = Wx::AnimationBundle.new(arg)
+        end
+        wx_set_animation.bind(self).call(arg)
       end
-      res = wx_init.bind(self).call()
-      res.load_file(args[0], args[1] || Wx::ANIMATION_TYPE_ANY)
-    else
-      wx_init.bind(self).call(*args)
+
     end
+
   end
+
 end

data/lib/wx/core/choicedlg.rb

@@ -14,9 +14,8 @@ module Wx
                              choices,
                              parent = nil,
                              initial_selection: 0,
-                             x:  Wx::DEFAULT_COORD,
-                             y:  Wx::DEFAULT_COORD)
-    dialog = Wx::SingleChoiceDialog.new(parent, message, caption, choices, nil, Wx::CHOICEDLG_STYLE, [x, y])
+                             pos:  Wx::DEFAULT_POSITION)
+    dialog = Wx::SingleChoiceDialog.new(parent, message, caption, choices, Wx::CHOICEDLG_STYLE, pos)
 
     dialog.selection = initial_selection
     return dialog.show_modal == Wx::ID_OK ? dialog.get_string_selection : ''
@@ -28,9 +27,8 @@ module Wx
                                    choices,
                                    parent = nil,
                                    initial_selection: 0,
-                                   x:  Wx::DEFAULT_COORD,
-                                   y:  Wx::DEFAULT_COORD)
-    dialog = Wx::SingleChoiceDialog.new(parent, message, caption, choices, nil, Wx::CHOICEDLG_STYLE, [x, y])
+                                   pos:  Wx::DEFAULT_POSITION)
+    dialog = Wx::SingleChoiceDialog.new(parent, message, caption, choices, Wx::CHOICEDLG_STYLE, pos)
 
     dialog.selection = initial_selection
     return dialog.show_modal == Wx::ID_OK ? dialog.get_selection : -1
@@ -43,16 +41,15 @@ module Wx
                                 choices,
                                 parent = nil,
                                 initial_selections: [],
-                                x:  Wx::DEFAULT_COORD,
-                                y:  Wx::DEFAULT_COORD)
-    dialog = Wx::MultiChoiceDialog.new(parent, message, caption, choices, Wx::CHOICEDLG_STYLE, [x, y])
+                                pos:  Wx::DEFAULT_POSITION)
+    dialog = Wx::MultiChoiceDialog.new(parent, message, caption, choices, Wx::CHOICEDLG_STYLE, pos)
 
     # call this even if selections array is empty and this then (correctly)
     # deselects the first item which is selected by default
     dialog.selections = initial_selections
 
     if dialog.show_modal != Wx::ID_OK
-      return []
+      return nil
     end
 
     dialog.get_selections

data/lib/wx/core/colour.rb

@@ -45,6 +45,16 @@ module Wx
     def to_s
       "#<Wx::Colour: (#{red}, #{green}, #{blue} *#{alpha})>"
     end
+
+    # Copy ctor available.
+    def dup
+      self.class.new(self)
+    end
+
+    def clone
+      dup
+    end
+
   end
 
 end

data/lib/wx/core/dialog.rb

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

data/lib/wx/core/event.rb

@@ -58,4 +58,11 @@ module Wx
     Wx::EVT_NC_PAINT,
     Wx::NcPaintEvent
   ]
+  if Wx.const_defined?(:EVT_HOTKEY)
+    EvtHandler.register_event_type EvtHandler::EventType[
+                                     'evt_hotkey', 1,
+                                     Wx::EVT_HOTKEY,
+                                     Wx::KeyEvent
+                                   ]
+  end
 end

data/lib/wx/core/file_dialog.rb

@@ -20,4 +20,29 @@ module Wx
 
   end
 
+  class FileDialogCustomizeHook
+
+    # prevent construction of abstract base
+    if RUBY_VERSION < '2.7.0'
+      def self.new(*)
+        raise NotImplementedError, 'Wx::FileDialogCustomizeHook is an abstract class.' if self == Wx::FileDialogCustomizeHook
+        super
+      end
+    else
+      def self.new(*, **)
+        raise NotImplementedError, 'Wx::FileDialogCustomizeHook is an abstract class.' if self == Wx::FileDialogCustomizeHook
+        super
+      end
+    end
+
+    # provide default no-ops
+
+    def add_custom_controls(customizer) end
+
+    def update_custom_controls; end
+
+    def transfer_data_from_custom_controls; end
+
+  end
+
 end

data/lib/wx/core/gdi_object.rb

@@ -0,0 +1,24 @@
+# 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 GDIObject < Object
+
+    # GDIObjects have safe, working (and relatively cheap) copy ctors.
+    def dup
+      self.class.new(self)
+    end
+
+    def clone
+      dup
+    end
+
+  end
+
+end

data/lib/wx/core/object.rb

@@ -8,16 +8,31 @@
 
 # The root class for most (not all) WxRuby classes
 
-class Wx::Object
-  # Massage the output of inspect to show the public module name (Wx),
-  # instead of the internal name (Wxruby2)
-  # def to_s
-  #   super.sub('ruby2', '')
-  # end
-
-  # Returns a string containing the C++ pointer address of this
-  # object. Only useful for debugging.
-  def ptr_addr
-    Wx::ptr_addr(self)
+module Wx
+
+  class Object
+    # Massage the output of inspect to show the public module name (Wx),
+    # instead of the internal name (Wxruby2)
+    # def to_s
+    #   super.sub('ruby2', '')
+    # end
+
+    # Returns a string containing the C++ pointer address of this
+    # object. Only useful for debugging.
+    def ptr_addr
+      Wx::ptr_addr(self)
+    end
+
+    # By default Wx:::Object derived class instances cannot be #dup-licated.
+    def dup
+      nil
+    end
+
+    # By default Wx::Object derived class instances cannot be cloned but instead return self.
+    def clone
+      self
+    end
+
   end
+
 end

data/lib/wx/core/variant.rb

@@ -8,62 +8,119 @@
 
 require 'date'
 
-class Wx::Variant
-  include ::Enumerable
+module Wx
 
-  # add a proper enumerator method
-  def each
-    if block_given?
-      get_count.times { |i| yield self[i] }
-    else
-      ::Enumerator.new { |y| get_count.times { |i| y << self[i] } }
+  class Variant
+    include ::Enumerable
+
+    # add a proper enumerator method
+    def each
+      if block_given?
+        get_count.times { |i| yield self[i] }
+      else
+        ::Enumerator.new { |y| get_count.times { |i| y << self[i] } }
+      end
     end
-  end
 
-  # make assign return self and add it's handy alias
-  wx_assign = instance_method :assign
-  define_method :assign do |v|
-    wx_assign.bind(self).call(v)
-    self
-  end
-  alias :<< :assign
-
-  # extend to_s to arraylist and list (easier in pure Ruby)
-
-  wx_to_s = instance_method :to_s
-  define_method :to_s do
-    unless null?
-      case type
-      when 'list'
-        return "[#{each.collect { |v| v.string? ? %Q{"#{v.to_s}"} : v.to_s }.join(', ')}]"
-      when 'arrstring'
-        return array_string.to_s
-      when 'wxFont'
-        return font.to_s
-      when 'wxColour'
-        return colour.to_s
-      when 'wxColourPropertyValue'
-        return colour_property_value.to_s
+    # make assign return self and add it's handy alias
+    wx_assign = instance_method :assign
+    define_method :assign do |v|
+      wx_assign.bind(self).call(v)
+      self
+    end
+    alias :<< :assign
+
+    # extend to_s to arraylist and list (easier in pure Ruby)
+
+    wx_to_s = instance_method :to_s
+    define_method :to_s do
+      unless null?
+        case type
+        when 'list'
+          return "[#{each.collect { |v| v.string? ? %Q{"#{v.to_s}"} : v.to_s }.join(', ')}]"
+        when 'arrstring'
+          return array_string.to_s
+        when 'wxFont'
+          return font.to_s
+        when 'wxColour'
+          return colour.to_s
+        when 'wxColourPropertyValue'
+          return colour_property_value.to_s
+        end
       end
+      wx_to_s.bind(self).call
+    end
+
+    # extend with more Ruby-like type checking
+
+    def string?
+      !null? && is_type('string');
+    end
+
+    def bool?
+      !null? && is_type('bool');
+    end
+
+    def long?
+      !null? && is_type('long');
+    end
+
+    def long_long?
+      !null? && is_type('longlong');
+    end
+
+    def u_long_long?
+      !null? && is_type('ulonglong');
+    end
+
+    def integer?
+      !null? && (long? || long_long? || u_long_long?);
+    end
+
+    def date_time?
+      !null? && is_type('datetime');
     end
-    wx_to_s.bind(self).call
+
+    def double?
+      !null? && is_type('double');
+    end
+
+    def numeric?
+      !null? && (integer? || double?);
+    end
+
+    def list?
+      !null? && is_type('list');
+    end
+
+    def array_string?
+      !null? && is_type('arrstring');
+    end
+
+    def font?
+      !null? && is_type('wxFont');
+    end
+
+    def colour?
+      !null? && is_type('wxColour');
+    end
+
+    def colour_property_value?
+      !null? && is_type('wxColourPropertyValue');
+    end
+
+    def object?(klass = Object)
+      !null? && is_type('WXRB_VALUE') && klass === object;
+    end
+
+    def dup
+      self.class.new(self)
+    end
+
+    def clone
+      dup
+    end
+
   end
 
-  # extend with more Ruby-like type checking
-
-  def string?; !null? && is_type('string'); end
-  def bool?; !null? && is_type('bool'); end
-  def long?; !null? && is_type('long'); end
-  def long_long?; !null? && is_type('longlong'); end
-  def u_long_long?; !null? && is_type('ulonglong'); end
-  def integer?; !null? && (long? || long_long? || u_long_long?); end
-  def date_time?; !null? && is_type('datetime'); end
-  def double?; !null? && is_type('double'); end
-  def numeric?; !null? && (integer? || double?); end
-  def list?; !null? && is_type('list'); end
-  def array_string?; !null? && is_type('arrstring'); end
-  def font?; !null? && is_type('wxFont'); end
-  def colour?; !null? && is_type('wxColour'); end
-  def colour_property_value?; !null? && is_type('wxColourPropertyValue'); end
-  def object?(klass=Object) !null? && is_type('WXRB_VALUE') && klass === object; end
 end

data/lib/wx/doc/colour.rb

@@ -9,4 +9,16 @@ module Wx
 
   TRANSPARENT_COLOUR = Wx::Colour.new(0, 0, 0, Wx::ALPHA_TRANSPARENT)
 
+  class Colour < Object
+
+    # Returns a copy-constructed Colour object.
+    # @return [Wx::Colour] the duplicated Colour object
+    def dup; end
+
+    # Calls #dup.
+    # @return [Wx::Colour]
+    def clone; end
+
+  end
+
 end

data/lib/wx/doc/evthandler.rb

@@ -142,6 +142,12 @@ module Wx
     # @yield [*args] optional arguments
     def call_after(meth = nil, *args, &block) end
 
+    # Process a {Wx::EVT_HOTKEY} event.
+    # @param [Integer] id hotkey id
+    # @param [String,Symbol,Method,Proc] meth (name of) method or handler proc
+    # @yieldparam [Wx::KeyEvent] event the event to handle
+    def evt_hotkey(id, meth = nil, &block) end
+
   end
 
 end

data/lib/wx/doc/functions.rb

@@ -158,9 +158,41 @@ module Wx
   # @!group Dialog shortcuts
 
   # @return [Array<Integer>] Selected choices
-  def self.get_selected_choices(message, caption, choices,
-                                parent = nil, x = Wx::DEFAULT_COORD, y = Wx::DEFAULT_COORD,
-                                centre = true, width = Wx::CHOICE_WIDTH, height = Wx::CHOICE_HEIGHT) end
+
+  # Get the user selection as a string.
+  # @param [String] message
+  # @param [String] caption
+  # @param [Array<String>] choices choice strings
+  # @param [Wx::Window,nil] parent
+  # @param [Integer] initial_selection initial choice index
+  # @param [Wx::Point,Array(Integer,Integer)] pos
+  # @return [String] selected choice or '' if cancelled
+  def self.get_single_choice(message, caption, choices, parent = nil,
+                             initial_selection: 0,
+                             pos:  Wx::DEFAULT_POSITION) end
+
+  # Get the user selection as an index.
+  # @param [String] message
+  # @param [String] caption
+  # @param [Array<String>] choices choice strings
+  # @param [Wx::Window,nil] parent
+  # @param [Integer] initial_selection
+  # @param [Wx::Point,Array(Integer,Integer)] pos
+  # @return [Integer] selected choice index or -1 if cancelled
+  def self.get_single_choice_index(message, caption, choices, parent = nil,
+                                   initial_selection: 0,
+                                   pos:  Wx::DEFAULT_POSITION) end
+
+  # @param [String] message
+  # @param [String] caption
+  # @param [Array<String>] choices choice strings
+  # @param [Wx::Window,nil] parent
+  # @param [Array<Integer>] initial_selections array of initial choice indexes
+  # @param [Wx::Point,Array(Integer,Integer)] pos
+  # @return [Array<Integer>,nil] selected choice indexes (can be empty array if none selected) or nil if cancelled
+  def self.get_selected_choices(message, caption, choices, parent = nil,
+                                initial_selections: [],
+                                pos:  Wx::DEFAULT_POSITION) end
 
   # Pops up a file selector box.
   #

data/lib/wx/doc/gdi_object.rb

@@ -0,0 +1,22 @@
+# :stopdoc:
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# :startdoc:
+
+
+module Wx
+
+  class GDIObject < Object
+
+    # Returns a copy-constructed GDI object.
+    # @return [Wx::GDIObject] the duplicated GDI object
+    def dup; end
+
+    # Calls #dup.
+    # @return [Wx::GDIObject]
+    def clone; end
+
+  end
+
+end

data/lib/wx/doc/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 Object
+
+    # By default Wx:::Object derived classes cannot be #dup-licated.
+    # Some derived classes (like GDIObject-s) may provide functional overloads.
+    # @return [nil]
+    def dup; end
+
+    # By default Wx::Object derived class instances cannot be cloned but instead return self.
+    # Derived classes (like the Event classes) may provide functional overloads.
+    # @return [self]
+    def clone; end
+
+  end
+
+end

data/lib/wx/doc/variant.rb

@@ -168,6 +168,14 @@ module Wx
     # @return [true,false]
     def object?(klass=Object) end
 
+    # Copy constructs a Variant instance.
+    # @return [Wx::Variant]
+    def dup; end
+
+    # Calls #dup.
+    # @return [Wx::Variant]
+    def clone; end
+
   end
 
 end

data/lib/wx/helpers.rb

@@ -27,9 +27,8 @@ module Wx
       out_args = []
       param_spec.each_with_index do | param, i |
         # has supplied list arg or the keyword arg?
-        if (arg = mixed_args[i]) || kwa.key?(param.name)
-          arg = kwa.delete(param.name) unless arg
-        end
+        arg = mixed_args[i]
+        arg = kwa.delete(param.name) if arg.nil? && kwa.key?(param.name)
         if Proc === param.default_or_proc
           arg = param.default_or_proc.call(arg) # provides default or converts arg
         elsif arg.nil?

data/lib/wx/keyword_defs.rb

@@ -267,6 +267,13 @@ Wx::define_keyword_ctors(Wx::PropertySheetDialog) do
   wx_ctor_params :name => Wx::DIALOG_NAME_STR
 end
 
+# Credentials entry dialog
+Wx::define_keyword_ctors(Wx::CredentialEntryDialog) do
+  wx_ctor_params :message => ''
+  wx_ctor_params :title => 'Enter credentials'
+  wx_ctor_params :cred => ->(cred) { cred || Wx::WebCredentials.new }
+end
+
 ### CONTROLS
 
 # Push button control, displaying text

data/lib/wx/version.rb

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

data/rakelib/lib/config.rb

@@ -360,7 +360,7 @@ module WXRuby3
             test = File.join(Config.instance.test_dir, test)
             test = Dir.glob(test+'.rb').shift || test unless File.exist?(test)
           end
-          Rake.sh(Config.instance.exec_env, *make_ruby_cmd(test)) { |ok,status| errors += 1 unless ok }
+          Rake.sh(Config.instance.exec_env.merge({'RUBYLIB'=>rb_lib_path}), FileUtils::RUBY, test) { |ok,status| errors += 1 unless ok }
         end
       end
       fail "ERRORS: ##{errors} test scripts failed." if errors>0