wxruby3 0.9.1 → 0.9.3

data/rakelib/lib/director/owner_drawn_combobox.rb

@@ -0,0 +1,192 @@
+# 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 OwnerDrawnComboBox < Window
+
+      include Typemap::ClientData
+
+      def setup
+        super
+        spec.items << 'wxItemContainer'
+        # override inheritance chain
+        spec.override_inheritance_chain('wxOwnerDrawnComboBox', %w[wxComboCtrl wxControl wxWindow wxEvtHandler wxObject])
+        spec.fold_bases('wxOwnerDrawnComboBox' => %w[wxItemContainer])
+        spec.regard %w[
+          wxOwnerDrawnComboBox::OnDrawBackground
+          wxOwnerDrawnComboBox::OnDrawItem
+          wxOwnerDrawnComboBox::OnMeasureItem
+          wxOwnerDrawnComboBox::OnMeasureItemWidth
+        ]
+        # unuseful overloads
+        spec.ignore 'wxOwnerDrawnComboBox::wxOwnerDrawnComboBox(wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, int, const wxString [], long, const wxValidator &, const wxString &)',
+                    'wxOwnerDrawnComboBox::Create(wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, int, const wxString [], long, const wxValidator &, const wxString &)'
+        spec.ignore('wxItemContainer::Append(const wxString &, void *)',
+                    'wxItemContainer::Append(const std::vector< wxString > &)',
+                    'wxItemContainer::Append(const wxArrayString &, void **)',
+                    'wxItemContainer::Append(unsigned int, const wxString *)',
+                    'wxItemContainer::Append(unsigned int, const wxString *, void **)',
+                    'wxItemContainer::Append(unsigned int, const wxString *, wxClientData **)',
+                    'wxItemContainer::Insert(const wxString &, unsigned int, void *)',
+                    'wxItemContainer::Insert(const std::vector< wxString > &)',
+                    'wxItemContainer::Insert(const wxArrayString &, unsigned int, void **)',
+                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int)',
+                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, void **)',
+                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, wxClientData **)',
+                    'wxItemContainer::Set(const std::vector< wxString > &)',
+                    'wxItemContainer::Set(const wxArrayString &, void **)',
+                    'wxItemContainer::Set(unsigned int, const wxString *)',
+                    'wxItemContainer::Set(unsigned int, const wxString *, void **)',
+                    'wxItemContainer::Set(unsigned int, const wxString *, wxClientData **)',
+                    'wxItemContainer::GetClientData',
+                    'wxItemContainer::SetClientData',
+                    'wxItemContainer::HasClientUntypedData',
+                    'wxItemContainer::Clear')
+        # ignore these but keep docs; will add custom versions below
+        spec.ignore([
+                      'wxItemContainer::DetachClientObject',
+                      'wxItemContainer::Append(const wxArrayString &, wxClientData **)',
+                      'wxItemContainer::Insert(const wxArrayString &, unsigned int, wxClientData **)',
+                      'wxItemContainer::Set(const wxArrayString &, wxClientData **)'], ignore_doc: false)
+        # ambiguous
+        spec.ignore 'wxOwnerDrawnComboBox::IsEmpty', ignore_doc: false
+        # missing from docs; needed to override TextEntry version
+        spec.extend_interface 'wxOwnerDrawnComboBox', 'void Clear()'
+        # missing from docs; required so proxy calls correct override
+        spec.extend_interface 'wxOwnerDrawnComboBox',
+                              'virtual void DoSetPopupControl(wxComboPopup* popup)',
+                              visibility: 'protected'
+        # missing from docs; implementations of wxItemContainerImmutable methods
+        spec.extend_interface 'wxOwnerDrawnComboBox',
+                              'unsigned int GetCount() const',
+                              'wxString GetString(unsigned int n) const',
+                              'void SetString(unsigned int n, const wxString& s)',
+                              'int FindString(const wxString& s, bool bCase = false) const',
+                              'void Select(int n)',
+                              'wxArrayString GetStrings() const'
+        # for doc only
+        spec.map 'void** clientData' => 'Array', swig: false do
+          map_in code: ''
+        end
+        # Replace the old Wx definitions of these methods adding
+        # proper checks on the data arrays.
+        # Also add an item enumerator.
+        spec.add_extend_code 'wxOwnerDrawnComboBox', <<~__HEREDOC
+          wxString GetListStringSelection()
+          {
+            return $self->wxItemContainerImmutable::GetStringSelection();
+          } 
+
+          bool SetListStringSelection(const wxString& string)
+          {
+            return $self->wxItemContainerImmutable::SetStringSelection(string);
+          } 
+
+          void SetListSelection(int n)
+          {
+            $self->SetSelection(n);
+          }
+
+          int GetListSelection()
+          {
+            return $self->GetSelection();
+          }
+
+          VALUE DetachClientObject(unsigned int n)
+          {
+            VALUE rc = Qnil;
+            wxClientData *wxcd = $self->DetachClientObject(n);
+            wxRubyClientData *rbcd = wxcd ? dynamic_cast<wxRubyClientData*> (wxcd) : nullptr;
+            if (rbcd)
+            {
+              rc = rbcd->GetData();
+              delete rbcd;
+            }
+            return rc;
+          }
+
+          int Append(const wxArrayString &items, VALUE rb_clientData)
+          {
+            if (TYPE(rb_clientData) != T_ARRAY || 
+                  static_cast<unsigned int> (RARRAY_LEN(rb_clientData)) != items.GetCount())
+            {
+              rb_raise(rb_eArgError, 
+                       TYPE(rb_clientData) == T_ARRAY ? 
+                          "expected Array for client_data" : 
+                          "client_data Array needs to be equal in size to items Array");
+            }
+
+            std::unique_ptr<wxClientData*[]> cd_arr = std::make_unique<wxClientData*[]> (RARRAY_LEN(rb_clientData));
+            for (int i=0; i<RARRAY_LEN(rb_clientData) ;++i)
+            {
+              cd_arr[i] = new wxRubyClientData(rb_ary_entry(rb_clientData, i));
+            }
+            return $self->Append(items, cd_arr.get());
+          }
+
+          int Insert(const wxArrayString &items, unsigned int pos, VALUE rb_clientData)
+          {
+            if (TYPE(rb_clientData) != T_ARRAY || 
+                  static_cast<unsigned int> (RARRAY_LEN(rb_clientData)) != items.GetCount())
+            {
+              rb_raise(rb_eArgError, 
+                       TYPE(rb_clientData) == T_ARRAY ? 
+                          "expected Array for client_data" : 
+                          "client_data Array needs to be equal in size to items Array");
+            }
+
+            std::unique_ptr<wxClientData*[]> cd_arr = std::make_unique<wxClientData*[]> (RARRAY_LEN(rb_clientData));
+            for (int i=0; i<RARRAY_LEN(rb_clientData) ;++i)
+            {
+              cd_arr[i] = new wxRubyClientData(rb_ary_entry(rb_clientData, i));
+            }
+            return $self->Insert(items, pos, cd_arr.get());
+          }
+
+          void Set(const wxArrayString &items, VALUE rb_clientData)
+          {
+            if (TYPE(rb_clientData) != T_ARRAY || 
+                  static_cast<unsigned int> (RARRAY_LEN(rb_clientData)) != items.GetCount())
+            {
+              rb_raise(rb_eArgError, 
+                       TYPE(rb_clientData) == T_ARRAY ? 
+                          "expected Array for client_data" : 
+                          "client_data Array needs to be equal in size to items Array");
+            }
+
+            std::unique_ptr<wxClientData*[]> cd_arr = std::make_unique<wxClientData*[]> (RARRAY_LEN(rb_clientData));
+            for (int i=0; i<RARRAY_LEN(rb_clientData) ;++i)
+            {
+              cd_arr[i] = new wxRubyClientData(rb_ary_entry(rb_clientData, i));
+            }
+            $self->Set(items, cd_arr.get());
+          }
+
+          VALUE each_string()
+          {
+            VALUE rc = Qnil;
+            for (unsigned int i=0; i<$self->GetCount() ;++i)
+            {
+              VALUE rb_s = WXSTR_TO_RSTR($self->GetString(i));
+              rc = rb_yield(rb_s);
+            }
+            return rc;
+          }
+          __HEREDOC
+      end
+
+    end # class OwnerDrawnComboBox
+
+  end # class Director
+
+end # module WXRuby3

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?('wxUSE_LONGLONG')
+        if Config.instance.features_set?('USE_LONGLONG')
           # wxLongLong mapping to be considered before considering 'long' (see typecheck precedence)
           spec.map 'const wxLongLong&' => 'Integer' do
             map_in temp: 'wxLongLong tmp', code: <<~__CODE

data/rakelib/lib/director/pgproperty.rb

@@ -18,6 +18,8 @@ module WXRuby3
 
       include Typemap::PGCell
 
+      include Typemap::ClientData
+
       def setup
         super
         if spec.module_name == 'wxPGProperty'
@@ -54,7 +56,30 @@ module WXRuby3
             {
               return (*self)[idx];
             }
-          __HEREDOC
+
+            VALUE each_label()
+            {
+              VALUE rc = Qnil;
+              for (unsigned int i=0; i<$self->GetCount() ;++i)
+              {
+                VALUE rb_lbl = WXSTR_TO_RSTR($self->GetLabel(i));
+                rc = rb_yield(rb_lbl);
+              }
+              return rc;
+            }
+
+            VALUE each_entry()
+            {
+              VALUE rc = Qnil;
+              for (unsigned int i=0; i<$self->GetCount() ;++i)
+              {
+                wxPGChoiceEntry *entry = &($self->Item(i));
+                VALUE rb_entry = SWIG_NewPointerObj(SWIG_as_voidptr(entry), SWIGTYPE_p_wxPGChoiceEntry, 0);
+                rc = rb_yield(rb_entry);
+              }
+              return rc;
+            }
+            __HEREDOC
           # for GetIndicesForStrings
           spec.map 'wxArrayString *unmatched' => 'Array,nil' do
 
@@ -90,7 +115,7 @@ module WXRuby3
           # obsolete
           spec.ignore %w[wxPGProperty::AddChild wxPGProperty::GetValueString]
           # not of use in Ruby
-          spec.ignore(%w[wxPGProperty::GetClientObject wxPGProperty::SetClientObject])
+          spec.ignore(%w[wxPGProperty::GetClientData wxPGProperty::SetClientData])
           # only keep the const version
           spec.ignore 'wxPGProperty::GetCell'
           spec.regard 'wxPGProperty::GetCell(unsigned int) const'
@@ -123,32 +148,6 @@ module WXRuby3
           spec.suppress_warning(473,
                                 'wxPGProperty::DoGetEditorClass',
                                 'wxPGProperty::DoGetValidator')
-          spec.add_header_code <<~__HEREDOC
-            extern void GC_mark_wxPGProperty(void* ptr)
-            {
-            #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>1)
-              {
-                std::wcout << "> GC_mark_wxPGProperty : " << ptr;
-                if (ptr) std::wcout << " (" << ((wxPGProperty*)ptr)->GetName() << ')';
-                std::wcout << std::endl;
-              }
-            #endif
-              if (ptr)
-              {
-                VALUE object = (VALUE)((wxPGProperty*)ptr)->GetClientData();
-                if (object && !NIL_P(object))
-                {
-            #ifdef __WXRB_DEBUG__
-                  if (wxRuby_TraceLevel()>2)
-                    std::wcout << "*** marking property data " << ptr << std::endl;
-            #endif
-                  rb_gc_mark(object);
-                }
-              }
-            }
-            __HEREDOC
-          spec.add_swig_code '%markfunc wxPGProperty "GC_mark_wxPGProperty";'
           spec.ignore 'wxPGProperty::m_clientData' # not wanted for wxRuby
           # take protected members into account
           spec.regard 'wxPGProperty::wxPGProperty',
@@ -214,7 +213,6 @@ module WXRuby3
             }
             __CODE
         else
-          spec.add_header_code 'extern void GC_mark_wxPGProperty(void* ptr);'
           spec.items.each do |itm|
             unless itm == 'wxColourPropertyValue'
               # add protected member methods and var to complement base class
@@ -227,7 +225,6 @@ module WXRuby3
                                     'wxVariant m_value',
                                     visibility: 'protected'
               spec.rename_for_ruby 'value_' => "#{itm}::m_value"
-              spec.add_swig_code %Q{%markfunc #{itm} "GC_mark_wxPGProperty";}
               spec.new_object %Q{#{itm}::GetEditorDialog}
               spec.suppress_warning(473, "#{itm}::GetEditorDialog")
             end

data/rakelib/lib/director/property_grid_interface.rb

@@ -39,16 +39,11 @@ module WXRuby3
         spec.extend_interface 'wxPropertyGridInterface',
                               'void SetPropertyValues(const wxVariant &list, const wxPGPropArgCls& defaultCategory = 0)'
         # optionals
-        unless Config.instance.features_set?('wxUSE_LONGLONG')
-          spec.ignore 'wxPropertyGridInterface::GetPropertyValueAsLongLong',
-                      'wxPropertyGridInterface::GetPropertyValueAsULongLong'
-        end
-        unless Config.instance.features_set?('wxUSE_DATETIME')
-          spec.ignore 'wxPropertyGridInterface::GetPropertyValueAsDateTime'
-        end
-        unless Config.instance.features_set?('wxUSE_VALIDATORS')
-          spec.ignore 'wxPropertyGridInterface::GetPropertyValidator'
-        end
+        spec.ignore_unless 'USE_LONGLONG',
+                           'wxPropertyGridInterface::GetPropertyValueAsLongLong',
+                           'wxPropertyGridInterface::GetPropertyValueAsULongLong'
+        spec.ignore_unless 'USE_DATETIME', 'wxPropertyGridInterface::GetPropertyValueAsDateTime'
+        spec.ignore_unless 'USE_VALIDATORS', 'wxPropertyGridInterface::GetPropertyValidator'
         # fix incorrect XML documentation
         spec.ignore 'wxPropertyGridInterface::SetPropertyImage', ignore_doc: false # ignore non-const BitmapBundle arg decl
         # and add correct decl

data/rakelib/lib/director/ribbon_button_bar.rb

@@ -14,13 +14,13 @@ module WXRuby3
 
     class RibbonButtonBar < Window
 
+      include Typemap::ClientData
+
       def setup
         super
         # exclude these; far better done in pure Ruby
         spec.ignore 'wxRibbonButtonBar::SetItemClientData',
-                    'wxRibbonButtonBar::GetItemClientData', ignore_doc: false
-        spec.ignore 'wxRibbonButtonBar::SetItemClientObject',
-                    'wxRibbonButtonBar::GetItemClientObject'
+                    'wxRibbonButtonBar::GetItemClientData'
         # not needed because of type mapping
         spec.ignore 'wxRibbonButtonBar::GetItemId',
                     'wxRibbonButtonBar::GetItemById'

data/rakelib/lib/director/ribbon_gallery.rb

@@ -14,15 +14,13 @@ module WXRuby3
 
     class RibbonGallery < Window
 
+      include Typemap::ClientData
+
       def setup
         super
-        # exclude these; far better done in pure Ruby
-        spec.ignore 'wxRibbonGallery::SetItemClientObject',
-                    'wxRibbonGallery::GetItemClientObject',
-                    'wxRibbonGallery::Append(const wxBitmap &, int, wxClientData *)'
         spec.ignore 'wxRibbonGallery::SetItemClientData',
                     'wxRibbonGallery::GetItemClientData',
-                    'wxRibbonGallery::Append(const wxBitmap &, int, void *)', ignore_doc: false
+                    'wxRibbonGallery::Append(const wxBitmap &, int, void *)'
         spec.map 'wxRibbonGalleryItem*' => 'Integer' do
           map_out code: '$result = ULL2NUM(reinterpret_cast<uintptr_t> ($1));'
           map_directorout code: '$result = reinterpret_cast<wxRibbonGalleryItem*> ((uintptr_t)NUM2ULL($1));'

data/rakelib/lib/director/richtext_composite_object.rb

@@ -45,6 +45,17 @@ module WXRuby3
               }
               return rc;
             }
+
+            VALUE each_child()
+            {
+              VALUE rc = Qnil;
+              for (size_t i=0; i<$self->GetChildCount() ;++i)
+              {
+                wxRichTextObject *rto = $self->GetChild(i);
+                rc = rb_yield(wxRuby_RichTextObject2Ruby(rto, 0));
+              }
+              return rc;
+            }
             __HEREDOC
 
           spec.new_object 'wxRichTextLine::Clone'
@@ -161,6 +172,20 @@ module WXRuby3
               }
               $self->MoveFromList(wx_lst);
             }
+
+            VALUE each_line()
+            {
+              VALUE rc = Qnil;
+              const wxRichTextLineVector &lines = $self->GetLines();
+              int lnr = 0;
+              for (const wxRichTextLine* line : lines)
+              {
+                VALUE rb_ln = SWIG_NewPointerObj(SWIG_as_voidptr(const_cast<wxRichTextLine*> (line)), SWIGTYPE_p_wxRichTextLine, 0);
+                rc = rb_yield(rb_ln);
+                ++lnr;
+              }
+              return rc;
+            }
             __CODE
 
           spec.do_not_generate(:typedefs, :variables, :enums, :defines, :functions)

data/rakelib/lib/director/richtext_ctrl.rb

@@ -15,7 +15,7 @@ module WXRuby3
     class RichTextCtrl < Window
 
       include Typemap::RichText
-      if Config.instance.features_set?('wxUSE_DATETIME')
+      if Config.instance.features_set?('USE_DATETIME')
         include Typemap::DateTime
       end
 
@@ -117,9 +117,7 @@ module WXRuby3
           wxRichTextCtrl::ProcessMouseMovement
           wxRichTextCtrl::ProcessBackKey
           ]
-        unless Config.instance.features_set?('wxUSE_DATETIME')
-          spec.ignore %w[wxRichTextCtrl::GetDragStartTime wxRichTextCtrl::SetDragStartTime]
-        end
+        spec.ignore_unless 'USE_DATETIME', %w[wxRichTextCtrl::GetDragStartTime wxRichTextCtrl::SetDragStartTime]
         spec.add_header_code 'extern VALUE wxRuby_RichTextObject2Ruby(const wxRichTextObject *wx_rto, int own);'
         spec.swig_import('swig/classes/include/wxTextAttr.h',
                          'swig/classes/include/wxRichTextObject.h',
@@ -208,6 +206,18 @@ module WXRuby3
             __CODE
 
         end
+        spec.add_extend_code 'wxRichTextCtrl', <<~__HEREDOC
+          VALUE each_line()
+          {
+            VALUE rc = Qnil;
+            for (int i=0; i<$self->GetNumberOfLines() ;++i)
+            {
+              VALUE rb_ln = WXSTR_TO_RSTR($self->GetLineText(i));
+              rc = rb_yield(rb_ln);
+            }
+            return rc;
+          }
+          __HEREDOC
       end
     end # class RichTextCtrl
 

data/rakelib/lib/director/richtext_formatting_dialog.rb

@@ -27,11 +27,13 @@ module WXRuby3
           wxRichTextFormattingDialog::SetStyle
           wxRichTextFormattingDialog::SetStyleDefinition
         ]
-        # add undocumented methods
-        spec.extend_interface 'wxRichTextFormattingDialog',
-                              'wxRichTextObject* GetObject() const',
-                              'void SetObject(wxRichTextObject* obj)',
-                              'virtual bool ApplyStyle(wxRichTextCtrl* ctrl, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO)'
+        if Config.instance.wx_version < '3.3.0'
+          # add undocumented methods
+          spec.extend_interface 'wxRichTextFormattingDialog',
+                                'wxRichTextObject* GetObject() const',
+                                'void SetObject(wxRichTextObject* obj)',
+                                'virtual bool ApplyStyle(wxRichTextCtrl* ctrl, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO)'
+        end
         spec.add_header_code 'extern VALUE wxRuby_RichTextObject2Ruby(const wxRichTextObject *wx_rto, int own);'
         spec.disown 'wxRichTextFormattingDialogFactory *factory'
         spec.suppress_warning(473, 'wxRichTextFormattingDialogFactory::CreatePage')

data/rakelib/lib/director/richtext_paragraph_layout_box.rb

@@ -83,13 +83,15 @@ module WXRuby3
                   return rb_rtsd;
               }
               __HEREDOC
-          # add undocumented convenience method
-          spec.extend_interface 'wxRichTextListStyleDefinition',
-                                'void SetAttributes(int i, int leftIndent, int leftSubIndent, int bulletStyle, const wxString& bulletSymbol = wxEmptyString)'
-          # undocumented methods
-          spec.extend_interface 'wxRichTextStyleSheet',
-                                'wxRichTextStyleSheet(const wxRichTextStyleSheet& sheet)',
-                                'void Copy(const wxRichTextStyleSheet& sheet)'
+          if Config.instance.wx_version < '3.3.0'
+            # add undocumented convenience method
+            spec.extend_interface 'wxRichTextListStyleDefinition',
+                                  'void SetAttributes(int i, int leftIndent, int leftSubIndent, int bulletStyle, const wxString& bulletSymbol = wxEmptyString)'
+            # undocumented methods
+            spec.extend_interface 'wxRichTextStyleSheet',
+                                  'wxRichTextStyleSheet(const wxRichTextStyleSheet& sheet)',
+                                  'void Copy(const wxRichTextStyleSheet& sheet)'
+          end
           # redefine these since we need to be able to selectively specify 'disown'
           spec.ignore 'wxRichTextStyleSheet::AddCharacterStyle',
                       'wxRichTextStyleSheet::AddListStyle',

data/rakelib/lib/director/sizer.rb

@@ -12,12 +12,19 @@ module WXRuby3
 
     class Sizer < Director
 
+      include Typemap::ClientData
+
       def setup
-        # Any nested sizers passed to Add() in are owned by C++, not GC'd by Ruby
+        # Any nested sizers passed to Add() in are owned by C++, not GC-ed by Ruby
         case spec.module_name
         when 'wxSizer'
           spec.items << 'wxSizerFlags'
           spec.gc_as_untracked('wxSizerFlags')
+          if Config.instance.wx_version < '3.3.0'
+            # missing from docs
+            spec.extend_interface 'wxSizerFlags',
+                                  'wxSizerFlags& HorzBorder()'
+          end
           spec.make_abstract('wxSizer')
           spec.ignore %w[wxSizer::IsShown wxSizer::SetVirtualSizeHints]
           # cannot use these with wxRuby
@@ -45,7 +52,7 @@ module WXRuby3
           spec.ignore 'wxSizer::Detach(wxSizer*)',
                       'wxSizer::Detach(int)', ignore_doc: false
           spec.add_extend_code 'wxSizer', <<~__HEREDOC
-            bool detach(wxSizer* szr)
+            bool Detach(wxSizer* szr)
             {
               if ($self->Detach(szr))
               {
@@ -60,7 +67,7 @@ module WXRuby3
               return false;
             }
 
-            bool detach(int itm_nr)
+            bool Detach(int itm_nr)
             {
               wxSizerItem* itm = $self->GetItem(itm_nr);
               if (itm)
@@ -82,6 +89,21 @@ module WXRuby3
               }
               return false;
             }
+
+            VALUE each_child()
+            {
+              const wxSizerItemList& child_list = self->GetChildren();
+              VALUE rc = Qnil;
+              wxSizerItemList::compatibility_iterator node = child_list.GetFirst();
+              while (node)
+              {
+                wxSizerItem *wx_si = node->GetData();
+                VALUE rb_si = SWIG_NewPointerObj(wx_si, SWIGTYPE_p_wxSizerItem, 0);
+                rc = rb_yield(rb_si);
+                node = node->GetNext();
+              }
+              return rc;
+            }
             __HEREDOC
           # Typemap for GetChildren - convert to array of Sizer items
           spec.map 'wxSizerItemList&' => 'Array<Wx::SizerItem>' do
@@ -109,9 +131,13 @@ module WXRuby3
           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 *)',
+                      'wxGridBagSizer::Add(wxWindow *, const wxGBPosition &, const wxGBSpan &, int, int, wxObject *)',
+                      'wxGridBagSizer::Add(int, int, 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)'
+                                'wxSizerItem * Add(wxSizer *sizer_disown, const wxGBPosition &pos, const wxGBSpan &span=wxDefaultSpan, int flag=0, int border=0, wxObject *userData=NULL)',
+                                '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'
         end
         # no real use for allowing these to be overloaded but a whole lot of grieve

data/rakelib/lib/director/sizer_item.rb

@@ -12,15 +12,27 @@ module WXRuby3
 
     class SizerItem < Director
 
+      include Typemap::ClientData
+
       def setup
         spec.disable_proxies
         # do not allow creating SizerItems in Ruby; this has limited benefits and
         # memory management of sizer items is a nightmare
         case spec.module_name
         when 'wxSizerItem'
+          spec.gc_as_untracked 'wxSizerItem'
           spec.make_abstract 'wxSizerItem'
           # ignore constructors
           spec.ignore 'wxSizerItem::wxSizerItem'
+          # needs more discriminating return type for type map
+          spec.ignore 'wxSizerItem::GetUserData', ignore_doc: false
+          spec.add_header_code 'typedef wxObject* WxUserDataObject;'
+          spec.extend_interface 'wxSizerItem',
+                                'WxUserDataObject GetUserData() const'
+          # for doc gen only
+          spec.map 'wxObject*' => 'Object', swig: false do
+            map_out code: ''
+          end
           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
@@ -45,6 +57,7 @@ module WXRuby3
             }
             __HEREDOC
         when 'wxGBSizerItem'
+          spec.gc_as_untracked 'wxGBSizerItem'
           spec.make_abstract 'wxGBSizerItem'
           # ignore constructors
           spec.ignore 'wxGBSizerItem::wxGBSizerItem',

data/rakelib/lib/director/static_bitmap.rb

@@ -20,6 +20,34 @@ module WXRuby3
           __HEREDOC
         super
       end
+
+      def process(gendoc: false)
+        defmod = super
+        spec.include 'wx/generic/statbmpg.h'
+        def_statbmp = defmod.find_item('wxStaticBitmap')
+        # create a definition for 'wxGenericStaticBitmap' which is not documented
+        def_genstatbmp = def_statbmp.dup
+        def_genstatbmp.name = 'wxGenericStaticBitmap'
+        def_genstatbmp.brief_doc = nil
+        def_genstatbmp.detailed_doc = nil
+        def_genstatbmp.items = def_genstatbmp.items.collect { |itm| itm.dup }
+        def_genstatbmp.items.each do |itm|
+          if itm.is_a?(Extractor::MethodDef)
+            itm.overloads = itm.overloads.collect { |ovl| ovl.dup }
+            itm.all.each do |ovl|
+              ovl.name = 'wxGenericStaticBitmap' if ovl.is_ctor
+              ovl.class_name = 'wxGenericStaticBitmap'
+              ovl.update_attributes(klass: def_genstatbmp)
+            end
+          end
+        end
+        def_genstatbmp.items.delete_if { |itm| itm.is_a?(Extractor::EnumDef) && itm.name == 'ScaleMode' }
+        spec.add_swig_code %Q{typedef wxStaticBitmap::ScaleMode ScaleMode; }
+        spec.add_header_code %Q{typedef wxStaticBitmap::ScaleMode ScaleMode; }
+        defmod.items << def_genstatbmp
+        defmod
+      end
+
     end # class StaticBitmap
 
   end # class Director

data/rakelib/lib/director/static_box.rb

@@ -16,11 +16,10 @@ module WXRuby3
 
       def setup
         super
-        if Config.instance.wx_port == :wxqt || Config.platform == :macosx
-          # missing from implementation currently
-          spec.ignore 'wxStaticBox::wxStaticBox(wxWindow *, wxWindowID, wxWindow *, const wxPoint &, const wxSize &, long, const wxString &)',
-                      'wxStaticBox::Create(wxWindow *, wxWindowID, wxWindow *, const wxPoint &, const wxSize &, long, const wxString &)'
-        end
+        # missing from implementation currently for WXOSX (and WXQT)
+        spec.ignore_unless(Config::AnyOf.new(*%w[WXMSW WXGTK]),
+                           'wxStaticBox::wxStaticBox(wxWindow *, wxWindowID, wxWindow *, const wxPoint &, const wxSize &, long, const wxString &)',
+                           'wxStaticBox::Create(wxWindow *, wxWindowID, wxWindow *, const wxPoint &, const wxSize &, long, const wxString &)')
       end
     end # class StaticBox