wxruby3 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed10da8feaf6d3e77a775f3386dd9970314810239e7e4ce1c2c447658f6f4106
-  data.tar.gz: 125e2ddedb7148987456508b887dacae1262753a408cd39503faff80fe6435cc
+  metadata.gz: c43cace6f097af04e2d856782258313acd4e340719cf7794db36534e6d5e644b
+  data.tar.gz: 2f93d3489b95ca1a49ce2734222088aab5574841dd337d19fef58ec7a84587fb
 SHA512:
-  metadata.gz: dbe29edc61e3c139efec7d90d5f80b17b3671c141f3f6f3421905320de87b2900e90785bd83550e6b9d502bb184bef4a58c5061c7271629dc5f83d4c2f55ac94
-  data.tar.gz: 2b420414ee1c4b8eefa3fa797c5452e8490048876bfe2172fa14f8ffdd4937c907a4714c6af1650768e91cab08f4746881b5c19989bf66778f4ed4a1d2506020
+  metadata.gz: 1db323073fdde9896d9ea6d8ffb9dee71e3f52f52d2836603ff5e6f7274003bb252bc4cff832574454ad4390686a79b1ef01467d5e3b7362aad36d464c67f5ac
+  data.tar.gz: 0057e4f8462c5b4e2dd79e736ca417cea70305b38efdc796bcc32a8f22fd12d178824ebe92e5d4cca219e1e1dbcafcb9200b5d00d7052d89ddd8f905729af4a0

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

@@ -189,6 +189,9 @@ namespace Swig {
     }
   };
 
+// SWIG < 4.3.0
+#if SWIG_VERSION < 0x040300
+
   /* Simple thread abstraction for pthreads on win32 */
 #ifdef __THREAD__
 # define __PTHREAD__
@@ -219,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 */
@@ -258,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>
@@ -287,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/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/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/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/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/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/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)

data/lib/wx/core/sizer.rb

@@ -6,57 +6,184 @@
 # Copyright 2004-2007, wxRuby development team
 # released under the MIT-like wxRuby2 license
 
-# Class for automatically managing layouts
+# Classes for automatically managing layouts
 
-class Wx::Sizer
-  # Generic method to add items, supporting positional and named
-  # arguments
-  ADD_ITEM_PARAMS = [ Wx::Parameter[ :index, -1 ], 
-                      Wx::Parameter[ :proportion, 0 ],
-                      Wx::Parameter[ :flag, 0 ],
-                      Wx::Parameter[ :border, 0 ] ]
-  
-  def add_item(item, *mixed_args)
+module Wx
+  class Sizer
+    # Generic method to add items, supporting positional and named
+    # arguments
+    ADD_ITEM_PARAMS = [Wx::Parameter[:index, -1],
+                       Wx::Parameter[:proportion, 0],
+                       Wx::Parameter[:flag, 0],
+                       Wx::Parameter[:border, 0]]
 
-    begin
-      args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
-    rescue => err
-      err.set_backtrace(caller)
-      Kernel.raise err
+    def add_item(item, *mixed_args)
+
+      begin
+        args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
+      rescue => err
+        err.set_backtrace(caller)
+        Kernel.raise err
+      end
+
+      full_args = []
+
+      # 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
+      end
+
+      # update the full arguments list with the optional arguments (except index)
+      idx = args.shift
+      full_args.concat(args)
+
+      # Call add to append if default position
+      if idx == -1
+        add(*full_args)
+      else
+        insert(idx, *full_args)
+      end
+    end
+
+    # Overload to provide Enumerator without block
+    wx_each_child = instance_method :each_child
+    define_method :each_child do |&block|
+      if block
+        wx_each_child.bind(self).call(&block)
+      else
+        ::Enumerator.new { |y| wx_each_child.bind(self).call { |c| y << c } }
+      end
+    end
+
+  end
+
+  class BoxSizer < Sizer
+
+    wx_initialize = instance_method :initialize
+    define_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      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
+
+  class WrapSizer < BoxSizer
+
+    wx_initialize = instance_method :initialize
+    define_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      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
 
-    full_args = []
+  end
+
+  class StaticBoxSizer < BoxSizer
 
-    # 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
+    wx_initialize = instance_method :initialize
+    define_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      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
 
-    # 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)
-    else
-      insert(idx, *full_args)
+  class StdDialogButtonSizer < BoxSizer
+
+    wx_initialize = instance_method :initialize
+    define_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      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
 
-  # Overload to provide Enumerator without block
-  wx_each_child = instance_method :each_child
-  define_method :each_child do |&block|
-    if block
-      wx_each_child.bind(self).call(&block)
-    else
-      ::Enumerator.new { |y| wx_each_child.bind(self).call { |c| y << c } }
+  class GridSizer < Sizer
+
+    wx_initialize = instance_method :initialize
+    define_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      self.instance_eval(&block) if block
     end
+
+  end
+
+  class FlexGridSizer < GridSizer
+
+    wx_initialize = instance_method :initialize
+    define_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      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
+
+  class GridBagSizer < FlexGridSizer
+
+    wx_initialize = instance_method :initialize
+    define_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      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
 
 end

data/lib/wx/core/vboxsizer.rb

@@ -9,14 +9,34 @@
 # Just a shortcut version for creating a vertical box sizer
 
 class Wx::VBoxSizer < Wx::BoxSizer
-  def initialize
-    super(Wx::VERTICAL)
+  def initialize(&block)
+    super(Wx::VERTICAL, &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 vertical wrap sizer
 class Wx::VWrapSizer < Wx::WrapSizer
-  def initialize(flags=Wx::WRAPSIZER_DEFAULT_FLAGS)
-    super(Wx::VERTICAL)
+  def initialize(flags=Wx::WRAPSIZER_DEFAULT_FLAGS, &block)
+    super(Wx::VERTICAL, &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/doc/array_ext.rb

@@ -27,6 +27,7 @@ module Wx
     # The array is not altered.
     # @return [Wx::RealPoint]
     def to_real_point; end
+    alias :to_real :to_real_point
 
   end
 

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

@@ -12,7 +12,9 @@ module Wx
     class AuiManager
 
       # 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
 
       # Returns an array of all panes managed by the frame manager.

data/lib/wx/doc/enum.rb

@@ -18,6 +18,32 @@ module Wx
   # type safety for arguments requiring the specific enum class.
   class Enum < Numeric
 
+    class << self
+
+      # Sets a class specific list of enumerator ids (symbols) that should be considered
+      # non-distinctive enum values (examples would be convenience constants combining
+      # multiple distinctive enumerators or enumerators denoting the first/lowest and/or last/highest
+      # distinctive enumerators). Mostly useful for bitmask enum classes.
+      # @param [Array<Symbol>] lst
+      def set_non_distinct(lst) end
+      alias :non_distinct= :set_non_distinct
+
+      # Returns the class specific list of enumerator ids (symbols) that should be considered
+      # non-distinctive enum values. Returns nil if not set.
+      # @see set_non_distinct
+      # @return [Array<Symbol>,nil]
+      def non_distinct; end
+
+      # Returns a hash table with enumerator value : enumerator id (symbol) pairs for the enum class.
+      # @param [Array<Symbol>, nil] excludes list of enumerator ids (symbols) to exclude (by default the non_distinct list is used if defined)
+      # @return [Hash(Integer, Symbol)]
+      def enumerators(excludes = nil) end
+
+      # Returns the enumerator for the given enumerator symbol or nil if no such enumerator exists.
+      # @return [Wx::Enum, nil]
+      def [](enum_name) end
+    end
+
     # Initialize a new enum value.
     # @param [Integer] val enum integer value
     def initialize(val)end

data/lib/wx/doc/gdi_common.rb

@@ -209,6 +209,7 @@ module Wx
     # Returns self.
     # @return [self]
     def to_real_point; end
+    alias :to_real :to_real_point
 
     # Set this point to the given point's x,y values
     # @param [Wx::RealPoint] pt

data/lib/wx/version.rb

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

data/rakelib/lib/core/include/swigrubyrun.inc

@@ -59,9 +59,9 @@ extern "C" {
 #endif
 
 WXRB_EXPORT_FLAG VALUE
-SWIG_Ruby_AppendOutput(VALUE target, VALUE o)
+SWIG_wxRuby_AppendOutput(VALUE target, VALUE o, int is_void)
 {
-  if (NIL_P(target))
+  if (NIL_P(target) && is_void != 0)
   {
     target = o;
   }

data/rakelib/lib/director/aui_manager.rb

@@ -16,7 +16,98 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_object
+        spec.gc_as_object 'wxAuiManager'
+        if Config.instance.wx_version >= '3.3.0'
+          spec.items << 'wxAuiSerializer' << 'wxAuiDockInfo' << 'wxAuiDeserializer'
+          spec.gc_as_untracked 'wxAuiSerializer', 'wxAuiDockInfo'
+          spec.regard 'wxAuiDockInfo::rect',
+                      'wxAuiDockInfo::dock_direction',
+                      'wxAuiDockInfo::dock_layer',
+                      'wxAuiDockInfo::dock_row',
+                      'wxAuiDockInfo::size',
+                      'wxAuiDockInfo::min_size',
+                      'wxAuiDockInfo::resizable',
+                      'wxAuiDockInfo::toolbar',
+                      'wxAuiDockInfo::fixed',
+                      'wxAuiDockInfo::reserved1'
+          spec.make_readonly 'wxAuiDockInfo::rect',
+                             'wxAuiDockInfo::dock_direction',
+                             'wxAuiDockInfo::dock_layer',
+                             'wxAuiDockInfo::dock_row',
+                             'wxAuiDockInfo::size',
+                             'wxAuiDockInfo::min_size',
+                             'wxAuiDockInfo::resizable',
+                             'wxAuiDockInfo::toolbar',
+                             'wxAuiDockInfo::fixed',
+                             'wxAuiDockInfo::reserved1'
+          spec.add_extend_code 'wxAuiDockInfo', <<~__HEREDOC
+            VALUE each_pane()
+            {
+              wxAuiPaneInfoPtrArray panes = self->panes;
+              VALUE rc = Qnil;
+              for (wxAuiPaneInfo* pane : panes)
+              {
+                VALUE r_pane = SWIG_NewPointerObj(pane, SWIGTYPE_p_wxAuiPaneInfo, 0);
+                rc = rb_yield(r_pane);
+              }	
+              return rc;
+            }
+            __HEREDOC
+          spec.map 'std::vector<wxAuiPaneInfo>' => 'Array<Wx::AuiPaneInfo>' do
+            map_out code: <<~__CODE
+              $result = rb_ary_new();
+              std::vector<wxAuiPaneInfo>& panes = (std::vector<wxAuiPaneInfo>&)$1;
+              for (const wxAuiPaneInfo& pane : panes)
+              {
+                VALUE r_pane = SWIG_NewPointerObj(new wxAuiPaneInfo(pane), SWIGTYPE_p_wxAuiPaneInfo, SWIG_POINTER_OWN);
+                rb_ary_push($result, r_pane);
+              }
+              __CODE
+            map_directorout code: <<~__CODE
+              if (TYPE($input) == T_ARRAY)
+              {
+                for (int i = 0; i < RARRAY_LEN($input); i++)
+                {
+                  void *ptr;
+                  VALUE r_pane = rb_ary_entry($input, i);
+                  int res = SWIG_ConvertPtr(r_pane, &ptr, SWIGTYPE_p_wxAuiPaneInfo, 0);
+                  if (!SWIG_IsOK(res) || !ptr) {
+                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "load_panes", rb_eTypeError, "in return value. Expected Array of Wx::AuiPaneInfo"); 
+                  }
+                  wxAuiPaneInfo *pane = reinterpret_cast< wxAuiPaneInfo * >(ptr);
+                  $result.push_back(*pane);
+                }
+              }
+              __CODE
+          end
+          spec.map 'std::vector<wxAuiDockInfo>' => 'Array<Wx::AuiDockInfo>' do
+            map_out code: <<~__CODE
+              $result = rb_ary_new();
+              std::vector<wxAuiDockInfo>& docks = (std::vector<wxAuiDockInfo>&)$1;
+              for (const wxAuiDockInfo& dock : docks)
+              {
+                VALUE r_dock = SWIG_NewPointerObj(new wxAuiDockInfo(dock), SWIGTYPE_p_wxAuiDockInfo, SWIG_POINTER_OWN);
+                rb_ary_push($result, r_dock);
+              }
+              __CODE
+            map_directorout code: <<~__CODE
+              if (TYPE($input) == T_ARRAY)
+              {
+                for (int i = 0; i < RARRAY_LEN($input); i++)
+                {
+                  void *ptr;
+                  VALUE r_dock = rb_ary_entry($input, i);
+                  int res = SWIG_ConvertPtr(r_dock, &ptr, SWIGTYPE_p_wxAuiDockInfo, 0);
+                  if (!SWIG_IsOK(res) || !ptr) {
+                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "load_docks", rb_eTypeError, "in return value. Expected Array of Wx::AuiDockInfo"); 
+                  }
+                  wxAuiDockInfo *dock = reinterpret_cast< wxAuiDockInfo * >(ptr);
+                  $result.push_back(*dock);
+                }
+              }
+              __CODE
+          end
+        end
         # need a custom implementation to handle (event handler proc) cleanup
         spec.add_header_code <<~__HEREDOC
           #include "wx/aui/aui.h"
@@ -80,7 +171,7 @@ module WXRuby3
               rb_gc_mark( rb_art_prov );
             }
           }
-          __HEREDOC
+        __HEREDOC
         spec.add_swig_code '%markfunc wxAuiManager "GC_mark_wxAuiManager";'
         # provide pure Ruby implementation based on use custom alternative provided below
         spec.ignore('wxAuiManager::GetAllPanes')
@@ -110,12 +201,36 @@ module WXRuby3
             WXRubyAuiManager* aui_mng = dynamic_cast<WXRubyAuiManager*> (self);
             managedWnd->Bind(wxEVT_CLOSE_WINDOW, &WXRubyAuiManager::OnManagedWindowClose, aui_mng);
           }
-          __HEREDOC
+        __HEREDOC
         spec.suppress_warning(473, 'wxAuiManager::CreateFloatingFrame')
         spec.do_not_generate(:variables, :defines, :enums, :functions) # with AuiPaneInfo
       end
+
+      def doc_generator
+        AuiManagerDocGenerator.new(self)
+      end
     end # class AuiManager
 
+    class AuiManagerDocGenerator < DocGenerator
+
+      def gen_class_doc_members(fdoc, clsdef, cls_members, alias_methods)
+        super
+        if Config.instance.wx_version >= '3.3.0' && clsdef.name == 'wxAuiDockInfo'
+          fdoc.doc.puts 'Yield each pane to the given block.'
+          fdoc.doc.puts 'If no block passed returns an Enumerator.'
+          fdoc.doc.puts '@yieldparam [Wx::AUI::AuiPaneInfo] pane the Aui pane info yielded'
+          fdoc.doc.puts '@return [::Object, ::Enumerator] result of last block execution or enumerator'
+          fdoc.puts 'def each_pane; end'
+          fdoc.puts
+          fdoc.doc.puts 'Returns an array of Wx::AuiPaneInfo for all panes managed by the frame manager.'
+          fdoc.doc.puts '@return [Array<Wx::AUI::AuiPaneInfo>] info for all managed panes'
+          fdoc.puts 'def get_panes; end'
+          fdoc.puts 'alias_method :panes, :get_panes'
+        end
+      end
+
+    end
+
   end # class Director
 
 end # module WXRuby3

data/rakelib/lib/director/dialog.rb

@@ -230,8 +230,10 @@ module WXRuby3
           # regard protected methods
           spec.regard 'wxGenericAboutDialog::DoAddCustomControls',
                       'wxGenericAboutDialog::AddControl',
-                      'wxGenericAboutDialog::AddText',
-                      'wxGenericAboutDialog::GetCustomControlParent'
+                      'wxGenericAboutDialog::AddText'
+          if Config.instance.wx_version >= '3.3.0'
+            spec.regard 'wxGenericAboutDialog::GetCustomControlParent'
+          end
           if Config.instance.features_set?('USE_COLLPANE')
             spec.regard 'wxGenericAboutDialog::AddCollapsiblePane'
           end

data/rakelib/lib/director/pgproperties.rb

@@ -141,7 +141,7 @@ module WXRuby3
           spec.map_apply 'int * OUTPUT' => 'int* pIndex'
         end
         # for UIntProperty and IntProperty
-        if Config.instance.features_set?('USE_LONGLONG')
+        if Config.instance.features_set?('USE_LONGLONG') || Config.instance.wx_version >= '3.3.0'
           # wxLongLong mapping to be considered before considering 'long' (see typecheck precedence)
           spec.map 'const wxLongLong&' => 'Integer' do
             map_in temp: 'wxLongLong tmp', code: <<~__CODE
@@ -162,7 +162,7 @@ module WXRuby3
           end
         else
           spec.ignore 'wxUIntProperty::wxUIntProperty(const wxString &, const wxString &, const wxULongLong &)',
-                      'wxIntProperty::wxUIntProperty(const wxString &, const wxString &, const wxLongLong &)'
+                      'wxIntProperty::wxIntProperty(const wxString &, const wxString &, const wxLongLong &)'
         end
         spec.new_object 'wxArrayStringProperty::CreateEditorDialog'
         spec.suppress_warning(473, 'wxArrayStringProperty::CreateEditorDialog')

data/rakelib/lib/director/property_grid_interface.rb

@@ -39,9 +39,10 @@ module WXRuby3
         spec.extend_interface 'wxPropertyGridInterface',
                               'void SetPropertyValues(const wxVariant &list, const wxPGPropArgCls& defaultCategory = 0)'
         # optionals
-        spec.ignore_unless 'USE_LONGLONG',
-                           'wxPropertyGridInterface::GetPropertyValueAsLongLong',
-                           'wxPropertyGridInterface::GetPropertyValueAsULongLong'
+        unless Config.instance.features_set?('USE_LONGLONG') || Config.instance.wx_version >= '3.3.0'
+          spec.ignore_unless 'wxPropertyGridInterface::GetPropertyValueAsLongLong',
+                             'wxPropertyGridInterface::GetPropertyValueAsULongLong'
+        end
         spec.ignore_unless 'USE_DATETIME', 'wxPropertyGridInterface::GetPropertyValueAsDateTime'
         spec.ignore_unless 'USE_VALIDATORS', 'wxPropertyGridInterface::GetPropertyValidator'
         # fix incorrect XML documentation

data/rakelib/lib/director/textctrl.rb

@@ -24,6 +24,13 @@ module WXRuby3
           spec.ignore 'wxTextCtrl::GTKGetTextBuffer',
                       'wxTextCtrl::GTKGetEditable'
         end
+        if Config.instance.wx_version >= '3.3.0' && Config.instance.wx_port == :wxmsw
+          spec.items << 'wxTextSearch' << 'wxTextSearchResult'
+          spec.regard 'wxTextSearchResult::m_start', 'wxTextSearchResult::m_end'
+          spec.make_readonly 'wxTextSearchResult::m_start', 'wxTextSearchResult::m_end'
+          spec.rename_for_ruby 'start' => 'wxTextSearchResult::m_start',
+                               'end' => 'wxTextSearchResult::m_end'
+        end
         if Config.instance.wx_port == :wxqt
           # not implemented
           spec.ignore 'wxTextCtrl::OnDropFiles'

data/rakelib/lib/director/variant.rb

@@ -142,7 +142,7 @@ module WXRuby3
                 {
                   return wxVariant(TYPE(rbval) == T_TRUE);
                 }
-          #ifdef wxUSE_LONGLONG
+          #if !defined(wxUSE_LONGLONG) || (wxUSE_LONGLONG == 1)
                 if ((sizeof(long) < 8) && (TYPE(rbval) == T_BIGNUM) && (rb_big_sign(rbval) == 0))
                 {
                   wxLongLong_t ll = rb_big2ll(rbval);
@@ -227,7 +227,7 @@ module WXRuby3
             $1 = rb_obj_is_kind_of($input, rb_const_get(mWxPG, var_ColourPropertyValue_id()));
           __CODE
         end
-        if Config.instance.features_set?('USE_LONGLONG')
+        if Config.instance.features_set?('USE_LONGLONG') || Config.instance.wx_version >= '3.3.0'
           # wxLongLong mapping to be considered before considering 'long' (see typecheck precedence)
           spec.map 'wxLongLong' => 'Integer' do
             map_in code: <<~__CODE

data/rakelib/lib/extractor/function.rb

@@ -49,6 +49,9 @@ module WXRuby3
           @template_params << txt
         end
         @args_string = element.at_xpath('argsstring').text
+        # transform unified initializers to ctor form (SWIG does not like unified initializers)
+        # (also see ParamDef#extract)
+        @args_string.gsub!(/(\w+(::\w+)*)\s*{([^}]*)}/) { |_| "#{$1}(#{$3})"}
         check_deprecated
         element.xpath('param').each do |node|
           p = ParamDef.new(node)
@@ -370,6 +373,8 @@ module WXRuby3
             end
             if element.at_xpath('defval')
               @default = BaseDef.flatten_node(element.at_xpath('defval'))
+              # transform unified initializers to ctor form (SWIG does not like unified initializers)
+              @default.sub!(/(\w+(::\w+)*)\s*{([^}]*)}/) { |_| "#{$1}(#{$3})"}
             end
           end
         rescue Exception

data/rakelib/lib/typemap/common.rb

@@ -364,7 +364,7 @@ module WXRuby3
               }
           __CODE
           map_directorout code: <<~__CODE
-            if (TYPE($input) != T_ARRAY)
+            if (TYPE($input) == T_ARRAY)
             {
               for (int i = 0; i < RARRAY_LEN($input); i++)
               {
@@ -398,7 +398,7 @@ module WXRuby3
             }
             __CODE
           map_directorout code: <<~__CODE
-            if (TYPE($input) != T_ARRAY)
+            if (TYPE($input) == T_ARRAY)
             {
               for (int i = 0; i < RARRAY_LEN($input); i++)
               {

data/samples/dialogs/dialogs.rb

@@ -167,7 +167,7 @@ module Dialogs
       end
 
       create(parent, -1, "Preferences")
-      create_buttons(Wx::ID_OK|Wx::ID_CANCEL)
+      create_buttons(Wx::OK|Wx::CANCEL)
       book_ctrl.set_images(imgs)
       book_ctrl.add_page(file_panel(book_ctrl), "File", false, img_id1)
       book_ctrl.add_page(cdrom_panel(book_ctrl), "CD ROM", false, img_id2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-15 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -172,6 +172,7 @@ files:
 - lib/wx/core/dataformat.rb
 - lib/wx/core/datetime.rb
 - lib/wx/core/dc.rb
+- lib/wx/core/defs.rb
 - lib/wx/core/dialog.rb
 - lib/wx/core/enum.rb
 - lib/wx/core/event.rb
@@ -1206,7 +1207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: wxWidgets extension for Ruby