wxruby3 1.5.4 → 1.6.0

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,7 @@ 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])
+        spec.override_inheritance_chain('wxRichTextStyleListBox', ['wxHtmlListBox', 'wxVListBox', { 'wxVScrolledWindow' => 'wxHVScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
         spec.override_inheritance_chain('wxRichTextStyleComboCtrl',
                                         %w[wxComboCtrl
                                            wxControl
@@ -33,6 +33,7 @@ module WXRuby3
         spec.extend_interface 'wxRichTextStyleComboCtrl',
                               'virtual void DoSetPopupControl(wxComboPopup* popup)',
                               visibility: 'protected'
+        spec.no_proxy 'wxVListBox::OnGetRowHeight'
       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/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

@@ -61,7 +61,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

@@ -227,7 +227,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

data/rakelib/lib/director/vlistbox.rb

@@ -16,7 +16,7 @@ module WXRuby3
 
       def setup
         super
-        spec.override_inheritance_chain('wxVListBox', %w[wxVScrolledWindow wxPanel wxWindow wxEvtHandler wxObject])
+        spec.override_inheritance_chain('wxVListBox', [{ 'wxVScrolledWindow' => 'wxHVScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
         spec.make_abstract 'wxVListBox'
         # provide base implementations for OnDrawItem and OnMeasureItem
         spec.add_header_code <<~__HEREDOC
@@ -31,11 +31,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 +48,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",
@@ -325,7 +336,7 @@ module WXRuby3
                           "#{spec.class_name(citem)}::AdjustForLayoutDirection",
                           "#{spec.class_name(citem)}::IsTransparentBackgroundSupported")
             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

data/rakelib/lib/extractor/function.rb

@@ -15,6 +15,20 @@ module WXRuby3
 
       include Util::StringUtil
 
+      class Block
+        def initialize(exclude_default=false)
+          @yield_param = []
+          @exclude_default = exclude_default
+        end
+
+        attr_reader :yield_param, :exclude_default
+
+        def yield(name, desc, type: nil)
+          @yield_param << {name: name, desc: desc, type: type}
+          self
+        end
+      end
+
       def initialize(element = nil, **kwargs)
         super()
         @type = nil
@@ -23,12 +37,13 @@ module WXRuby3
         @args_string = ''
         @is_overloaded = false
         @overloads = []
+        @block_arg = nil
 
         update_attributes(**kwargs)
         extract(element) if element
       end
 
-      attr_accessor :type, :definition, :template_params, :args_string, :is_overloaded, :overloads
+      attr_accessor :type, :definition, :template_params, :args_string, :is_overloaded, :overloads, :block_arg
 
       def is_template?
         !template_params.empty?
@@ -74,6 +89,10 @@ module WXRuby3
         items.inject(0) { |c, i| c += 1 if ParamDef === i && !i.default; c }
       end
 
+      def accept_block_arg(exclude_default=false)
+        @block_arg = Block.new(exclude_default)
+      end
+
       def rb_decl_name
         "self.#{rb_method_name(rb_name || name)}"
       end
@@ -81,11 +100,23 @@ module WXRuby3
       def rb_doc(xml_trans, type_maps, fulldocs=false)
         ovls = all.select {|m| !m.docs_ignored(fulldocs) && !m.deprecated }
         ovl_docs = ovls.collect { |mo| [mo]+mo.rb_doc_decl(xml_trans, type_maps) }
-        ovl_docs.inject({}) do |docs, (movl, name, params, doc)|
-          if docs.has_key?(name)
-            docs[name] << [movl, params, doc]
-          else
-            docs[name] = [[movl, params, doc]]
+        ovl_docs.inject({}) do |docs, (movl, name, params, doc, retdoc)|
+          docs[name] = [] unless docs.has_key?(name)
+          # add regular method signature doc
+          docs[name] << [movl, params, doc+[retdoc]]
+          # is an optional block arg allowed for ALL methods or just this overload?
+          if @block_arg || movl.block_arg
+            # add an overload method signature doc with block arg and yield param
+            blk_arg = @block_arg || movl.block_arg
+            # skip in case default ctor/method (no args) is excluded from block args
+            unless params.empty? && blk_arg.exclude_default
+              type = is_ctor ? rb_return_type(type_maps, xml_trans) : nil
+              blk_arg.yield_param.each { |yp| doc << "@yieldparam [#{yp[:type] || type}] #{yp[:name]} #{yp[:desc].split("\n").join("\n  ")}" }
+              doc << retdoc
+              blkarg = params.empty? ? '' : ', '
+              blkarg << '&block'
+              docs[name] << [movl, params+blkarg, doc]
+            end
           end
           docs
         end
@@ -157,15 +188,15 @@ module WXRuby3
                  end
         result.concat(mapped_ret_args.collect { |mra| mra.type }) if mapped_ret_args
         result.compact! # remove nil values (possible ignored output)
-        case result.size
-        when 0
-          doclns << "@return [void]"
-        when 1
-          doclns << "@return [#{result.first}]"
-        else
-          doclns << "@return [Array(#{result.join(',')})]"
-        end
-        [rb_decl_name, paramlist, doclns]
+        retdoc = case result.size
+                 when 0
+                   "@return [void]"
+                 when 1
+                   "@return [#{result.first}]"
+                 else
+                   "@return [Array(#{result.join(',')})]"
+                 end
+        [rb_decl_name, paramlist, doclns, retdoc]
       end
 
       def rb_return_type(type_maps, xml_trans)

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

@@ -0,0 +1,22 @@
+---
+:wxGenericHyperlinkCtrl:
+  :brief:
+    :pre:
+      :briefdescription:
+        - :pattern: !ruby/regexp /.*/
+          :replace: |
+            This is the generic implementation of a class that shows a static text element which links to a URL.
+            For WXOSX this class is identical to wxHyperlinkCtrl.
+
+  :detail:
+    :pre:
+      :para:
+        - :pattern: !ruby/regexp /Currently\s+this\s+class\s+is\s+implemented.*other\s+ports./
+          :replace: ''
+:wxGenericHyperlinkCtrl.wxGenericHyperlinkCtrl:
+  :detail:
+    :pre:
+      :detaileddescription:
+        - :pattern: !ruby/regexp /See.*for\s+more\s+info\./
+          :replace: |
+            See {Wx::GenericHyperlinkCtrl#create} for more info.

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

@@ -1,4 +1,42 @@
 ---
+:wxScrolled:
+  :brief:
+    :pre:
+      :briefdescription:
+        - :pattern: !ruby/regexp /.*/
+          :replace: |
+            The Wx::ScrolledXXX classes manage scrolling for their client areas, transforming the coordinates according 
+            to the scrollbar positions, and setting the scroll positions, thumb sizes and ranges according to the area in view.
+  :detail:
+    :pre:
+      :simplesect:
+        - :pattern: !ruby/regexp /if you want to use.*wxScrolled.*with a custom class/
+          :replace: ''
+    :post:
+      - :pattern: !ruby/regexp /commonly used \(but not the only possible!\) /
+        :subst: 'commonly used '
+      - :pattern: !ruby/regexp /, aka \{Wx::Scrolled<wxPanel>}, is equivalent to \{Wx::ScrolledWindow} from earlier versions. Derived/
+        :subst: ' derives'
+      - :pattern: !ruby/regexp /, aka \{Wx::Scrolled<wxWindow>},/
+        :subst: ''
+      - :pattern: !ruby/regexp /\{Wx::Scrolled<wxControl>}/
+        :subst: 'Wx::ScrolledControl'
+      - :pattern: !ruby/regexp / \(also note the absence of a \{Wx::ScrolledControl} typedef\)/
+        :subst: ''
+      - :pattern: !ruby/regexp /Starting from version 2.4 of wxWidgets, there are several ways to use a \{Wx::ScrolledWindow} \(and now \{Wx::Scrolled}\). In particular, there /
+        :subst: 'There '
+      - :pattern: !ruby/regexp /Wx::Scrolled#(\w+)/
+        :subst: '{Wx::ScrolledCanvas#\1}'
+        :global: true
+      - :pattern: !ruby/regexp /\{Wx::Scrolled}/
+        :subst: '{Wx::ScrolledCanvas}'
+        :global: true
+:wxScrolled.Create:
+  :detail:
+    :pre:
+      :detaileddescription:
+        - :pattern: !ruby/regexp /.*/
+          :replace: ''
 :wxScrolled.DoPrepareDC:
   :detail:
     :pre:

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

@@ -1,4 +1,42 @@
 ---
+:wxScrolled:
+  :brief:
+    :pre:
+      :briefdescription:
+        - :pattern: !ruby/regexp /.*/
+          :replace: |
+            The Wx::ScrolledXXX classes manage scrolling for their client areas, transforming the coordinates according 
+            to the scrollbar positions, and setting the scroll positions, thumb sizes and ranges according to the area in view.
+  :detail:
+    :pre:
+      :simplesect:
+        - :pattern: !ruby/regexp /if you want to use.*wxScrolled.*with a custom class/
+          :replace: ''
+    :post:
+      - :pattern: !ruby/regexp /commonly used \(but not the only possible!\) /
+        :subst: 'commonly used '
+      - :pattern: !ruby/regexp /, aka \{Wx::Scrolled<wxPanel>}, is equivalent to \{Wx::ScrolledWindow} from earlier versions. Derived/
+        :subst: ' derives'
+      - :pattern: !ruby/regexp /, aka \{Wx::Scrolled<wxWindow>},/
+        :subst: ''
+      - :pattern: !ruby/regexp /\{Wx::Scrolled<wxControl>}/
+        :subst: 'Wx::ScrolledControl'
+      - :pattern: !ruby/regexp / \(also note the absence of a \{Wx::ScrolledControl} typedef\)/
+        :subst: ''
+      - :pattern: !ruby/regexp /Starting from version 2.4 of wxWidgets, there are several ways to use a \{Wx::ScrolledWindow} \(and now \{Wx::Scrolled}\). In particular, there /
+        :subst: 'There '
+      - :pattern: !ruby/regexp /Wx::Scrolled#(\w+)/
+        :subst: '{Wx::ScrolledControl#\1}'
+        :global: true
+      - :pattern: !ruby/regexp /\{Wx::Scrolled}/
+        :subst: '{Wx::ScrolledControl}'
+        :global: true
+:wxScrolled.Create:
+  :detail:
+    :pre:
+      :detaileddescription:
+        - :pattern: !ruby/regexp /.*/
+          :replace: ''
 :wxScrolled.DoPrepareDC:
   :detail:
     :pre:

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

@@ -1,4 +1,42 @@
 ---
+:wxScrolled:
+  :brief:
+    :pre:
+      :briefdescription:
+        - :pattern: !ruby/regexp /.*/
+          :replace: |
+            The Wx::ScrolledXXX classes manage scrolling for their client areas, transforming the coordinates according 
+            to the scrollbar positions, and setting the scroll positions, thumb sizes and ranges according to the area in view.
+  :detail:
+    :pre:
+      :simplesect:
+        - :pattern: !ruby/regexp /if you want to use.*wxScrolled.*with a custom class/
+          :replace: ''
+    :post:
+      - :pattern: !ruby/regexp /commonly used \(but not the only possible!\) /
+        :subst: 'commonly used '
+      - :pattern: !ruby/regexp /, aka \{Wx::Scrolled<wxPanel>}, is equivalent to \{Wx::ScrolledWindow} from earlier versions. Derived/
+        :subst: ' derives'
+      - :pattern: !ruby/regexp /, aka \{Wx::Scrolled<wxWindow>},/
+        :subst: ''
+      - :pattern: !ruby/regexp /\{Wx::Scrolled<wxControl>}/
+        :subst: 'Wx::ScrolledControl'
+      - :pattern: !ruby/regexp / \(also note the absence of a \{Wx::ScrolledControl} typedef\)/
+        :subst: ''
+      - :pattern: !ruby/regexp /Starting from version 2.4 of wxWidgets, there are several ways to use a \{Wx::ScrolledWindow} \(and now \{Wx::Scrolled}\). In particular, there /
+        :subst: 'There '
+      - :pattern: !ruby/regexp /Wx::Scrolled#(\w+)/
+        :subst: '{Wx::ScrolledWindow#\1}'
+        :global: true
+      - :pattern: !ruby/regexp /\{Wx::Scrolled}/
+        :subst: '{Wx::ScrolledWindow}'
+        :global: true
+:wxScrolled.Create:
+  :detail:
+    :pre:
+      :detaileddescription:
+        - :pattern: !ruby/regexp /.*/
+          :replace: ''
 :wxScrolled.DoPrepareDC:
   :detail:
     :pre:

data/rakelib/lib/specs/interfaces.rb

@@ -139,7 +139,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxScrolledWindow', director: Director::ScrolledT)
     Director.Spec(pkg, 'wxScrolledCanvas', director: Director::ScrolledT)
     Director.Spec(pkg, 'wxScrolledControl', director: Director::ScrolledT)
-    Director.Spec(pkg, 'wxVScrolledWindow')
+    Director.Spec(pkg, 'wxHVScrolledWindow')
     Director.Spec(pkg, 'wxVListBox')
     Director.Spec(pkg, 'wxFindReplaceData', requirements: %w[USE_FINDREPLDLG])
     Director.Spec(pkg, 'wxFindReplaceDialog', director: Director::Dialog, requirements: %w[USE_FINDREPLDLG])
@@ -272,7 +272,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxHtmlEasyPrinting', requirements: %w[USE_PRINTING_ARCHITECTURE])
     Director.Spec(pkg, 'wxHtmlPrintout', requirements: %w[USE_PRINTING_ARCHITECTURE])
     Director.Spec(pkg, 'wxHtmlListBox')
-    Director.Spec(pkg, 'wxHTMLDataObject') if Config.instance.wx_version >= '3.3'
+    Director.Spec(pkg, 'wxHTMLDataObject') if Config.instance.wx_version_check('3.3') >= 0
   }
 
   Director.Package('Wx::RTC', 'USE_RICHTEXT', depends_on: ['Wx::HTML']) { |pkg|

data/rakelib/lib/typemap/print_page_range.rb

@@ -20,7 +20,7 @@ module WXRuby3
 
       define do
 
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           map 'const std::vector<wxPrintPageRange> &' => 'Array<Wx::PRT::PrintPageRange>' do
             map_out code: <<~__CODE
                 $result = rb_ary_new();