wxruby3 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c44502717c4bc43863f96c826432224a7cc81063d3768dcffa8a92c7bbead181
-  data.tar.gz: c002fc5f501cba71fa127585102916daca951424e986a265e740e7ca9cbc6e9e
+  metadata.gz: c43cace6f097af04e2d856782258313acd4e340719cf7794db36534e6d5e644b
+  data.tar.gz: 2f93d3489b95ca1a49ce2734222088aab5574841dd337d19fef58ec7a84587fb
 SHA512:
-  metadata.gz: bdd8149612a7ef5637362c5e27a821afe3cd6f1f03c92c00529ab3df12e427a73af97aa1ffa6f89281e7ff259861aed925f3b737ff49bc7564f92b6369b97550
-  data.tar.gz: dcce12022c263d4b5955b2417ab415460f38e5d0418e0c53d64d677c9c9352de5e1ff3b53a7318066b8e8c0b4ff47bf6fefb27ae194e0955801aac0edf99cd59
+  metadata.gz: 1db323073fdde9896d9ea6d8ffb9dee71e3f52f52d2836603ff5e6f7274003bb252bc4cff832574454ad4390686a79b1ef01467d5e3b7362aad36d464c67f5ac
+  data.tar.gz: 0057e4f8462c5b4e2dd79e736ca417cea70305b38efdc796bcc32a8f22fd12d178824ebe92e5d4cca219e1e1dbcafcb9200b5d00d7052d89ddd8f905729af4a0

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,13 +189,8 @@ namespace Swig {
     }
   };
 
-  /* wxRuby customization */
-  class WXRUBY_EXPORT DirectorRubyException : public DirectorException
-  {
-  public:
-    DirectorRubyException(VALUE error, VALUE rcvr, ID fn_id);
-
-  };
+// SWIG < 4.3.0
+#if SWIG_VERSION < 0x040300
 
   /* Simple thread abstraction for pthreads on win32 */
 #ifdef __THREAD__
@@ -233,8 +222,14 @@ namespace Swig {
     }
   };
 # define SWIG_GUARD(mutex) Guard _guard(mutex)
+# define SWIG_GUARD_DEFINITION(_cls, _mutex) pthread_mutex_t _cls::_mutex
+# define SWIG_GUARD_DECLARATION(_mutex) static pthread_mutex_t _mutex
 #else
 # define SWIG_GUARD(mutex)
+# define SWIG_GUARD_DEFINITION(_cls, _mutex)
+# define SWIG_GUARD_DECLARATION(_mutex)
+#endif
+
 #endif
 
   /* director base class */
@@ -272,9 +267,7 @@ namespace Swig {
   private:
     typedef std::map<void *, GCItem_var> swig_ownership_map;
     mutable swig_ownership_map swig_owner;
-#ifdef __PTHREAD__
-    static pthread_mutex_t swig_mutex_own;
-#endif
+    SWIG_GUARD_DECLARATION(swig_mutex_own);
 
   public:
     template <typename Type>
@@ -301,4 +294,5 @@ namespace Swig {
 
     swig_ruby_owntype swig_release_ownership(void *vptr) const;
   };
+  SWIG_GUARD_DEFINITION(Director, swig_mutex_own);
 }

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

@@ -12,8 +12,22 @@ extern "C" {
 #endif
 
 WXRUBY_EXPORT VALUE
-SWIG_Ruby_AppendOutput(VALUE target, VALUE o);
+SWIG_wxRuby_AppendOutput(VALUE target, VALUE o, int is_void);
 
 #ifdef __cplusplus
 }
 #endif
+
+/* SWIG >= 4.3.0 version */
+inline VALUE
+SWIG_Ruby_AppendOutput(VALUE target, VALUE o, int is_void)
+{
+  return SWIG_wxRuby_AppendOutput(target, o, is_void);
+}
+
+/* SWIG < 4.3.0 version */
+inline VALUE
+SWIG_Ruby_AppendOutput(VALUE target, VALUE o)
+{
+  return SWIG_wxRuby_AppendOutput(target, o, -1);
+}

data/lib/wx/aui/auimanager.rb

@@ -2,19 +2,66 @@
 #
 # This software is released under the MIT license.
 
-class Wx::AUI::AuiManager
-  def get_all_panes
-    ::Enumerator.new { |y| each_pane { |p| y << p } }
-  end
-  alias :all_panes :get_all_panes
-
-  unless Wx::EvtHandler.event_type_for_name(:evt_aui_find_manager)
-    # missing from XML API refs
-    Wx::EvtHandler.register_event_type Wx::EvtHandler::EventType[
-      'evt_aui_find_manager', 0,
-      Wx::AUI::EVT_AUI_FIND_MANAGER,
-      Wx::AUI::AuiManagerEvent
-    ] if Wx::AUI.const_defined?(:EVT_AUI_FIND_MANAGER)
-  end
+module Wx
+  module AUI
+
+    class AuiManager
+
+      wx_each_pane = instance_method(:each_pane)
+      define_method(:each_pane) do |&block|
+        if block
+          wx_each_pane.bind(self).call(&block)
+        else
+          ::Enumerator.new { |y| wx_each_pane.bind(self).call { |p| y << p } }
+        end
+      end
+
+      def get_all_panes
+        each_pane.to_a
+      end
+      alias :all_panes :get_all_panes
+
+      unless Wx::EvtHandler.event_type_for_name(:evt_aui_find_manager)
+        # missing from XML API refs
+        Wx::EvtHandler.register_event_type Wx::EvtHandler::EventType[
+                                             'evt_aui_find_manager', 0,
+                                             Wx::AUI::EVT_AUI_FIND_MANAGER,
+                                             Wx::AUI::AuiManagerEvent
+                                           ] if Wx::AUI.const_defined?(:EVT_AUI_FIND_MANAGER)
+      end
+    end
+
+    if WXWIDGETS_VERSION >= '3.3.0'
+
+      class AuiDockInfo
 
+        wx_each_pane = instance_method(:each_pane)
+        define_method(:each_pane) do |&block|
+          if block
+            wx_each_pane.bind(self).call(&block)
+          else
+            ::Enumerator.new { |y| wx_each_pane.bind(self).call { |p| y << p } }
+          end
+        end
+
+        def get_panes
+          each_pane.to_a
+        end
+        alias :panes :get_panes
+
+      end
+
+      class AuiDeserializer
+
+        wx_initialize = instance_method(:initialize)
+        define_method(:initialize) do |manager|
+          wx_initialize.bind(self).call(manager)
+          @manager = manager # prevent GC for lifetime of deserializer
+        end
+
+      end
+
+    end
+
+  end
 end

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

@@ -25,6 +25,7 @@ module Wx
       x, y = self
       Wx::RealPoint.new(x || Wx::DEFAULT_COORD, y || Wx::DEFAULT_COORD)
     end
+    alias :to_real :to_real_point
 
   end
 

data/lib/wx/core/brush.rb

@@ -6,8 +6,16 @@
 # Copyright 2004-2007, wxRuby development team
 # released under the MIT-like wxRuby2 license
 
+require_relative './enum'
+
 module Wx
 
   TheBrushList = Wx::Brush
 
+  class BrushStyle < Wx::Enum
+
+    set_non_distinct(%i[BRUSHSTYLE_INVALID BRUSHSTYLE_FIRST_HATCH BRUSHSTYLE_LAST_HATCH])
+
+  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/defs.rb

@@ -0,0 +1,49 @@
+# 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
+
+require_relative './enum'
+
+module Wx
+
+  class Orientation < Wx::Enum
+
+    set_non_distinct(%i[ORIENTATION_MASK])
+
+  end
+
+  class Direction < Wx::Enum
+
+    set_non_distinct(%i[TOP BOTTOM NORTH SOUTH WEST EAST ALL DIRECTION_MASK])
+
+  end
+
+  class Alignment < Wx::Enum
+
+    set_non_distinct(%i[ALIGN_INVALID ALIGN_CENTRE_HORIZONTAL ALIGN_LEFT ALIGN_TOP ALIGN_CENTRE_VERTICAL ALIGN_CENTER ALIGN_MASK])
+
+  end
+
+  class SizerFlagBits < Wx::Enum
+
+    set_non_distinct(%i[SIZER_FLAG_BITS_MASK])
+
+  end
+
+  class Stretch < Wx::Enum
+
+    set_non_distinct(%i[GROW STRETCH_MASK])
+
+  end
+
+  class Border < Wx::Enum
+
+    set_non_distinct(%i[BORDER_THEME BORDER_MASK])
+
+  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/enum.rb

@@ -10,10 +10,23 @@ class Wx::Enum
 
   class << self
 
-    def enumerators
+    def set_non_distinct(lst)
+      raise TypeError, 'Expected Array of Symbols' unless lst.is_a?(Array) && lst.all? { |e| e.is_a?(Symbol) }
+      @non_distinct = lst
+    end
+    alias :non_distinct= :set_non_distinct
+
+    def non_distinct
+      @non_distinct || []
+    end
+
+    def enumerators(excludes = nil)
+      excludes ||= self.non_distinct
       self.constants(false).inject({}) do |tbl, cn|
-        cv = self.const_get(cn)
-        tbl[cv.to_i] = cn if self === cv
+        unless excludes&.include?(cn)
+          cv = self.const_get(cn)
+          tbl[cv.to_i] = cn if self === cv
+        end
         tbl
       end
     end

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

@@ -1,5 +1,13 @@
+# 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
 
 require_relative './font/encoding'
+require_relative './enum'
 
 module Wx
 
@@ -27,4 +35,10 @@ module Wx
   # can be accessed through that name too.
   TheFontList = Font
 
+  class FontFlag < Wx::Enum
+
+    set_non_distinct(%i[FONTFLAG_MASK])
+
+  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/hboxsizer.rb

@@ -9,14 +9,34 @@
 # Just a shortcut version for creating a horizontal box sizer
 
 class Wx::HBoxSizer < Wx::BoxSizer
-  def initialize
-    super(Wx::HORIZONTAL)
+  def initialize(&block)
+    super(Wx::HORIZONTAL, &nil)
+    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)
-    super(Wx::HORIZONTAL)
+  def initialize(flags=Wx::WRAPSIZER_DEFAULT_FLAGS, &block)
+    super(Wx::HORIZONTAL, &nil)
+    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

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

@@ -6,8 +6,28 @@
 # Copyright 2004-2007, wxRuby development team
 # released under the MIT-like wxRuby2 license
 
+require_relative './enum'
+
 module Wx
 
   ThePenList = Wx::Pen
 
+  class PenStyle < Wx::Enum
+
+    set_non_distinct(%i[PENSTYLE_INVALID PENSTYLE_FIRST_HATCH PENSTYLE_LAST_HATCH])
+
+  end
+
+  class PenJoin < Wx::Enum
+
+    set_non_distinct(%i[JOIN_INVALID])
+
+  end
+
+  class PenCap < Wx::Enum
+
+    set_non_distinct(%i[CAP_INVALID])
+
+  end
+
 end

data/lib/wx/core/real_point.rb

@@ -111,6 +111,7 @@ class Wx::RealPoint
   def to_real_point
     self
   end
+  alias :to_real :to_real_point
 
   def dup
     Wx::RealPoint.new(self.x, self.y)