wxruby3 0.9.0.pre.beta.13 → 0.9.0.pre.rc.1

data/rakelib/lib/director/graphics_context.rb

@@ -12,14 +12,16 @@ module WXRuby3
       def setup
         super
         spec.disable_proxies
-        # these static creators require a running app
-        spec.require_app 'wxGraphicsContext::Create',
-                         'wxGraphicsContext::CreateFromUnknownDC'
+        # do not track GraphicContext objects as that causes problems probably for similar
+        # reasons as for DC objects
+        spec.gc_as_untracked
+        # ignore all these; wxRuby only supports the ::draw_on methods
         spec.ignore 'wxGraphicsContext::CreateFromNative',
                     'wxGraphicsContext::CreateFromNativeWindow',
                     'wxGraphicsContext::CreateFromNativeHDC',
+                    'wxGraphicsContext::CreateFromUnknownDC',
                     'wxGraphicsContext::GetNativeContext',
-                    'wxGraphicsContext::Create(const wxEnhMetaFileDC &)'
+                    'wxGraphicsContext::Create'
         # type mappings
         # Typemap to fix GraphicsContext#get_text_extent
         spec.map_apply 'double *OUTPUT' => [ 'wxDouble* width', 'wxDouble* height',
@@ -135,8 +137,6 @@ module WXRuby3
             }
             __CODE
         end
-        spec.new_object 'wxGraphicsContext::Create',
-                        'wxGraphicsContext::CreateFromUnknownDC'
         # add convenience method providing efficient gc memory management
         spec.add_extend_code 'wxGraphicsContext', <<~__HEREDOC
           static VALUE draw_on(wxWindow* win)

data/rakelib/lib/director/grid_table_message.rb

@@ -11,7 +11,7 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_temporary
+        spec.gc_as_untracked
       end
     end # class GridTableMessage
 

data/rakelib/lib/director/html_cell.rb

@@ -20,7 +20,7 @@ module WXRuby3
         spec.make_abstract 'wxHtmlCell'
         spec.make_abstract 'wxHtmlLinkInfo'
         spec.make_abstract 'wxHtmlContainerCell'
-        spec.gc_as_temporary 'wxHtmlLinkInfo' # no tracking
+        spec.gc_as_untracked 'wxHtmlLinkInfo' # no tracking
         spec.ignore 'wxHtmlCell::Find'
         # not useful for wxRuby as we do not support customizing these
         spec.ignore 'wxHtmlCell::AdjustPagebreak',

data/rakelib/lib/director/html_data_object.rb

@@ -20,13 +20,11 @@ module WXRuby3
         # we only allow Ruby derivatives from wxDataObject but not of any of the C++ implemented
         # specializations
         spec.no_proxy 'wxHTMLDataObject'
-        spec.add_swig_code <<~__HEREDOC
-            // SWIG gets confused and doesn't realise that various virtual methods
-            // from wxDataObject are implemented fully in this subclass, and so,
-            // believing it to be abstract doesn't provide an allocator for this
-            // class. This undocumented feature overrides this.
-            %feature("notabstract") wxHTMLDataObject;
-        __HEREDOC
+        # SWIG gets confused and doesn't realise that various virtual methods
+        # from wxDataObject are implemented fully in this subclass, and so,
+        # believing it to be abstract doesn't provide an allocator for this
+        # class. This overrides this.
+        spec.make_concrete 'wxHTMLDataObject'
 
       end
 

data/rakelib/lib/director/html_listbox.rb

@@ -12,7 +12,7 @@ module WXRuby3
     class HtmlListBox < Window
 
       def setup
-        spec.items << 'wxSimpleHtmlListBox'
+        spec.items << 'wxSimpleHtmlListBox' << 'wxItemContainer'
         super
         spec.override_inheritance_chain('wxHtmlListBox', %w[wxVListBox wxVScrolledWindow wxPanel wxWindow wxEvtHandler wxObject])
         spec.make_abstract 'wxHtmlListBox'
@@ -44,8 +44,72 @@ module WXRuby3
             $self->GetFileSystem().ChangePathTo(location, is_dir);
           }
           __HEREDOC
+        # make sure protected methods are included
+        spec.regard 'wxHtmlListBox::OnGetItem',
+                    'wxHtmlListBox::OnGetItemMarkup',
+                    'wxHtmlListBox::GetSelectedTextColour',
+                    'wxHtmlListBox::GetSelectedTextBgColour',
+                    'wxHtmlListBox::OnLinkClicked'
+        # add missing protected overloads
+        spec.extend_interface 'wxHtmlListBox',
+                              'virtual void OnDrawItem(wxDC &dc, const wxRect &rect, size_t n) const',
+                              'virtual wxCoord OnMeasureItem(size_t n) const',
+                              'virtual void OnDrawBackground(wxDC &dc, const wxRect &rect, size_t n) const',
+                              'virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const',
+                              visibility: 'protected'
+
         # override inheritance chain
         spec.override_inheritance_chain('wxSimpleHtmlListBox', %w[wxHtmlListBox wxVListBox wxVScrolledWindow wxPanel wxWindow wxEvtHandler wxObject])
+        spec.fold_bases('wxSimpleHtmlListBox' => %w[wxItemContainer])
+        # override SWIG's confusion
+        spec.make_concrete 'wxSimpleHtmlListBox'
+        # not useful overload
+        spec.ignore 'wxSimpleHtmlListBox::wxSimpleHtmlListBox(wxWindow *, wxWindowID, const wxPoint &, const wxSize &, int, const wxString[], long, const wxValidator &, const wxString &)'
+        # add missing overloads
+        spec.extend_interface 'wxSimpleHtmlListBox',
+                              'virtual wxString GetString(unsigned int n) const',
+                              'virtual void SetString(unsigned int n, const wxString &string)'
+        spec.ignore([ 'wxItemContainer::Append(const wxString &, wxClientData *)',
+                      'wxItemContainer::Append(const std::vector< wxString > &)',
+                      'wxItemContainer::Append(const wxArrayString &, wxClientData **)',
+                      '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, wxClientData *)',
+                      'wxItemContainer::Insert(const std::vector< wxString > &)',
+                      'wxItemContainer::Insert(const wxArrayString &, unsigned int, wxClientData **)',
+                      '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 &, wxClientData **)',
+                      'wxItemContainer::Set(unsigned int, const wxString *)',
+                      'wxItemContainer::Set(unsigned int, const wxString *, void **)',
+                      'wxItemContainer::Set(unsigned int, const wxString *, wxClientData **)',
+                      'wxItemContainer::DetachClientObject',
+                      'wxItemContainer::HasClientObjectData',
+                      'wxItemContainer::GetClientObject',
+                      'wxItemContainer::SetClientObject',
+                      'wxItemContainer::HasClientUntypedData',
+                      'wxItemContainer::Clear'])
+        spec.ignore([ 'wxItemContainer::Append(const wxArrayString &, void **)',
+                      'wxItemContainer::Insert(const wxArrayString &, unsigned int, void **)',
+                      'wxItemContainer::Set(const wxArrayString &, void **)'], ignore_doc: false)
+        # for doc only
+        spec.map 'void** clientData' => 'Array', swig: false do
+          map_in code: ''
+        end
+        spec.ignore(%w[wxItemContainer::GetClientData wxItemContainer::SetClientData], ignore_doc: false) # keep docs
+        # Replace the old Wx definition of this method (which segfaults)
+        # Only need the setter as we cache data in Ruby and the getter
+        # therefor can be pure Ruby
+        spec.add_extend_code('wxSimpleHtmlListBox', <<~__HEREDOC
+            VALUE set_client_data(int n, VALUE item_data) {
+              self->SetClientData(n, (void *)item_data);
+              return item_data;
+            }
+        __HEREDOC
+        )
       end
     end # class HtmlListBox
 

data/rakelib/lib/director/icon.rb

@@ -13,6 +13,8 @@ module WXRuby3
 
       def setup
         spec.items << 'wxIconBundle'
+        spec.gc_as_untracked 'wxIcon'
+        spec.gc_as_untracked 'wxIconBundle'
         spec.disable_proxies
         spec.require_app 'wxIcon', 'wxIconBundle'
         # disable as there is no way to distinguish char*/[] from wxString in Ruby

data/rakelib/lib/director/listbox.rb

@@ -23,6 +23,7 @@ module WXRuby3
                                            wxEvtHandler
                                            wxObject])
         spec.ignore('wxListBox::InsertItems(unsigned int,const wxString *,unsigned int)')
+        spec.ignore('wxListBox::IsSorted') # provided by ControlWithItems
       end
 
     end # class ListBox

data/rakelib/lib/director/locale.rb

@@ -14,7 +14,8 @@ module WXRuby3
         spec.disable_proxies
         spec.items << 'wxLanguageInfo' << 'language.h'
         spec.gc_as_object('wxLocale')
-        spec.gc_as_temporary('wxLanguageInfo')
+        spec.gc_as_untracked('wxLanguageInfo')
+        spec.make_concrete 'wxLanguageInfo'
         spec.regard %w[
           wxLanguageInfo::Language
           wxLanguageInfo::LocaleTag

data/rakelib/lib/director/palette.rb

@@ -12,6 +12,7 @@ module WXRuby3
       def setup
         super
         spec.disable_proxies
+        spec.gc_as_untracked 'wxPalette'
         if Config.instance.wx_port == :wxQT
           # mismatched implementation which does nothing anyway
           spec.ignore 'wxPalette::wxPalette(int, const unsigned char *, const unsigned char *, const unsigned char *)'

data/rakelib/lib/director/pen.rb

@@ -12,7 +12,8 @@ module WXRuby3
       def setup
         super
         spec.items << 'wxPenInfo'
-        spec.gc_as_temporary 'wxPenInfo'
+        spec.gc_as_untracked 'wxPenInfo'
+        spec.gc_as_untracked 'wxPen'
         spec.disable_proxies
         spec.add_header_code <<~__HEREDOC
           // special free funcs are needed to clean up Dashes array if it has been

data/rakelib/lib/director/pgproperties.rb

@@ -26,7 +26,7 @@ module WXRuby3
                     'wxEnumProperty::wxEnumProperty(const wxString &, const wxString &, const wxChar *const *, const long *, wxPGChoices *, int)'
         spec.ignore 'wxEditEnumProperty::wxEditEnumProperty(const wxString &, const wxString &, const wxChar *const *, const long *, const wxString&)',
                     'wxEditEnumProperty::wxEditEnumProperty(const wxString &, const wxString &, const wxChar *const *, const long *, wxPGChoices *, const wxString&)'
-        spec.gc_as_temporary 'wxColourPropertyValue'
+        spec.gc_as_untracked 'wxColourPropertyValue'
         spec.regard 'wxColourPropertyValue::m_type',
                     'wxColourPropertyValue::m_colour'
         spec.regard 'wxSystemColourProperty::Init',

data/rakelib/lib/director/pgproperty.rb

@@ -29,7 +29,7 @@ module WXRuby3
                                'drawn_height' => 'wxPGPaintData::m_drawnHeight'
           # wxPGChoices are always returned by value and never transfer ownership
           # so we do not need tracking or special free function
-          spec.gc_as_temporary 'wxPGChoices'
+          spec.gc_as_untracked 'wxPGChoices'
           # prevent exposure of wxPGChoicesData; not of any real use in wxRuby
           spec.ignore 'wxPGChoices::wxPGChoices(wxPGChoicesData*)',
                       'wxPGChoices::AssignData',

data/rakelib/lib/director/pgvalidation_info.rb

@@ -12,7 +12,7 @@ module WXRuby3
       def setup
         super
         spec.items << 'propgrid/propgrid.h'
-        spec.gc_as_temporary 'wxPGValidationInfo'
+        spec.gc_as_untracked 'wxPGValidationInfo'
         if Config.instance.wx_version < '3.3.0'
           spec.ignore 'wxPGVFBFlags' # not a constant but a rather a clumsy typedef
         end

data/rakelib/lib/director/platform_info.rb

@@ -11,7 +11,7 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_temporary
+        spec.gc_as_untracked
         spec.make_abstract('wxPlatformInfo')
         spec.ignore 'wxPlatformInfo::wxPlatformInfo',
                     'wxPlatformInfo::operator==',

data/rakelib/lib/director/print_data.rb

@@ -11,7 +11,7 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_temporary
+        spec.gc_as_untracked
         spec.disable_proxies # fixed and final data structures
         spec.items << 'wxPrintDialogData' << 'wxPageSetupDialogData'
         spec.ignore 'wxPrintDialogData::SetSetupDialog' # deprecated since 2.5.4

data/rakelib/lib/director/property_grid_interface.rb

@@ -19,7 +19,7 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_temporary 'wxPropertyGridInterface' # actually no GC control necessary as this is a mixin only
+        spec.gc_as_untracked 'wxPropertyGridInterface' # actually no GC control necessary as this is a mixin only
         # turn wxPropertyGridInterface into a mixin module
         spec.make_mixin 'wxPropertyGridInterface'
         # add typedef to work around flaky define in wxWidgets

data/rakelib/lib/director/property_grid_page_state.rb

@@ -13,7 +13,7 @@ module WXRuby3
         super
         spec.items << 'wxPropertyGridHitTestResult'
         spec.gc_never 'wxPropertyGridPageState'
-        spec.gc_as_temporary 'wxPropertyGridHitTestResult'
+        spec.gc_as_untracked 'wxPropertyGridHitTestResult'
         spec.make_abstract 'wxPropertyGridPageState'
         spec.disable_proxies
         spec.ignore 'wxPropertyGridPageState::DoDelete',

data/rakelib/lib/director/region.rb

@@ -15,6 +15,7 @@ module WXRuby3
         super
         spec.require_app 'wxRegion'
         spec.disable_proxies
+        spec.gc_as_untracked
         spec.ignore 'wxNullRegion' # does not exist in code
         spec.map_apply 'int n, wxPoint points[]' => [ 'size_t, const wxPoint *']
       end

data/rakelib/lib/director/ribbon_art_provider.rb

@@ -13,7 +13,7 @@ module WXRuby3
         spec.items << 'wxRibbonPageTabInfo' << 'wxRibbonMSWArtProvider' << 'wxRibbonAUIArtProvider'
         super
         spec.gc_as_object 'wxRibbonArtProvider'
-        spec.gc_as_temporary 'wxRibbonPageTabInfo'
+        spec.gc_as_untracked 'wxRibbonPageTabInfo'
         spec.suppress_warning(473,
                               'wxRibbonArtProvider::Clone',
                               'wxRibbonMSWArtProvider::Clone',

data/rakelib/lib/director/richtext_buffer_data_object.rb

@@ -20,13 +20,11 @@ module WXRuby3
         # we only allow Ruby derivatives from wxDataObject but not of any of the C++ implemented
         # specializations
         spec.no_proxy 'wxRichTextBufferDataObject'
-        spec.add_swig_code <<~__HEREDOC
-            // SWIG gets confused and doesn't realise that various virtual methods
-            // from wxDataObject are implemented fully in this subclass, and so,
-            // believing it to be abstract doesn't provide an allocator for this
-            // class. This undocumented feature overrides this.
-            %feature("notabstract") wxRichTextBufferDataObject;
-        __HEREDOC
+        # SWIG gets confused and doesn't realise that various virtual methods
+        # from wxDataObject are implemented fully in this subclass, and so,
+        # believing it to be abstract doesn't provide an allocator for this
+        # class. This overrides this.
+        spec.make_concrete 'wxRichTextBufferDataObject'
 
         # ignore overrrides (will be available through base class)
         spec.ignore 'wxRichTextBufferDataObject::GetPreferredFormat'

data/rakelib/lib/director/richtext_header_footer_data.rb

@@ -11,7 +11,7 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_temporary
+        spec.gc_as_untracked 'wxRichTextHeaderFooterData'
         spec.disable_proxies # fixed and final data structures
       end
     end # class RichTextHeaderFooterData

data/rakelib/lib/director/searchctrl.rb

@@ -0,0 +1,24 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class SearchCtrl < Window
+
+      def setup
+        super
+        # mixin TextEntry
+        spec.include_mixin 'wxSearchCtrl', 'Wx::TextEntry'
+        spec.override_inheritance_chain('wxSearchCtrl', %w[wxControl wxWindow wxEvtHandler wxObject])
+      end
+    end # class SearchCtrl
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/sizer.rb

@@ -15,7 +15,7 @@ module WXRuby3
         case spec.module_name
         when 'wxSizer'
           spec.items << 'wxSizerFlags'
-          spec.gc_as_temporary('wxSizerFlags')
+          spec.gc_as_untracked('wxSizerFlags')
           spec.make_abstract('wxSizer')
           spec.ignore %w[wxSizer::IsShown wxSizer::SetVirtualSizeHints]
           # cannot use these with wxRuby
@@ -44,7 +44,7 @@ module WXRuby3
           spec.suppress_warning(517, 'wxSizer')
         when 'wxGridBagSizer'
           spec.items << 'wxGBSpan' << 'wxGBPosition'
-          spec.gc_as_temporary 'wxGBSpan', 'wxGBPosition'
+          spec.gc_as_untracked 'wxGBSpan', 'wxGBPosition'
           # cannot use this with wxRuby
           spec.ignore 'wxGridBagSizer::Add(wxGBSizerItem *)'
         end

data/rakelib/lib/director/styled_text_ctrl.rb

@@ -14,6 +14,8 @@ module WXRuby3
       def setup
         super
         spec.override_inheritance_chain('wxStyledTextCtrl', %w[wxControl wxWindow wxEvtHandler wxObject])
+        # mixin TextEntry
+        spec.include_mixin 'wxStyledTextCtrl', 'Wx::TextEntry'
         spec.map 'int *', 'long *', as: 'Integer' do
           map_in ignore: true, temp: '$*1_ltype a', code: '$1 = &a;'
           map_argout code: <<~__CODE

data/rakelib/lib/director/text_entry.rb

@@ -12,8 +12,8 @@ module WXRuby3
       def setup
         super
         spec.items << 'wxTextCompleter' << 'wxTextCompleterSimple'
-        spec.gc_as_temporary 'wxTextCompleter', 'wxTextCompleterSimple'
-        spec.gc_as_temporary 'wxTextEntry' # actually no GC control necessary as this is a mixin only
+        spec.gc_as_untracked 'wxTextCompleter', 'wxTextCompleterSimple'
+        spec.gc_as_untracked 'wxTextEntry' # actually no GC control necessary as this is a mixin only
         # turn wxTextEntry into a mixin module
         spec.make_mixin 'wxTextEntry'
         spec.disown 'wxTextCompleter *completer' # managed by wxWidgets after passing in

data/rakelib/lib/director/tree_ctrl.rb

@@ -194,10 +194,13 @@ module WXRuby3
             else // Find the top-left most item, then recurse over it and siblings
             {
               wxTreeItemId base_id = FindFirstRoot(tree_ctrl);
-              // now do recursion
-              RecurseOverTreeIds(tree_ctrl, base_id, *rec_func);
-              while ((base_id = tree_ctrl->GetNextSibling(base_id)).IsOk())
+              if (base_id.IsOk())
+              {
+                // now do recursion
                 RecurseOverTreeIds(tree_ctrl, base_id, *rec_func);
+                while ((base_id = tree_ctrl->GetNextSibling(base_id)).IsOk())
+                  RecurseOverTreeIds(tree_ctrl, base_id, *rec_func);
+              }
               return;
             }
           }

data/rakelib/lib/director/uiaction_simulator.rb

@@ -0,0 +1,20 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class UIActionSimulator < Director
+
+      def setup
+        super
+        spec.gc_as_untracked # no tracking
+      end
+    end # class UIActionSimulator
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/variant.rb

@@ -15,7 +15,7 @@ module WXRuby3
         super
         # variants are (almost) always returned by value and never transfer ownership
         # so we do not need tracking or special free function
-        spec.gc_as_temporary 'wxVariant'
+        spec.gc_as_untracked 'wxVariant'
         spec.disable_proxies
         # add custom wxVariant extensions so to be
         # able to handle all PGProperty specific value types

data/rakelib/lib/director/vlistbox.rb

@@ -38,6 +38,31 @@ module WXRuby3
         __HEREDOC
         # make Ruby director and wrappers use custom implementation
         spec.use_class_implementation('wxVListBox', 'wxRubyVListBox')
+        # make sure protected methods are included
+        spec.regard 'wxVListBox::OnDrawItem',
+                    'wxVListBox::OnMeasureItem',
+                    'wxVListBox::OnDrawSeparator',
+                    'wxVListBox::OnDrawBackground'
+        # ignore these very un-Ruby methods
+        spec.ignore 'wxVListBox::GetFirstSelected',
+                    'wxVListBox::GetNextSelected'
+        # add rubified API (finish in pure Ruby)
+        spec.add_extend_code 'wxVListBox', <<~__HEREDOC
+          VALUE each_selected()
+          {
+            VALUE rc = Qnil;
+            if (rb_block_given_p())
+            {
+              unsigned long cookie;
+              int sel = $self->GetFirstSelected(cookie);
+              for (; sel != wxNOT_FOUND ;sel = $self->GetNextSelected(cookie))
+              {
+                rc = rb_yield (INT2NUM(sel));
+              }
+            }
+            return rc;  
+          }
+          __HEREDOC
       end
     end # class VListBox
 

data/rakelib/lib/director/window.rb

@@ -172,8 +172,6 @@ module WXRuby3
               swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(r_class);
               VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ptr_dc), swig_type, 0);
               rc = rb_yield(rb_dc);
-              SWIG_RubyRemoveTracking((void *)ptr_dc);
-              DATA_PTR(rb_dc) = NULL;
 
               return rc;
             }
@@ -201,16 +199,12 @@ module WXRuby3
                 wxPaintDC dc(ptr);
                 VALUE dcVal = SWIG_NewPointerObj((void *) &dc,SWIGTYPE_p_wxPaintDC, 0);
                 rc = rb_yield(dcVal);
-                SWIG_RubyRemoveTracking((void *) &dc);
-                DATA_PTR(dcVal) = NULL;
               }
               else // supply a ClientDC
               {
                 wxClientDC dc(ptr);
                 VALUE dcVal = SWIG_NewPointerObj((void *) &dc,SWIGTYPE_p_wxClientDC, 0);
                 rc = rb_yield(dcVal);
-                SWIG_RubyRemoveTracking((void *) &dc);
-                DATA_PTR(dcVal) = NULL;
               }
           
               return rc;

data/rakelib/lib/director/with_images.rb

@@ -11,7 +11,7 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_temporary 'wxWithImages' # actually no GC control necessary as this is a mixin only
+        spec.gc_as_untracked 'wxWithImages' # actually no GC control necessary as this is a mixin only
         # turn wxWithImages into a mixin module
         spec.make_mixin 'wxWithImages'
         # Avoid premature deletion of ImageList providing icons for notebook

data/rakelib/lib/director/xml_node.rb

@@ -12,7 +12,7 @@ module WXRuby3
       def setup
         super
         spec.disable_proxies
-        spec.gc_as_temporary
+        spec.gc_as_untracked
         spec.disown 'wxXmlNode *child'
         # ignore this; only allow adding child node by explicitly calling Add/Insert-child methods (easier on the GC handling and avoids wxXmlAttribute)
         spec.ignore 'wxXmlNode::wxXmlNode(wxXmlNode *, wxXmlNodeType, const wxString &, const wxString &, wxXmlAttribute *, wxXmlNode *, int)'

data/rakelib/lib/extractor/function.rb

@@ -91,9 +91,9 @@ module WXRuby3
         # unlink params_doc if any
         params_doc.unlink if params_doc
         # get brief doc
-        doc = xml_trans.to_doc(@brief_doc)
+        doc = xml_trans.to_doc(@brief_doc, item: self)
         # add detailed doc text without params doc
-        doc << xml_trans.to_doc(@detailed_doc)
+        doc << xml_trans.to_doc(@detailed_doc, item: self, desc: :detail)
         # get mapped ruby parameter list
         params = []
         mapped_ret_args = nil
@@ -130,7 +130,9 @@ module WXRuby3
             # look up matching mapped param entry
             if (param = params.detect { |p| p[:name] == pinm })
               # add doc
-              param[:doc] = xml_trans.to_doc(pi.xpath('parameterdescription')).lstrip
+              param[:doc] = xml_trans.to_doc(pi.xpath('parameterdescription'),
+                                             item: "#{name}.#{param[:name]}",
+                                             desc: :brief).lstrip
             end
           end
         end if params_doc

data/rakelib/lib/generate/doc/about_dialog_info.yaml

@@ -0,0 +1,46 @@
+---
+:wxAboutBox:
+  :detail:
+    :pre:
+      :para:
+        - :pattern: !ruby/regexp /<programlisting>.*MyFrame::ShowSimpleAboutDialog/
+          :replace: |
+            ```ruby
+              def show_simple_about_dialog(event)
+                info = Wx::AboutDialogInfo.new
+                info.name = 'My Program'
+                info.version = '1.2.3 Beta'
+                info.description = 'This program does something great.'
+                info.copyright = '(C) 2007 Me <my@email.addre.ss>'
+                   
+                Wx.about_box(info)
+              end
+            ```
+
+:wxAboutDialogInfo:
+  :detail:
+    :pre:
+      :para:
+        - :pattern: !ruby/regexp /Example of usage:/
+          :replace: |
+            
+            Example of usage:
+            
+            ```ruby
+              def on_about(event)
+                info = Wx::AboutDialogInfo.new
+                info.name = 'MyApp'
+                info.version = MY_APP_VERSION_STRING
+                info.description = 'My wxWidgets-based application!'
+                info.copyright = '(C) 1992-2023'
+                info.add_developer('My Self')
+                   
+                Wx.about_box(info)
+              end
+            ```
+
+    :post:
+      - :pattern: !ruby/regexp /Example of appearance of a simple about dialog:(.|\s)+\<\/table>\<\/div>/
+        :subst: ''
+      - :pattern: !ruby/regexp /And that of a dialog using a web site link,(.|\s)+\<\/table>\<\/div>/
+        :subst: ''

data/rakelib/lib/generate/doc/accelerator.yaml

@@ -0,0 +1,21 @@
+---
+:wxAcceleratorTable:
+  :detail:
+    :pre:
+      :para:
+        - :pattern: !ruby/regexp /<programlisting>.*/
+          :replace: |
+            ```ruby
+              entries = [
+                  Wx::AcceleratorEntry.new(Wx::ACCEL_CTRL, 'N', ID_NEW_WINDOW),
+                  Wx::AcceleratorEntry.new(Wx::ACCEL_CTRL, 'X', Wx::ID_EXIT),
+                  Wx::AcceleratorEntry.new(Wx::ACCEL_CTRL, 'A', Wx::ID_ABOUT),
+                  Wx::AcceleratorEntry.new(Wx::ACCEL_CTRL, 'N', Wx::ID_CUT)
+                ]
+              frame.accelerator_table = Wx::AcceleratorTable[entries]
+            ```
+:wxAcceleratorEntry.wxAcceleratorEntry.keyCode:
+  :brief:
+    :post:
+      - :pattern: !ruby/regexp /The\s+keycode\s+to\s+be\s+detected/
+        :subst: 'The keycode (or character) to be detected'