wxruby3 0.9.0 → 0.9.1

data/rakelib/lib/core/parameter.rb

@@ -16,6 +16,9 @@ module WXRuby3
       CONST_RE = /(\A|\W)const(\W|\Z)/
       MULTI_WORD_TYPES = %w[char short int long]
       def initialize(param)
+        # prevent unwanted splitting on whitespaces in template type decls
+        param = param.gsub(/\<\s+/, '<')
+        param.gsub!(/\s+\>/, '>')
         @array = false
         if ::Array === param
           @ctype, @name, arr = param

data/rakelib/lib/director/accelerator.rb

@@ -69,7 +69,7 @@ module WXRuby3
               for (int i = 0; i < RARRAY_LEN($input); i++)
               {
                 SWIG_ConvertPtr(rb_ary_entry($input,i), (void **) &wx_acc_ent, 
-                                SWIGTYPE_p_wxAcceleratorEntry, 1);
+                                SWIGTYPE_p_wxAcceleratorEntry, 0);
                 if (wx_acc_ent == NULL) 
                   rb_raise(rb_eTypeError, "Reference to null wxAcceleratorEntry");
                 arr[i] = *wx_acc_ent;

data/rakelib/lib/director/animation.rb

@@ -60,7 +60,7 @@ module WXRuby3
             void* ptr = 0;
             int res$argnum = SWIG_ConvertPtr($result, &ptr, SWIGTYPE_p_wxImage,  0 );
             if (!SWIG_IsOK(res$argnum)) {
-              Swig::DirectorTypeMismatchException::raise(rb_eTypeError, "Expected Wx::Image result");
+              Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, "Expected Wx::Image result");
             }
             *$1 = *reinterpret_cast<wxImage*> (ptr);
           __CODE

data/rakelib/lib/director/animation_ctrl.rb

@@ -18,6 +18,26 @@ module WXRuby3
 
       def setup
         super
+        if Config.instance.wx_version >= '3.3.0'
+          spec.items << 'wxAnimationBundle'
+          spec.ignore 'wxAnimationBundle::GetAll', ignore_doc: false
+          spec.add_extend_code 'wxAnimationBundle', <<~__HEREDOC
+            VALUE get_all() const
+            {
+              const std::vector<wxAnimation>& ani_list = $self->GetAll();
+              VALUE rb_ani_list = rb_ary_new();
+              for (const wxAnimation& ani : ani_list)
+              {
+                VALUE rb_ani = SWIG_NewPointerObj(new wxAnimation(ani), SWIGTYPE_p_wxAnimation, SWIG_POINTER_OWN);
+                rb_ary_push(rb_ani_list, rb_ani);
+              }
+              return rb_ani_list;
+            }
+            __HEREDOC
+          spec.map 'const std::vector<wxAnimation>&' => 'Array<Wx::Animation>', swig: false do
+            map_out code: ''
+          end
+        end
         spec.do_not_generate :variables, :enums, :defines, :functions
       end
     end # class AnimationCtrl

data/rakelib/lib/director/app.rb

@@ -341,7 +341,17 @@ module WXRuby3
               // Get the ruby representation of the App object, and call the
               // ruby on_init method to set up the initial window state
               VALUE the_app = rb_const_get(#{spec.package.module_variable}, rb_intern("THE_APP"));
-              VALUE result  = wxRuby_Funcall(the_app, rb_intern("on_ruby_init"), 0, 0);
+              bool ex_caught = false;
+              VALUE result  = wxRuby_Funcall(ex_caught, the_app, rb_intern("on_ruby_init"), 0, 0);
+
+              if (ex_caught)
+              {
+          #ifdef __WXRB_DEBUG__
+                wxRuby_PrintException(result);
+          #endif
+                rb_iv_set(the_app, "@exception", result);
+                result = Qfalse; // exit app
+              }
         
               // If on_init return any (ruby) true value, signal to wxWidgets to
               // enter the main event loop by returning true, else return false
@@ -371,7 +381,15 @@ module WXRuby3
               ID on_exit_id = rb_intern("on_exit");
               if (rb_funcall(the_app, rb_intern("respond_to?"), 1, ID2SYM(on_exit_id)) == Qtrue)
               {
-                wxRuby_Funcall(the_app, on_exit_id, 0, 0);
+                bool ex_caught = false;
+                VALUE rc = wxRuby_Funcall(ex_caught, the_app, on_exit_id, 0, 0);
+                if (ex_caught)
+                {
+          #ifdef __WXRB_DEBUG__
+                  wxRuby_PrintException(rc);
+          #endif
+                  rb_iv_set(the_app, "@exception", rc);
+                }
               }
 
               // perform wxRuby cleanup
@@ -470,10 +488,10 @@ module WXRuby3
             VALUE msg = rb_funcall(err, message_id(), 0);
             VALUE err_name = rb_funcall(rb_funcall(err, class_id(), 0), name_id(), 0);
             VALUE bt = rb_funcall(err, backtrace_id(), 0);
-            bt = rb_funcall(bt, join_id(), 1, rb_str_new2("\\n"));
+            bt = rb_funcall(bt, join_id(), 1, rb_str_new2("\\n\\tfrom "));
             std::cerr << std::endl
-                      << ' ' << StringValuePtr(err_name) << ": " << StringValuePtr(msg) << std::endl
-                      << StringValuePtr(bt) << std::endl;
+                      << ' ' << StringValuePtr(msg) << '(' << StringValuePtr(err_name) << ')' << std::endl
+                      << "\\tfrom " << StringValuePtr(bt) << std::endl << std::endl;
           }
           __HEREDOC
         super

data/rakelib/lib/director/art_provider.rb

@@ -53,7 +53,7 @@ module WXRuby3
               if ( TYPE(v_ret) == T_DATA )
               {
                 void* ptr;
-                SWIG_ConvertPtr(v_ret, &ptr, SWIGTYPE_p_wxSize, 1);
+                SWIG_ConvertPtr(v_ret, &ptr, SWIGTYPE_p_wxSize, 0);
                 return *reinterpret_cast< wxSize * >(ptr);
               }
               else if ( TYPE(v_ret) == T_ARRAY )

data/rakelib/lib/director/data_object_simple_base.rb

@@ -105,8 +105,7 @@ module WXRuby3
               }
               else
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError, 
-                                                           "get_data_here should return a string, or nil on failure");
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, "get_data_here should return a string, or nil on failure");
               }
             }
             else

data/rakelib/lib/director/dialog.rb

@@ -87,6 +87,11 @@ module WXRuby3
           end
           spec.do_not_generate :functions
         when 'wxPropertySheetDialog'
+          # need to adjust sizer arg name to apply disown specs
+          spec.ignore 'wxPropertySheetDialog::SetInnerSizer(wxSizer *)', ignore_doc: false
+          spec.extend_interface 'wxPropertySheetDialog',
+                                'void SetInnerSizer(wxSizer *sizer_disown)'
+          spec.disown 'wxSizer *sizer_disown'
           spec.ignore 'wxPropertySheetDialog::GetContentWindow'
           # In Ruby a derived class with customized '#initialize' is far easier
           spec.ignore 'wxPropertySheetDialog::CreateBookCtrl'

data/rakelib/lib/director/dialup_event.rb

@@ -0,0 +1,44 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './event'
+
+module WXRuby3
+
+  class Director
+
+    class DialUpEvent < Event
+
+      def setup
+        super
+        spec.disable_proxies
+        # missing from interface docs
+        spec.add_swig_code '%constant int EVT_DIALUP_CONNECTED = wxEVT_DIALUP_CONNECTED;'
+        spec.add_swig_code '%constant int EVT_DIALUP_DISCONNECTED = wxEVT_DIALUP_DISCONNECTED;'
+      end
+
+      def doc_generator
+        DialUpEventDocGenerator.new(self)
+      end
+
+    end # class DialupEvent
+
+  end # class Director
+
+  class DialUpEventDocGenerator < DocGenerator
+
+    protected def gen_constants_doc(fdoc)
+      super
+      xref_table = package.all_modules.reduce(DocGenerator.constants_db) { |db, mod| db[mod] }
+      gen_constant_doc(fdoc, 'EVT_DIALUP_CONNECTED', xref_table['EVT_DIALUP_CONNECTED'], 'connected event')
+      gen_constant_doc(fdoc, 'EVT_DIALUP_DISCONNECTED', xref_table['EVT_DIALUP_DISCONNECTED'], 'disconnected event')
+    end
+
+  end
+
+end # module WXRuby3

data/rakelib/lib/director/dialup_manager.rb

@@ -0,0 +1,45 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 Defs director
+###
+
+module WXRuby3
+
+  class Director
+
+    class DialUpManager < Director
+
+      def setup
+        super
+        spec.gc_as_untracked
+        spec.make_abstract 'wxDialUpManager'
+        spec.disable_proxies
+        spec.ignore 'wxDialUpManager::GetISPNames', ignore_doc: false
+        spec.add_extend_code 'wxDialUpManager', <<~__HEREDOC
+          VALUE get_isp_names() const
+          {
+            VALUE rb_isps = rb_ary_new();
+            wxArrayString isps;
+            size_t n_isps = $self->GetISPNames(isps);
+            for (size_t i=0; i<n_isps ;++i)
+            {
+              rb_ary_push(rb_isps, WXSTR_TO_RSTR(isps.Item(i)));
+            }
+            return rb_isps;
+          }
+          __HEREDOC
+        spec.map 'wxArrayString& names', swig: false do
+          map_in ignore: true, code: ''
+          map_out ignore: 'size_t'
+          map_argout as: 'Array<String>'
+        end
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/director/event.rb

@@ -201,8 +201,6 @@ module WXRuby3
           spec.add_swig_code %Q{%constant wxEventType wxEVT_MENU_HIGHLIGHT_ALL = wxEVT_MENU_HIGHLIGHT;}
           # add event type constant missing from interface defs
           spec.add_swig_code %Q{%constant wxEventType wxEVT_NC_PAINT = wxEVT_NC_PAINT;}
-          # add undocumented global function
-          spec.add_swig_code 'wxWindow* wxFindFocusDescendant(wxWindow* ancestor);'
         end
         super
       end
@@ -237,8 +235,28 @@ module WXRuby3
         end
         defmod
       end
+
+      def doc_generator
+        if spec.module_name == 'wxEvent'
+          EventDocGenerator.new(self)
+        else
+          super
+        end
+      end
+
     end # class Event
 
   end # class Director
 
+  class EventDocGenerator < DocGenerator
+
+    protected def gen_constants_doc(fdoc)
+      super
+      xref_table = package.all_modules.reduce(DocGenerator.constants_db) { |db, mod| db[mod] }
+      gen_constant_doc(fdoc, 'EVT_MENU_HIGHLIGHT_ALL', xref_table['EVT_MENU_HIGHLIGHT'], '')
+      gen_constant_doc(fdoc, 'EVT_NC_PAINT', xref_table['EVT_NC_PAINT'], '')
+    end
+
+  end
+
 end # module WXRuby3

data/rakelib/lib/director/file_ctrl.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class FileCtrl < Window
+
+      def setup
+        super
+        # for GetFileNames and GetPaths
+        spec.map 'wxArrayString &filenames', 'wxArrayString &paths', as: 'Array<String>' do
+          map_in ignore: true, temp: 'wxArrayString tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__HEREDOC
+            $result = rb_ary_new();
+            for (size_t i=0; i<tmp$argnum.Count() ;++i)
+            {
+              rb_ary_push($result, WXSTR_TO_RSTR(tmp$argnum.Item(i)));
+            }
+            __HEREDOC
+        end
+      end
+    end # class FileCtrl
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/file_ctrl_event.rb

@@ -0,0 +1,26 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './event'
+
+module WXRuby3
+
+  class Director
+
+    class FileCtrlEvent < Event
+
+      def setup
+        super
+        spec.disable_proxies
+        spec.do_not_generate(:variables, :defines, :enums, :functions) # with FileCtrl
+      end
+    end # class FileCtrlEvent
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/gdicommon.rb

@@ -22,6 +22,24 @@ module WXRuby3
         spec.ignore %w{
           wxTheColourDatabase
         }
+        if Config.instance.wx_version >= '3.3.0'
+          spec.ignore 'wxColourDatabase::GetAllNames', ignore_doc: false
+          spec.add_extend_code 'wxColourDatabase', <<~__HEREDOC
+            VALUE get_all_names() const
+            {
+              wxVector<wxString> nms = $self->GetAllNames();
+              VALUE rb_nms = rb_ary_new();
+              for (const wxString& nm : nms)
+              {
+                rb_ary_push(rb_nms, WXSTR_TO_RSTR(nm));
+              } 
+              return rb_nms;
+            }
+            __HEREDOC
+          spec.map 'wxVector<wxString>' => 'Array<String>', swig: false do
+            map_out code: ''
+          end
+        end
         spec.ignore [
           'wxClientDisplayRect(int *,int *,int *,int *)',
           'wxDisplaySize(int *,int *)',
@@ -38,7 +56,7 @@ module WXRuby3
             if ( TYPE($input) == T_DATA )
             {
               void* argp$argnum;
-              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 1 );
+              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0);
               $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
             }
             else

data/rakelib/lib/director/grid_cell_editor.rb

@@ -182,12 +182,12 @@ module WXRuby3
             static WxRuby_ID ga_mouse_id("mouse");
 
             inline wxGridActivationResult
-            array_to_wxGridActivationResult(VALUE rbarr)
+            array_to_wxGridActivationResult(VALUE self, const char* method, VALUE rbarr)
             {
               if (rbarr == Qnil || 
                 !(TYPE(rbarr) == T_ARRAY || TYPE(rbarr) == T_SYMBOL))
               {
-                Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
+                Swig::DirectorTypeMismatchException::raise(self, method, SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
                                                            "in output value of type 'wxGridActivationResult'");
               }
               if (TYPE(rbarr) == T_SYMBOL)
@@ -197,7 +197,7 @@ module WXRuby3
                 else if (SYM2ID(rbarr) == ga_show_editor_id())
                   return wxGridActivationResult::DoEdit();
                 else
-                  Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
+                  Swig::DirectorTypeMismatchException::raise(self, method, SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
                                                              "in output value of type 'wxGridActivationResult'");
               }
               else
@@ -206,7 +206,7 @@ module WXRuby3
                 VALUE rbStr = rb_ary_shift(rbarr); // could be nil
                 if (rbAction == Qnil || TYPE(rbAction) != T_SYMBOL)
                 {
-                  Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
+                  Swig::DirectorTypeMismatchException::raise(self, method, SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
                                                              "in output value of type 'wxGridActivationResult'");
                 }
                 else if (SYM2ID(rbAction) == ga_change_id() && rbStr != Qnil)
@@ -220,7 +220,7 @@ module WXRuby3
                   else if (SYM2ID(rbAction) == ga_show_editor_id())
                     return wxGridActivationResult::DoEdit();
                   else
-                    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
+                    Swig::DirectorTypeMismatchException::raise(self, method, SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
                                                                "in output value of type 'wxGridActivationResult'");
                 }
               }
@@ -366,7 +366,7 @@ module WXRuby3
                 obj2 = SWIG_NewPointerObj(SWIG_as_voidptr(grid), SWIGTYPE_p_wxGrid,  0 );
                 obj3 = wxGridActivationSource_to_array(actSource); 
                 result = rb_funcall(swig_get_self(), try_activate_id(), 4,obj0,obj1,obj2,obj3);
-                return array_to_wxGridActivationResult(result);
+                return array_to_wxGridActivationResult(swig_get_self(), "try_activate", result);
                 __METHOD__
             elsif !helpers_added && line["SwigDirector_#{module_name}::SwigDirector_#{module_name}(VALUE self"]
               # insert helper methods

data/rakelib/lib/director/help_controller.rb

@@ -16,7 +16,7 @@ module WXRuby3
 
       def setup
         super
-        spec.items << 'wxHelpControllerBase'
+        spec.items << 'wxHelpControllerBase' << 'helpfrm.h'
         spec.fold_bases(spec.module_name => 'wxHelpControllerBase')
         spec.rename_for_ruby('Init' => "#{spec.module_name}::Initialize")
         # ignore these (pure virtual) decls

data/rakelib/lib/director/pgarray_editor_dialog.rb

@@ -53,12 +53,6 @@ module WXRuby3
         spec.suppress_warning(473, 'wxPGArrayEditorDialog::GetTextCtrlValidator')
         # make sure SWIG knows this type is an enum
         spec.add_swig_code 'enum wxPGPropertyFlags;'
-        if Config.instance.wx_version >= '3.3.0'
-          # internal use only
-          spec.ignore 'wxPG_PROP_PASSWORD',
-                      'wxPG_PROP_USE_CHECKBOX',
-                      'wxPG_PROP_USE_DCC'
-        end
       end
     end # class PGArrayEditorDialog
 

data/rakelib/lib/director/pgeditor.rb

@@ -51,7 +51,7 @@ module WXRuby3
               int res = SWIG_ConvertPtr(rb_ary_entry($input, 0), &ptr, SWIGTYPE_p_wxWindow, 0 |  0);
               if (!SWIG_IsOK(res)) 
               {
-                Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(res)), "in primary output value of type 'wxWindow *'");
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", SWIG_ErrorType(SWIG_ArgError(res)), "in primary output value of type 'wxWindow *'");
               }
               $result = wxPGWindowList(static_cast<wxWindow*>(ptr));
               if (RARRAY_LEN($input) > 1)
@@ -59,7 +59,7 @@ module WXRuby3
                 res = SWIG_ConvertPtr(rb_ary_entry($input, 1), &ptr, SWIGTYPE_p_wxWindow, 0 |  0);
                 if (!SWIG_IsOK(res)) 
                 {
-                  Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(res)), "in secundary output value of type 'wxWindow *'");
+                  Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", SWIG_ErrorType(SWIG_ArgError(res)), "in secundary output value of type 'wxWindow *'");
                 }
                 $result.SetSecondary(static_cast<wxWindow*>(ptr));
               }

data/rakelib/lib/director/pgproperties.rb

@@ -174,7 +174,7 @@ module WXRuby3
             void* argp$argnum = NULL;
             if ( TYPE($input) == T_DATA )
             {
-              if (SWIG_IsOK(SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, $argnum-1)) && argp$argnum)
+              if (SWIG_IsOK(SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0)) && argp$argnum)
               {
                 $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
               }
@@ -200,7 +200,7 @@ module WXRuby3
               }
               else
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError, 
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, 
                                                            "on_custom_string_edit should return a string, or nil");
               }
             }

data/rakelib/lib/director/richtext_buffer.rb

@@ -224,7 +224,7 @@ module WXRuby3
               int res = SWIG_ConvertPtr(rb_ary_entry(rb_int_arr, i), &ptr,SWIGTYPE_p_wxRichTextAttr, 0);
               if (!SWIG_IsOK(res)) 
               {
-                Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(res)), "in output value of type '""Wx::RTC::RichTextAttr""'");
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", SWIG_ErrorType(SWIG_ArgError(res)), "in output value of type '""Wx::RTC::RichTextAttr""'");
               }
               wxRichTextAttr* wx_att = static_cast< wxRichTextAttr* >(ptr);
               $1.Add(*wx_att);

data/rakelib/lib/director/richtext_ctrl.rb

@@ -153,7 +153,7 @@ module WXRuby3
               }
               else
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError, 
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, 
                                                            "expected an Integer, or nil on failure");
               }
             }

data/rakelib/lib/director/sash_event.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './event'
+
+module WXRuby3
+
+  class Director
+
+    class SashEvent < Event
+
+      def setup
+        super
+        spec.disable_proxies
+        # missing from interface docs
+        spec.add_swig_code '%constant int EVT_SASH_DRAGGED_RANGE = wxEVT_SASH_DRAGGED;'
+      end
+
+      def doc_generator
+        SashEventDocGenerator.new(self)
+      end
+
+    end # class SashEvent
+
+  end # class Director
+
+  class SashEventDocGenerator < DocGenerator
+
+    protected def gen_constants_doc(fdoc)
+      super
+      xref_table = package.all_modules.reduce(DocGenerator.constants_db) { |db, mod| db[mod] }
+      gen_constant_doc(fdoc, 'EVT_SASH_DRAGGED_RANGE', xref_table['EVT_SASH_DRAGGED'], '')
+    end
+
+  end
+
+end # module WXRuby3

data/rakelib/lib/director/sizer.rb

@@ -14,7 +14,6 @@ module WXRuby3
 
       def setup
         # Any nested sizers passed to Add() in are owned by C++, not GC'd by Ruby
-        spec.disown 'wxSizer* sizer'
         case spec.module_name
         when 'wxSizer'
           spec.items << 'wxSizerFlags'
@@ -26,6 +25,64 @@ module WXRuby3
                       'wxSizer::Insert(size_t, wxSizerItem *)',
                       'wxSizer::Prepend(wxSizerItem *)'
           spec.ignore 'wxSizer::Remove(wxWindow *)' # long time deprecated
+          # need to adjust sizer arg name to apply disown specs
+          spec.ignore 'wxSizer::Add(wxSizer *, const wxSizerFlags &)',
+                      'wxSizer::Add(wxSizer *, int, int, int, wxObject *)',
+                      'wxSizer::Insert(size_t, wxSizer *, const wxSizerFlags &)',
+                      'wxSizer::Insert(size_t, wxSizer *, int, int, int, wxObject *)',
+                      'wxSizer::Prepend(wxSizer *, const wxSizerFlags &)',
+                      'wxSizer::Prepend(wxSizer *, int, int, int, wxObject *)',
+                      ignore_doc: false
+          spec.extend_interface 'wxSizer',
+                                'wxSizerItem* Add(wxSizer *sizer_disown, const wxSizerFlags &flags)',
+                                'wxSizerItem* Add(wxSizer *sizer_disown, int proportion=0, int flag=0, int border=0, wxObject *userData=NULL)',
+                                'wxSizerItem* Insert(size_t index, wxSizer *sizer_disown, const wxSizerFlags &flags)',
+                                'wxSizerItem* Insert(size_t index, wxSizer *sizer_disown, int proportion=0, int flag=0, int border=0, wxObject *userData=NULL)',
+                                'wxSizerItem* Prepend(wxSizer *sizer_disown, const wxSizerFlags &flags)',
+                                'wxSizerItem* Prepend(wxSizer *sizer_disown, int proportion=0, int flag=0, int border=0, wxObject *userData=NULL)'
+          spec.disown 'wxSizer* sizer_disown'
+          # needs custom impl to transfer ownership of detached items
+          spec.ignore 'wxSizer::Detach(wxSizer*)',
+                      'wxSizer::Detach(int)', ignore_doc: false
+          spec.add_extend_code 'wxSizer', <<~__HEREDOC
+            bool detach(wxSizer* szr)
+            {
+              if ($self->Detach(szr))
+              {
+                VALUE rb_szr = SWIG_RubyInstanceFor(szr);
+                if (rb_szr && !NIL_P(rb_szr))
+                {
+                  // transfer ownership to Ruby
+                  RDATA(rb_szr)->dfree = GcSizerFreeFunc;            
+                }
+                return true;
+              }
+              return false;
+            }
+
+            bool detach(int itm_nr)
+            {
+              wxSizerItem* itm = $self->GetItem(itm_nr);
+              if (itm)
+              {
+                VALUE rb_szr = Qnil;
+                if (itm->IsSizer())
+                {
+                  rb_szr = SWIG_RubyInstanceFor(itm->GetSizer());
+                }
+                if ($self->Detach(itm_nr))
+                {
+                  if (rb_szr && !NIL_P(rb_szr))
+                  {
+                    // transfer ownership to Ruby
+                    RDATA(rb_szr)->dfree = GcSizerFreeFunc;            
+                  }
+                  return true;
+                }
+              }
+              return false;
+            }
+            __HEREDOC
           # Typemap for GetChildren - convert to array of Sizer items
           spec.map 'wxSizerItemList&' => 'Array<Wx::SizerItem>' do
             map_out code: <<~__CODE
@@ -50,6 +107,12 @@ module WXRuby3
           spec.gc_as_untracked 'wxGBSpan', 'wxGBPosition'
           # cannot use this with wxRuby
           spec.ignore 'wxGridBagSizer::Add(wxGBSizerItem *)'
+          # need to adjust sizer arg name to apply disown specs
+          spec.ignore 'wxGridBagSizer::Add(wxSizer *, const wxGBPosition &, const wxGBSpan &, int, int, wxObject *)',
+                      ignore_doc: false
+          spec.extend_interface 'wxGridBagSizer',
+                                'wxSizerItem *Add(wxSizer *sizer_disown, const wxGBPosition &pos, const wxGBSpan &span=wxDefaultSpan, int flag=0, int border=0, wxObject *userData=NULL)'
+          spec.disown 'wxSizer* sizer_disown'
         end
         # no real use for allowing these to be overloaded but a whole lot of grieve
         # if we do allow it

data/rakelib/lib/director/sizer_item.rb

@@ -22,6 +22,28 @@ module WXRuby3
           # ignore constructors
           spec.ignore 'wxSizerItem::wxSizerItem'
           spec.ignore(%w[wxSizerItem::SetSizer wxSizerItem::SetSpacer wxSizerItem::SetWindow])
+          # need to adjust sizer arg name to apply disown specs
+          spec.ignore 'wxSizerItem::AssignSizer(wxSizer *)', ignore_doc: false
+          spec.extend_interface 'wxSizerItem',
+                                'void AssignSizer(wxSizer *sizer_disown)'
+          spec.disown 'wxSizer *sizer_disown'
+          # needs custom impl to properly transfer ownership to Ruby
+          spec.ignore 'wxSizerItem::DetachSizer', ignore_doc: false
+          spec.add_extend_code 'wxSizerItem', <<~__HEREDOC
+            void detach_sizer()
+            {
+              if ($self->IsSizer())
+              {
+                VALUE rb_szr = SWIG_RubyInstanceFor($self->GetSizer());
+                if (rb_szr && !NIL_P(rb_szr))
+                {
+                  // transfer ownership to Ruby
+                  RDATA(rb_szr)->dfree = GcSizerFreeFunc;            
+                }
+                $self->DetachSizer();
+              }              
+            }
+            __HEREDOC
         when 'wxGBSizerItem'
           spec.make_abstract 'wxGBSizerItem'
           # ignore constructors