wxruby3 1.5.4 → 1.6.1

data/rakelib/lib/director/hyperlink_ctrl.rb

@@ -16,7 +16,7 @@ module WXRuby3
 
       def setup
         super
-        if Config.instance.wx_version <= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') <= 0
           # XML docs (< 3.3) incorrectly declare these pure virtual
           spec.ignore 'wxHyperlinkCtrl::GetVisited', 'wxHyperlinkCtrl::SetVisited', ignore_doc: false
           # replace by correct declarations
@@ -24,6 +24,43 @@ module WXRuby3
                                 'virtual bool wxHyperlinkCtrl::GetVisited() const',
                                 'virtual void wxHyperlinkCtrl::SetVisited(bool visited = true)'
         end
+
+        def process(gendoc: false)
+          defmod = super
+          # For WXOSX wxGenericHyperlinkCtrl is functionally identical to wxHyperlinkCtrl
+          # so we will declare a constant for that in pure Ruby.
+          # In case we are generating documentation create the class def anyway so we get full docs for MacOS as well.
+          unless Config.instance.features_set?('WXOSX') && !gendoc
+            spec.include 'wx/generic/hyperlink.h'
+            def_hlink = defmod.find_item('wxHyperlinkCtrl')
+            # create a definition for 'wxGenericHyperlinkCtrl' which is not documented
+            def_genhlink = def_hlink.dup
+            def_genhlink.name = 'wxGenericHyperlinkCtrl'
+            def_genhlink.items = def_genhlink.items.collect { |itm| itm.dup }
+            def_genhlink.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 = 'wxGenericHyperlinkCtrl' if ovl.is_ctor
+                  ovl.class_name = 'wxGenericHyperlinkCtrl'
+                  ovl.update_attributes(klass: def_genhlink)
+                end
+              end
+            end
+            defmod.items << def_genhlink
+            if Config.instance.wx_version_check('3.3.0') <= 0
+              # the interface extensions to fix the incorrectly pure virtual declared methods are missing
+              spec.extend_interface 'wxGenericHyperlinkCtrl',
+                                    'virtual bool wxGenericHyperlinkCtrl::GetVisited() const',
+                                    'virtual void wxGenericHyperlinkCtrl::SetVisited(bool visited = true)'
+            end
+            # as we already called super before adding wxGenericHyperlinkCtrl the no_proxy settings from the
+            # base Window director are missing; just copy all those set for wxStaticBitmap
+            list = spec.no_proxies.select { |name| name.start_with?('wxHyperlinkCtrl::') }
+            spec.no_proxy(*list.collect { |name| name.sub(/\AwxHyperlinkCtrl::/, 'wxGenericHyperlinkCtrl::')})
+          end
+          defmod
+        end
       end
     end # class HyperlinkCtrl
 

data/rakelib/lib/director/menu_item.rb

@@ -24,7 +24,7 @@ module WXRuby3
         spec.ignore_unless('USE_ACCEL', 'wxMenuItem::GetAccel')
         spec.no_proxy 'wxMenuItem::GetAccel'
         spec.ignore 'wxMenuItem::GetBitmap(bool)' # not portable
-        if Config.instance.wx_version > '3.2.4'
+        if Config.instance.wx_version_check('3.2.4') > 0
           spec.ignore_unless('WXMSW', 'wxMenuItem::SetBackgroundColour','wxMenuItem::SetFont','wxMenuItem::SetTextColour')
         end
         super

data/rakelib/lib/director/persistent_window.rb

@@ -14,10 +14,14 @@ module WXRuby3
 
       def setup
         spec.items << 'wxPersistentTLW' << 'wxPersistentBookCtrl' << 'wxPersistentTreeBookCtrl'
-        if Config.instance.wx_version > '3.2.4'
+        if Config.instance.wx_version_check('3.2.4') > 0
           # only after 3.2.4 properly available
           spec.items << 'wxPersistentComboBox'
         end
+        if Config.instance.wx_version_check('3.3.0') > 0
+          # only after 3.3.0 available
+          spec.items << 'wxPersistentCheckBox' << 'wxPersistentRadioButton'
+        end
         super
         spec.gc_as_marked
         spec.use_template_as_class('wxPersistentWindow', 'wxPersistentWindowBase')
@@ -57,13 +61,25 @@ module WXRuby3
         spec.extend_interface 'wxPersistentTreeBookCtrl',
                               'virtual wxString GetKind() const override'
         spec.do_not_generate :functions, :defines, :typedefs, :variables, :enums
-        if Config.instance.wx_version >= '3.0.0'
+        if Config.instance.wx_version_check('3.0.0') >= 0
           # wxPersistentComboBox
           spec.override_inheritance_chain('wxPersistentComboBox', [{ 'wxPersistentWindowBase' => 'wxPersistentWindow' }, 'wxPersistentObject'])
           # add method override missing from docs
           spec.extend_interface 'wxPersistentComboBox',
                                 'virtual wxString GetKind() const override'
         end
+        if Config.instance.wx_version_check('3.3.0') > 0
+          # wxPersistentCheckBox
+          spec.override_inheritance_chain('wxPersistentCheckBox', [{ 'wxPersistentWindowBase' => 'wxPersistentWindow' }, 'wxPersistentObject'])
+          # add method override missing from docs
+          spec.extend_interface 'wxPersistentCheckBox',
+                                'virtual wxString GetKind() const override'
+          # wxPersistentRadioButton
+          spec.override_inheritance_chain('wxPersistentRadioButton', [{ 'wxPersistentWindowBase' => 'wxPersistentWindow' }, 'wxPersistentObject'])
+          # add method override missing from docs
+          spec.extend_interface 'wxPersistentRadioButton',
+                                'virtual wxString GetKind() const override'
+        end
       end
 
     end

data/rakelib/lib/director/pgeditor.rb

@@ -17,7 +17,7 @@ module WXRuby3
         spec.items.concat %w[wxPGCheckBoxEditor wxPGChoiceEditor wxPGChoiceAndButtonEditor wxPGComboBoxEditor
                              wxPGTextCtrlEditor wxPGSpinCtrlEditor wxPGTextCtrlAndButtonEditor wxPGEditorDialogAdapter]
         spec.includes << 'wx/propgrid/propgriddefs.h'
-        if Config.instance.wx_version > '3.2.4'
+        if Config.instance.wx_version_check('3.2.4') > 0
           # make sure SWIG knows this as enum type
           spec.add_swig_code 'enum wxPGPropertyFlags;'
         end

data/rakelib/lib/director/pgproperties.rb

@@ -65,7 +65,7 @@ module WXRuby3
                     'wxUIntProperty::m_prefix',
                     'wxDateProperty::m_format',
                     'wxDateProperty::m_dpStyle'
-        if Config.instance.wx_version > '3.2.4'
+        if Config.instance.wx_version_check('3.2.4') > 0
           # currently missing from interface docs
           spec.extend_interface 'wxEnumProperty',
                                 'bool ValueFromString_(wxVariant& value, int* pIndex, const wxString& text,int argFlags) const',
@@ -111,7 +111,7 @@ module WXRuby3
         end
         # make sure the derived Enum property classes provide the protected accessors too
         %w[wxCursorProperty wxEditEnumProperty wxSystemColourProperty wxColourProperty].each do |kls|
-          if Config.instance.wx_version > '3.2.4'
+          if Config.instance.wx_version_check('3.2.4') > 0
             # currently missing from interface docs
             spec.extend_interface kls,
                                   'int GetIndex() const',
@@ -136,12 +136,12 @@ module WXRuby3
                     'wxLongStringProperty::DisplayEditorDialog',
                     'wxMultiChoiceProperty::DisplayEditorDialog',
                     'wxFontProperty::DisplayEditorDialog'
-        if Config.instance.wx_version > '3.2.4'
+        if Config.instance.wx_version_check('3.2.4') > 0
           # for wxEnumProperty and derivatives ValueFromString_/ValueFromInt_
           spec.map_apply 'int * OUTPUT' => 'int* pIndex'
         end
         # for UIntProperty and IntProperty
-        if Config.instance.features_set?('USE_LONGLONG') || Config.instance.wx_version >= '3.3.0'
+        if Config.instance.features_set?('USE_LONGLONG') || Config.instance.wx_version_check('3.3.0') >= 0
           # wxLongLong mapping to be considered before considering 'long' (see typecheck precedence)
           spec.map 'const wxLongLong&' => 'Integer' do
             map_in temp: 'wxLongLong tmp', code: <<~__CODE

data/rakelib/lib/director/pgproperty.rb

@@ -120,9 +120,10 @@ module WXRuby3
           # do not think this useful for wxRuby (Also; caused GC problems)
           spec.ignore 'wxPGProperty::GetCellRenderer'
           # obsolete
-          if Config.instance.wx_version < '3.3.0'
-            spec.ignore %w[wxPGProperty::AddChild wxPGProperty::GetValueString]
-          else
+          if Config.instance.wx_version_check('3.3.0') < 0
+            spec.ignore 'wxPGProperty::GetValueString'
+          end
+          if Config.instance.wx_version_check('3.3.0') <= 0
             spec.ignore 'wxPGProperty::AddChild'
           end
           # not of use in Ruby

data/rakelib/lib/director/pgvalidation_info.rb

@@ -16,7 +16,7 @@ module WXRuby3
         super
         spec.items << 'propgrid/propgrid.h'
         spec.gc_as_untracked 'wxPGValidationInfo'
-        if Config.instance.wx_version < '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') < 0
           spec.ignore 'wxPGVFBFlags' # not a constant but a rather a clumsy typedef
           spec.map 'wxPGVFBFlags' => 'Integer' do
             map_in code: '$1 = (unsigned char)NUM2UINT($input);'

data/rakelib/lib/director/print_data.rb

@@ -23,7 +23,7 @@ module WXRuby3
         # only keep the const version
         spec.ignore 'wxPageSetupDialogData::GetPrintData'
         spec.regard 'wxPageSetupDialogData::GetPrintData() const'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           # new since 3.3.0
           spec.items << 'wxPrintPageRange'
           spec.regard 'wxPrintPageRange::fromPage', 'wxPrintPageRange::toPage' # include public attributes

data/rakelib/lib/director/property_grid_event.rb

@@ -18,7 +18,7 @@ module WXRuby3
 
       def setup
         super
-        if Config.instance.wx_version < '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') < 0
           spec.map 'wxPGVFBFlags' => 'Integer' do
             map_in code: '$1 = (unsigned char)NUM2UINT($input);'
             map_out code: '$result = UINT2NUM((unsigned int)$1);'

data/rakelib/lib/director/property_grid_page.rb

@@ -38,7 +38,7 @@ module WXRuby3
           __HEREDOC
         spec.use_class_implementation 'wxPropertyGridPage', 'WXRubyPropertyGridPage'
         spec.ignore 'wxPropertyGridPage::GetStatePtr'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.ignore 'wxPropertyGridPageState::DoSetSplitter'
         else
           spec.ignore 'wxPropertyGridPageState::DoSetSplitterPosition'

data/rakelib/lib/director/property_grid_page_state.rb

@@ -21,7 +21,7 @@ module WXRuby3
         spec.disable_proxies
         spec.ignore 'wxPropertyGridPageState::DoDelete',
                     'wxPropertyGridPageState::DoInsert'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.ignore 'wxPropertyGridPageState::DoSetSplitter'
         else
           spec.ignore 'wxPropertyGridPageState::DoSetSplitterPosition'

data/rakelib/lib/director/ribbon_tool_bar.rb

@@ -16,7 +16,7 @@ module WXRuby3
 
       def setup
         super
-        if Config.instance.wx_version <= '3.2.2.1'
+        if Config.instance.wx_version_check('3.2.2.1') <= 0
           # In older versions a bug exists in wxRibbonToolBar::GetToolByPos and wxRibbonToolBar::DeleteToolByPos
           # so we use a wxRuby custom derived class
           spec.add_header_code <<~__HEREDOC

data/rakelib/lib/director/richtext_buffer.rb

@@ -20,7 +20,7 @@ module WXRuby3
         super
         spec.items << 'wxRichTextFontTable' << 'wxRichTextFieldType' << 'wxRichTextFieldTypeStandard' << 'wxRichTextDrawingHandler'
         spec.make_abstract 'wxRichTextFieldType'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           # make Ruby director and wrappers use custom implementation
           spec.use_class_implementation('wxRichTextFieldType', 'wxRubyRichTextFieldType')
           spec.add_header_code <<~__HEREDOC

data/rakelib/lib/director/richtext_formatting_dialog.rb

@@ -27,7 +27,7 @@ module WXRuby3
           wxRichTextFormattingDialog::SetStyle
           wxRichTextFormattingDialog::SetStyleDefinition
         ]
-        if Config.instance.wx_version < '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') < 0
           # add undocumented methods
           spec.extend_interface 'wxRichTextFormattingDialog',
                                 'wxRichTextObject* GetObject() const',

data/rakelib/lib/director/richtext_paragraph_layout_box.rb

@@ -83,7 +83,7 @@ module WXRuby3
                   return rb_rtsd;
               }
               __HEREDOC
-          if Config.instance.wx_version < '3.3.0'
+          if Config.instance.wx_version_check('3.3.0') < 0
             # add undocumented convenience method
             spec.extend_interface 'wxRichTextListStyleDefinition',
                                   'void SetAttributes(int i, int leftIndent, int leftSubIndent, int bulletStyle, const wxString& bulletSymbol = wxEmptyString)'

data/rakelib/lib/director/richtext_style_listbox.rb

@@ -22,7 +22,11 @@ module WXRuby3
         spec.items << 'wxRichTextStyleListCtrl' << 'wxRichTextStyleComboCtrl'
         spec.include 'wx/odcombo.h'
         spec.add_header_code 'extern VALUE wxRuby_RichTextStyleDefinition2Ruby(const wxRichTextStyleDefinition *wx_rtsd, int own);'
-        spec.override_inheritance_chain('wxRichTextStyleListBox', %w[wxHtmlListBox wxVListBox wxVScrolledWindow wxPanel wxWindow wxEvtHandler wxObject])
+        if Config.instance.wx_version_check('3.3.0') > 0
+          spec.override_inheritance_chain('wxRichTextStyleListBox', ['wxHtmlListBox', 'wxVListBox', 'wxVScrolledWindow', 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        else
+          spec.override_inheritance_chain('wxRichTextStyleListBox', ['wxHtmlListBox', 'wxVListBox', { 'wxVScrolledWindow' => 'wxHScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        end
         spec.override_inheritance_chain('wxRichTextStyleComboCtrl',
                                         %w[wxComboCtrl
                                            wxControl
@@ -33,6 +37,9 @@ module WXRuby3
         spec.extend_interface 'wxRichTextStyleComboCtrl',
                               'virtual void DoSetPopupControl(wxComboPopup* popup)',
                               visibility: 'protected'
+        # optimize; no need for these virtuals here
+        spec.no_proxy 'wxRichTextStyleListBox::OnGetRowHeight',
+                      'wxRichTextStyleListBox::OnGetRowsHeightHint'
       end
 
     end

data/rakelib/lib/director/scrolled_t.rb

@@ -63,8 +63,30 @@ module WXRuby3
         spec.ignore 'wxScrolled::GetViewStart(int *,int *)'
         spec.map_apply 'int * OUTPUT' => 'int *'
       end
+
+      def doc_generator
+        ScrolledTDocGenerator.new(self)
+      end
+
     end # class ScrolledT
 
+    class ScrolledTDocGenerator < DocGenerator
+
+      def get_method_doc(mtd)
+        mtd_doc = super
+        mtd_doc.each_pair do |_name, docs|
+          docs.each do |_ovl, _params, ovl_doc|
+            ovl_doc.each do |line|
+              line.gsub!(/Wx::Scrolled#(\w+)/, "{#{director.spec.module_name.sub(/^wx/, 'Wx::')}#\\1}")
+              line.gsub!(/\{Wx::Scrolled}/, "{#{director.spec.module_name.sub(/^wx/, 'Wx::')}}")
+            end
+          end
+        end
+        mtd_doc
+      end
+
+    end
+
   end # class Director
 
 end # module WXRuby3

data/rakelib/lib/director/sizer.rb

@@ -182,6 +182,27 @@ module WXRuby3
         spec.no_proxy "#{spec.module_name}::AddSpacer"
         super
       end
+
+      def process(gendoc: false)
+        defmod = super
+        # for all wxSizer (derived) classes
+        spec.items.each do |citem|
+          def_item = defmod.find_item(citem)
+          if Extractor::ClassDef === def_item && (citem != 'wxSizer' && spec.is_derived_from?(def_item, 'wxSizer'))
+            unless spec.abstract?(def_item.name) || (def_item.abstract && !spec.concrete?(def_item.name))
+              # specify optional block arg acceptance for all constructors of concrete derived Sizer classes
+              ctor_def = def_item.methods.find { |mtd| mtd.is_ctor }
+              if ctor_def
+                ctor_def.accept_block_arg.yield('sizer', "new Sizer instance")
+              else
+                STDERR.puts "INFO: cannot find ctor for #{def_item.name} module #{spec.module_name}"
+              end
+            end
+          end
+        end
+        defmod
+      end
+
     end # class Object
 
   end # class Director

data/rakelib/lib/director/styled_text_event.rb

@@ -16,7 +16,7 @@ module WXRuby3
 
       def setup
         super
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.ignore 'wxEVT_STC_KEY',
                       'wxEVT_STC_URIDROPPED'
         end

data/rakelib/lib/director/textctrl.rb

@@ -20,11 +20,11 @@ module WXRuby3
         spec.include_mixin 'wxTextCtrl', { 'Wx::TextEntry' => 'wxTextEntryBase' }
         spec.override_inheritance_chain('wxTextCtrl', %w[wxControl wxWindow wxEvtHandler wxObject])
         spec.ignore 'wxTextCtrl::HitTest(const wxPoint &,long *)'
-        if Config.instance.wx_port == :wxgtk && Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_port == :wxgtk && Config.instance.wx_version_check('3.3.0') >= 0
           spec.ignore 'wxTextCtrl::GTKGetTextBuffer',
                       'wxTextCtrl::GTKGetEditable'
         end
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.items << 'wxTextSearch' << 'wxTextSearchResult'
           spec.regard 'wxTextSearch::m_searchValue',
                       'wxTextSearch::m_startingPosition',

data/rakelib/lib/director/top_level_window.rb

@@ -78,7 +78,6 @@ module WXRuby3
                           "#{spec.class_name(citem)}::Maximize",
                           "#{spec.class_name(citem)}::Navigate",
                           "#{spec.class_name(citem)}::Refresh",
-                          "#{spec.class_name(citem)}::Reparent",
                           "#{spec.class_name(citem)}::RequestUserAttention",
                           "#{spec.class_name(citem)}::Restore",
                           "#{spec.class_name(citem)}::SetIcon",

data/rakelib/lib/director/tree_ctrl.rb

@@ -50,7 +50,7 @@ module WXRuby3
           wxTreeCtrl::GetFirstChild
           wxTreeCtrl::GetNextChild
           ]
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           # new method with bitmap bundle vector
           spec.no_proxy 'wxTreeCtrl::SetStateImages'
           spec.map 'const wxVector<wxBitmapBundle>& images' => 'Array<Wx::ImageBundle>' do

data/rakelib/lib/director/utils.rb

@@ -37,11 +37,13 @@ module WXRuby3
           wxMicroSleep
           wxMilliSleep
           wxSleep
-          wxUsleep
           wxNow
           wxDecToHex
           wxHexToDec
           ]
+        if Config.instance.wx_version_check('3.3.0') <= 0
+          spec.ignore 'wxUsleep'
+        end
         # ignore these enum(erator)s
         spec.ignore %w[
           wxSignal
@@ -61,7 +63,7 @@ module WXRuby3
         spec.ignore 'wxGetEmailAddress(char *,int)',
                     'wxGetUserId(char *,int)',
                     'wxGetUserName(char *,int)'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.ignore_unless('WXMSW', 'wxMSWIsOnSecureScreen')
         end
         spec.map 'wxMemorySize' => 'Integer' do

data/rakelib/lib/director/variant.rb

@@ -114,6 +114,16 @@ module WXRuby3
                   }
                   return wxVariant(arrs);
                 }
+                if ((RARRAY_LEN(rbval) > 0 && TYPE(rb_ary_entry(rbval, 0)) == T_FIXNUM))
+                {
+                  wxArrayInt arri;
+                  for (int i = 0; i < RARRAY_LEN(rbval); i++)
+                  {
+                    VALUE num = rb_ary_entry(rbval, i);
+                    arri.Add(NUM2INT(num));
+                  }
+                  return WXVARIANT(arri);
+                }
                 if (RARRAY_LEN(rbval) == 0 || 
                       rb_obj_is_kind_of(rb_ary_entry(rbval, 0), rb_const_get(mWxCore, var_Variant_id())))
                 {
@@ -170,6 +180,12 @@ module WXRuby3
           }
           __HEREDOC
         spec.add_extend_code 'wxVariant', <<~__HEREDOC
+          wxVariant(const wxArrayInt& val, const wxString &name=wxEmptyString)
+          {
+            wxVariant var(0L, name);
+            var << val;
+            return new wxVariant(var);
+          } 
           wxVariant(const wxFont& val, const wxString &name=wxEmptyString)
           {
             wxVariant var(0L, name);
@@ -188,6 +204,10 @@ module WXRuby3
             var << val;
             return new wxVariant(var);
           }
+          wxArrayInt GetArrayInt()
+          {
+            wxArrayInt arri; arri << *self; return arri;
+          }
           wxFont GetFont() 
           {
             wxFont font; font << *self; return font;
@@ -227,7 +247,7 @@ module WXRuby3
             $1 = rb_obj_is_kind_of($input, rb_const_get(mWxPG, var_ColourPropertyValue_id()));
           __CODE
         end
-        if Config.instance.features_set?('USE_LONGLONG') || Config.instance.wx_version >= '3.3.0'
+        if Config.instance.features_set?('USE_LONGLONG') || Config.instance.wx_version_check('3.3.0') >= 0
           # wxLongLong mapping to be considered before considering 'long' (see typecheck precedence)
           spec.map 'wxLongLong' => 'Integer' do
             map_in code: <<~__CODE
@@ -292,6 +312,12 @@ module WXRuby3
             $1 = (TYPE($input) == T_TRUE) || (TYPE($input) == T_FALSE);
           __CODE
         end
+        # override typecheck for wxArrayInt as we also have to consider
+        # wxVariantList and wxArrayString
+        spec.map 'const wxArrayInt&' do
+          map_typecheck precedence: 'INT32_ARRAY',
+                        code: '$1 = ((TYPE($input) == T_ARRAY) && (RARRAY_LEN($input) > 0) && (TYPE(rb_ary_entry($input, 0)) == T_FIXNUM));'
+        end
         # override typecheck for wxArrayString as we also have to consider
         # wxVariantList
         spec.map 'const wxArrayString&' do
@@ -506,6 +532,8 @@ module WXRuby3
           { (*self) = v; }
           void assign(const wxArrayString& v)
           { (*self) = v; }
+          void assign(const wxArrayInt& v)
+          { (*self) << v; }
 
           VALUE to_i()
           {

data/rakelib/lib/director/vlistbox.rb

@@ -16,7 +16,11 @@ module WXRuby3
 
       def setup
         super
-        spec.override_inheritance_chain('wxVListBox', %w[wxVScrolledWindow wxPanel wxWindow wxEvtHandler wxObject])
+        if Config.instance.wx_version_check('3.3.0') > 0
+          spec.override_inheritance_chain('wxVListBox', [{ 'wxVScrolledWindow' => 'wxVScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        else
+          spec.override_inheritance_chain('wxVListBox', [{ 'wxVScrolledWindow' => 'wxHScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        end
         spec.make_abstract 'wxVListBox'
         # provide base implementations for OnDrawItem and OnMeasureItem
         spec.add_header_code <<~__HEREDOC
@@ -31,11 +35,10 @@ module WXRuby3
           protected:
             virtual void OnDrawItem(wxDC&, const wxRect&, size_t) const
             {
-              rb_raise(rb_eNoMethodError, "Not implemented");
             }
             virtual wxCoord OnMeasureItem(size_t) const
             {
-              rb_raise(rb_eNoMethodError, "Not implemented");
+              return {};
             }
           };
         __HEREDOC
@@ -49,6 +52,9 @@ module WXRuby3
         # ignore these very un-Ruby methods
         spec.ignore 'wxVListBox::GetFirstSelected',
                     'wxVListBox::GetNextSelected'
+        # optimize; no need for these virtuals here
+        spec.no_proxy 'wxVListBox::OnGetRowHeight',
+                      'wxVListBox::OnGetRowsHeightHint'
         # add rubified API (finish in pure Ruby)
         spec.add_extend_code 'wxVListBox', <<~__HEREDOC
           VALUE each_selected()

data/rakelib/lib/director/window.rb

@@ -126,7 +126,7 @@ module WXRuby3
             # protected for wxQT; ignore for now
             spec.ignore 'wxWindow::EnableTouchEvents'
           end
-          if Config.instance.wx_version >= '3.3.0'
+          if Config.instance.wx_version_check('3.3.0') >= 0
             spec.ignore_unless('WXMSW', 'wxWindow::MSWDisableComposited')
             spec.ignore('wxWindow::GTKGetWin32Handle')
           end
@@ -135,7 +135,7 @@ module WXRuby3
           else
             spec.ignore('wxWindow::SetAccessible',
                         'wxWindow::GetAccessible')
-            if Config.instance.wx_version > '3.2.4'
+            if Config.instance.wx_version_check('3.2.4') > 0
               spec.ignore('wxWindow::CreateAccessible',
                           'wxWindow::GetOrCreateAccessible')
             end
@@ -262,6 +262,17 @@ module WXRuby3
         spec.items.each do |citem|
           def_item = defmod.find_item(citem)
           if Extractor::ClassDef === def_item && (citem == 'wxWindow' || spec.is_derived_from?(def_item, 'wxWindow'))
+            unless %w[wxNonOwnedWindow wxTopLevelWindow].include?(citem) ||
+                   spec.abstract?(def_item.name) || (def_item.abstract && !spec.concrete?(def_item.name))
+              # specify optional block arg acceptance for all constructors of concrete (derived) Window classes
+              # EXCEPT the default ctor (only used for XRC and such).
+              ctor_def = def_item.methods.find { |mtd| mtd.is_ctor }
+              if ctor_def
+                ctor_def.accept_block_arg(true).yield('win', "new instance")
+              else
+                STDERR.puts "INFO: cannot find ctor for #{def_item.name} module #{spec.module_name}"
+              end
+            end
             # Avoid adding unneeded directors
             spec.no_proxy("#{spec.class_name(citem)}::AddChild",
                           "#{spec.class_name(citem)}::Fit",
@@ -323,9 +334,10 @@ module WXRuby3
                           "#{spec.class_name(citem)}::EnableTouchEvents",
                           "#{spec.class_name(citem)}::WarpPointer",
                           "#{spec.class_name(citem)}::AdjustForLayoutDirection",
-                          "#{spec.class_name(citem)}::IsTransparentBackgroundSupported")
+                          "#{spec.class_name(citem)}::IsTransparentBackgroundSupported",
+                          "#{spec.class_name(citem)}::Reparent")
             if Config.instance.features_set?('USE_ACCESSIBILITY')
-              if Config.instance.wx_version > '3.2.4'
+              if Config.instance.wx_version_check('3.2.4') > 0
                 spec.no_proxy "#{spec.class_name(citem)}::CreateAccessible"
               end
             end