wxruby3 1.5.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4076c5fcd81a2bd38c5e53367b337a7a0f2590f047bcf12def1bd3d3df9d301
-  data.tar.gz: ade42868f8a79fcc293af4b9070eab971f80a0871a1a0fe7384d55a144a77332
+  metadata.gz: 365785c8c4a67019170ce82f52b08eef0c29c1eeaf83f9868edaf5883e5ca2a2
+  data.tar.gz: 48ea3a4a58c2f3f4cb2abab5a935a4b62b933f9413d007dc154aa92e038dc0ac
 SHA512:
-  metadata.gz: 6e9d0f837e87dc24ddbcc17a4eff510ba6af44bc3f108c76301b0fb36d86a496dab422127c7fc0b917470f5b282709696448a6d0f8a1256d18c9a2a46c972a63
-  data.tar.gz: 9065c12716485ebcefdd5a01bbb3ef7f4a3bf56c3b8aba3e12b6b4c189766e8a1279591a55553fc9e898838488f78993f95d31cd12a0c3b5e9525398d7fd4c8c
+  metadata.gz: b5921c7a072a6d44baa1afeea45718abf9e632e7b23ed5a24a431589dcc889bda5bafeb3b78d09cb9aebdfc07e752796849a9dbee95259abc7260a2d09974f85
+  data.tar.gz: ab2d3f5579f563a37f7eb61256c4ad95d1498f4b6adf23cb732c6675826c2869d351f049dc91d544427ce0b218e7b1327b8a179ab1dde8c4ed5b1025ce80b206

data/lib/wx/aui/auinotebook.rb

@@ -4,27 +4,36 @@
 
 # Advanced User Interface Notebook - draggable panes etc
 
-class Wx::AUI::AuiNotebook
+module  Wx
+  module AUI
 
-  # 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'
-    wx_initialize = instance_method :initialize
-    wx_redefine_method :initialize do |*args|
-      wx_initialize.bind(self).call(*args)
-      evt_window_destroy { |evt| evt.skip }
+    if Wx::WXWIDGETS_VERSION >= '3.3'
+      AuiDefaultTabArt = AuiFlatTabArt
     end
-  end
 
-  # Convenience method for iterating pages
-  def each_page
-    if block_given?
-      0.upto(get_page_count - 1) do | i |
-        yield get_page(i)
+    class AuiNotebook
+
+      # 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'
+        wx_initialize = instance_method :initialize
+        wx_redefine_method :initialize do |*args|
+          wx_initialize.bind(self).call(*args)
+          evt_window_destroy { |evt| evt.skip }
+        end
+      end
+
+      # Convenience method for iterating pages
+      def each_page
+        if block_given?
+          0.upto(get_page_count - 1) do | i |
+            yield get_page(i)
+          end
+        else
+          ::Enumerator.new { |y| each_page { |pg| y << pg } }
+        end
       end
-    else
-      ::Enumerator.new { |y| each_page { |pg| y << pg } }
     end
   end
 end

data/lib/wx/core/dialog.rb

@@ -21,13 +21,41 @@ class Wx::Dialog
 
   end
 
+  def create_button_sizer(flags)
+    if Wx.has_feature?(:USE_BUTTON)
+      create_std_dialog_button_sizer(flags)
+    else
+      nil
+    end
+  end
+
+  def create_separated_sizer(sizer)
+    # Mac Human Interface Guidelines recommend not to use static lines as
+    # grouping elements
+    if Wx.has_feature?(:USE_STATLINE) && Wx::PLATFORM != 'WXOSX'
+      topsizer = Wx::VBoxSizer.new
+      topsizer.add(Wx::StaticLine.new(self),
+                   Wx::SizerFlags.new.expand.double_border(Wx::BOTTOM))
+      topsizer.add(sizer, Wx::SizerFlags.new.expand)
+      sizer = topsizer
+    end
+
+    sizer
+  end
+
+  def create_separated_button_sizer(flags)
+      sizer = create_button_sizer(flags)
+      return create_separated_sizer(sizer) if sizer
+      nil
+  end
+
   module Functor
     def self.included(klass)
       scope = klass.name.split('::')
       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/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/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/helpers.rb

@@ -19,16 +19,14 @@ module Wx
   # structs containing the keyword name and default value for each
   # possible argument. +mixed_args+ is an array which may optionally end
   # with a set of named arguments
-  def self.args_as_list(param_spec, *mixed_args)
+  def self.args_as_list(param_spec, *args, **kwargs)
 
     begin
-      # get keyword arguments from mixed args if supplied, else empty
-      kwa = mixed_args.last.kind_of?(Hash) ? mixed_args.pop : {}
       out_args = []
       param_spec.each_with_index do | param, i |
         # has supplied list arg or the keyword arg?
-        arg = mixed_args[i]
-        arg = kwa.delete(param.name) if arg.nil? && kwa.key?(param.name)
+        arg = args[i]
+        arg = kwargs.delete(param.name) if arg.nil? && kwargs.key?(param.name)
         if Proc === param.default_or_proc
           arg = param.default_or_proc.call(arg) # provides default or converts arg
         elsif arg.nil?
@@ -37,13 +35,13 @@ module Wx
         out_args << arg
       end
     rescue
-      Kernel.raise ArgumentError, 
-                 "Bad arg composition of #{mixed_args.inspect}"
+      Kernel.raise ArgumentError,
+                   "Bad arg composition of #{args.inspect}"
     end
 
-    unless kwa.empty?
-      Kernel.raise ArgumentError, 
-                 "Unknown keyword argument(s) : #{kwa.keys.inspect}"
+    unless kwargs.empty?
+      Kernel.raise ArgumentError,
+                   "Unknown keyword argument(s) : #{kwargs.keys.inspect}"
     end
 
     out_args

data/lib/wx/keyword_ctors.rb

@@ -164,18 +164,16 @@ module Wx
         end
       end
 
-      def args_as_list(*mixed_args)
-        Wx::args_as_list(param_spec, *mixed_args)
-      end
-
-      def args_as_hash(*mixed_args)
-        kwa = mixed_args.last.kind_of?(Hash) ? mixed_args.pop : {}
-        param_spec.zip(mixed_args) do | param, arg |
-          kwa[param.name] = arg if arg
+      if RUBY_VERSION < '3.0.0'
+        def args_as_list(*mixed_args)
+          Wx::args_as_list(param_spec, *mixed_args)
+        end
+      else
+        def args_as_list(*args, **kwargs)
+          Wx::args_as_list(param_spec, *args, **kwargs)
         end
-        kwa 
       end
-      
+
       def describe_constructor(txt = '')
         param_spec.inject(txt) do | desc, param |
           if Proc === param.default_or_proc
@@ -198,7 +196,7 @@ module Wx
         # The new definition of initialize; accepts a parent arg
         # mixed_args, which may zero or more position args, optionally
         # terminated with hash keyword args, and an optional block
-        wx_redefine_method :initialize do |parent = :default_ctor, *mixed_args, &block|
+        wx_redefine_method :initialize do |parent = :default_ctor, *args, **kwargs, &block|
           # allow zero-args ctor for use with XRC
           if parent == :default_ctor
             pre_wx_kwctor_init
@@ -206,11 +204,11 @@ module Wx
           end
 
           real_args = begin
-                        [ parent ] + self.class.args_as_list(*mixed_args)
+                        [ parent ] + self.class.args_as_list(*args, **kwargs)
                       rescue => err
                         msg = "Error initializing #{self.inspect}\n"+
                           " : #{err.message} \n" +
-                          "Provided are #{[parent] + mixed_args} \n" +
+                          "Provided are #{[parent] + args + [kwargs]} \n" +
                           "Correct parameters for #{self.class.name}.new are:\n" +
                           self.class.describe_constructor(":parent => (Wx::Window)\n")
 

data/lib/wx/rtc/richtext_formatting_dialog.rb

@@ -23,7 +23,7 @@ module Wx::RTC
     end
 
     # now redefine the overridden ctor to account for deviating arglist
-    wx_redefine_method :initialize do |flags = nil, parent = nil, *mixed_args, &block|
+    wx_redefine_method :initialize do |flags = nil, parent = nil, *args, **kwargs, &block|
       # allow zero-args ctor for use with XRC
       if flags.nil?
         pre_wx_kwctor_init
@@ -31,11 +31,11 @@ module Wx::RTC
       end
 
       real_args = begin
-                    [ flags, parent ] + self.class.args_as_list(*mixed_args)
+                    [ flags, parent ] + self.class.args_as_list(*args, **kwargs)
                   rescue => err
                     msg = "Error initializing #{self.inspect}\n"+
                       " : #{err.message} \n" +
-                      "Provided are #{[ flags, parent ] + mixed_args} \n" +
+                      "Provided are #{[ flags, parent ] + args + [kwargs]} \n" +
                       "Correct parameters for #{self.class.name}.new are:\n" +
                       self.class.describe_constructor(
                         ":flags => (Integer)\n:parent => (Wx::Window)\n")

data/lib/wx/rtc/richtext_style_organiser_dialog.rb

@@ -12,13 +12,13 @@ class Wx::RTC::RichTextStyleOrganiserDialog
   end
 
   # now redefine the overridden ctor to account for deviating arglist
-  wx_redefine_method :initialize do |flags, sheet, ctrl, parent = nil, *mixed_args, &block|
+  wx_redefine_method :initialize do |flags, sheet, ctrl, parent = nil, *args, **kwargs, &block|
     real_args = begin
-                  [ flags, sheet, ctrl, parent ] + self.class.args_as_list(*mixed_args)
+                  [ flags, sheet, ctrl, parent ] + self.class.args_as_list(*args, **kwargs)
                 rescue => err
                   msg = "Error initializing #{self.inspect}\n"+
                     " : #{err.message} \n" +
-                    "Provided are #{[ flags, sheet, ctrl, parent ] + mixed_args} \n" +
+                    "Provided are #{[ flags, sheet, ctrl, parent ] + args + [kwargs]} \n" +
                     "Correct parameters for #{self.class.name}.new are:\n" +
                     self.class.describe_constructor(
                       ":flags => (Integer)\n:sheet => (Wx::RTC::RichTextStyleSheet)\n:ctrl => (Wx::RTC::RichTextCtrl)\n:parent => (Wx::Window)\n")

data/lib/wx/rtc/symbol_picker_dialog.rb

@@ -13,13 +13,13 @@ class Wx::RTC::SymbolPickerDialog
   end
 
   # now redefine the overridden ctor to account for deviating arglist
-  wx_redefine_method :initialize do |symbol, initialFont, normalTextFont, parent = nil, *mixed_args, &block|
+  wx_redefine_method :initialize do |symbol, initialFont, normalTextFont, parent = nil, *args, **kwargs, &block|
     real_args = begin
-                  [ symbol, initialFont, normalTextFont, parent ] + self.class.args_as_list(*mixed_args)
+                  [ symbol, initialFont, normalTextFont, parent ] + self.class.args_as_list(*args, **kwargs)
                 rescue => err
                   msg = "Error initializing #{self.inspect}\n"+
                     " : #{err.message} \n" +
-                    "Provided are #{[ symbol, initialFont, normalTextFont, parent ] + mixed_args} \n" +
+                    "Provided are #{[ symbol, initialFont, normalTextFont, parent ] + args + [kwargs]} \n" +
                     "Correct parameters for #{self.class.name}.new are:\n" +
                     self.class.describe_constructor(
                       ":symbol => (String)\n:initialFont => (String)\n:normalTextFont => (String)\n:parent => (Wx::Window)\n")

data/lib/wx/version.rb

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

data/rakelib/lib/director/aui_tab_art.rb

@@ -14,7 +14,12 @@ module WXRuby3
 
       def setup
         super
-        spec.items << 'wxAuiDefaultTabArt' << 'wxAuiSimpleTabArt'
+        if Config.instance.wx_version >= '3.3.0'
+          spec.items << 'wxAuiFlatTabArt' << 'wxAuiSimpleTabArt'
+          spec.ignore 'wxAuiDefaultTabArt', 'wxAuiNativeTabArt'
+        else
+          spec.items << 'wxAuiDefaultTabArt' << 'wxAuiSimpleTabArt'
+        end
         spec.gc_as_object
         spec.disable_proxies
         # missing from interface documentation
@@ -92,8 +97,54 @@ module WXRuby3
                               'wxAuiSimpleTabArt::Clone')
         spec.do_not_generate(:variables, :defines, :enums, :functions)
       end
+
+
+      def generator
+        WXRuby3::AuiTabArtGenerator.new(self)
+      end
+      protected :generator
+
+      def doc_generator
+        WXRuby3::AuiTabArtDocGenerator.new(self)
+      end
+      protected :doc_generator
+
     end # class AuiTabArt
 
   end # class Director
 
+  class AuiTabArtGenerator < InterfaceGenerator
+
+    def gen_interface_classes(fout)
+      super
+      if Config.instance.wx_version >= '3.3.0'
+        fout.puts
+        fout.puts 'class wxAuiNativeTabArt : public wxAuiTabArt'
+        fout.puts '{'
+        fout.puts '};'
+      end
+    end
+
+  end
+
+  class AuiTabArtDocGenerator < DocGenerator
+    def gen_class_doc(fdoc)
+      super
+      if Config.instance.wx_version >= '3.3.0'
+        fdoc.doc.puts 'Wx::AUI::AuiNativeTabArt is either an art provider providing native-like appearance (WXMSW and WXGTK) or a generic Tab Art provider if not available.'
+        fdoc.puts 'class AuiNativeTabArt < AuiTabArt; end'
+        fdoc.puts
+      end
+    end
+    def gen_constants_doc(fdoc)
+      super
+      if Config.instance.wx_version >= '3.3.0'
+        fdoc.doc.puts 'Wx::AUI::AuiDefaultTabArt is an alias for the tab art provider used by {Wx::AUI::AuiNotebook} by default.'
+        fdoc.doc.puts 'Since wxWidgets 3.3.0, this is {Wx::AUI::AuiFlatTabArt} under all platforms. In the previous versions, this was wxAuiNativeTabArt.'
+        fdoc.puts 'AuiDefaultTabArt = Wx::AUI::AuiFlatTabArt'
+        fdoc.puts
+      end
+    end
+  end
+
 end # module WXRuby3

data/rakelib/lib/director/dialog.rb

@@ -34,7 +34,28 @@ module WXRuby3
             extern VALUE wxRuby_GetDialogClass() {
               return SwigClassWxDialog.klass;
             }
-          __HEREDOC
+            __HEREDOC
+          spec.ignore 'wxDialog::CreateButtonSizer',            # pure Ruby impl
+                      'wxDialog::CreateSeparatedButtonSizer',   # pure Ruby impl
+                      'wxDialog::CreateSeparatedSizer',         # pure Ruby impl
+                      'wxDialog::CreateTextSizer',              # custom impl
+                      ignore_doc: false
+          spec.new_object 'wxDialog::CreateStdDialogButtonSizer' if Config.instance.features_set?('USE_BUTTON')
+          spec.add_extend_code 'wxDialog', <<~__HEREDOC
+            VALUE CreateTextSizer(const wxString& message, int widthMax)
+            {
+              wxSizer* txt_szr = $self->CreateTextSizer(message, widthMax);
+              if (txt_szr) 
+              {
+                // Get the wx class
+                wxString class_name( txt_szr->GetClassInfo()->GetClassName() );
+                swig_type_info* swig_type = wxRuby_GetSwigTypeForClassName(class_name);
+                if (swig_type)
+                  return SWIG_NewPointerObj(SWIG_as_voidptr(txt_szr), swig_type, SWIG_POINTER_OWN |  0 );
+              } 
+              return Qnil;
+            }
+            __HEREDOC
         when 'wxMessageDialog'
           spec.ignore 'wxMessageDialog::ButtonLabel'
           spec.map 'const ButtonLabel&' => 'String,Integer' do

data/rakelib/lib/director/sizer.rb

@@ -139,6 +139,36 @@ module WXRuby3
                                 'wxSizerItem * Add(wxWindow *window, const wxGBPosition &pos, const wxGBSpan &span=wxDefaultSpan, int flag=0, int border=0, wxObject *userData=NULL)',
                                 'wxSizerItem * Add(int width, int height, const wxGBPosition &pos, const wxGBSpan &span=wxDefaultSpan, int flag=0, int border=0, wxObject *userData=NULL)'
           spec.disown 'wxSizer* sizer_disown'
+          spec.map 'const wxGBPosition&' => 'Array(Integer, Integer), Wx::GBPosition',
+                   'const wxGBSpan&' => 'Array(Integer, Integer), Wx::GBSpan' do
+            add_header_code '#include <memory>'
+            map_in temp: 'std::unique_ptr<$1_basetype> tmp', code: <<~__CODE
+            if ( TYPE($input) == T_DATA )
+            {
+              void* argp$argnum;
+              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0);
+              $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
+            }
+            else if ( TYPE($input) == T_ARRAY )
+            {
+              $1 = new $1_basetype( NUM2INT( rb_ary_entry($input, 0) ),
+                                   NUM2INT( rb_ary_entry($input, 1) ) );
+              tmp.reset($1); // auto destruct when method scope ends 
+            }
+            else
+            {
+              rb_raise(rb_eTypeError, "Wrong type for $1_basetype parameter");
+            }
+            __CODE
+            map_typecheck precedence: 'POINTER', code: <<~__CODE
+            void *vptr = 0;
+            $1 = 0;
+            if (TYPE($input) == T_ARRAY && RARRAY_LEN($input) == 2)
+              $1 = 1;
+            else if (TYPE($input) == T_DATA && SWIG_CheckState (SWIG_ConvertPtr ($input, &vptr, $1_descriptor, 0)))
+              $1 = 1;
+            __CODE
+          end
         end
         # no real use for allowing these to be overloaded but a whole lot of grieve
         # if we do allow it

data/tests/test_dialog.rb

@@ -16,5 +16,66 @@ class DialogTests < Test::Unit::TestCase
     dlg = TestDialog.new
     assert_kind_of(Wx::Dialog, dlg)
     assert_kind_of(Wx::Window, dlg)
+    dlg.destroy
+  end
+
+  class  TestDialog2 < Wx::Dialog
+    def initialize
+      super(nil, -1,  'Test Dialog')
+
+      sizer_top = Wx::VBoxSizer.new
+      sizer_top.add(Wx::StaticText.new(self, label: 'Some text ...'))
+
+      sizer_btn = Wx::HBoxSizer.new
+      btn_focused = Wx::Button.new(self, -1, "Default button")
+      btn_other = Wx::Button.new(self, -1, "&Another button")
+      btn_close = Wx::Button.new(self, Wx::ID_CANCEL, "&Close")
+      sizer_btn.add(btn_focused, 0, Wx::ALIGN_CENTER | Wx::ALL, 5)
+      sizer_btn.add(btn_other, 0, Wx::ALIGN_CENTER | Wx::ALL, 5)
+      sizer_btn.add(btn_close, 0, Wx::ALIGN_CENTER | Wx::ALL, 5)
+
+      sizer_top.add(create_separated_sizer(sizer_btn))
+
+      set_auto_layout(true)
+      set_sizer(sizer_top)
+
+      sizer_top.set_size_hints(self)
+      sizer_top.fit(self)
+
+      btn_focused.set_focus
+      btn_focused.set_default
+    end
+  end
+
+  def test_dialog_with_separated_sizer
+    dlg = TestDialog2.new
+    dlg.show(true)
+    200.times { Wx.get_app.yield }
+    sleep(2) unless is_ci_build?
+    dlg.destroy
+  end
+
+  class TestDialog3 < Wx::Dialog
+    def initialize
+      super(nil, -1,  'Test Dialog')
+
+      sizer_top = Wx::VBoxSizer.new
+      sizer_top.add(Wx::StaticText.new(self, label: 'Some text ...'))
+      sizer_top.add(create_separated_button_sizer(Wx::YES_NO|Wx::CANCEL))
+
+      set_auto_layout(true)
+      set_sizer(sizer_top)
+
+      sizer_top.set_size_hints(self)
+      sizer_top.fit(self)
+    end
+  end
+
+  def test_dialog_with_button_sizer
+    dlg = TestDialog3.new
+    dlg.show(true)
+    200.times { Wx.get_app.yield }
+    sleep(2) unless is_ci_build?
+    dlg.destroy
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.4
 platform: ruby
 authors:
 - Martin Corino
 bindir: bin
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -1210,7 +1210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: wxWidgets extension for Ruby
 test_files: []