wxruby3 1.5.3 → 1.6.0

data/rakelib/lib/director/geometry.rb

@@ -13,11 +13,15 @@ module WXRuby3
     class Geometry < Director
 
       def setup
-        spec.items.replace %w{wxPoint2DInt wxPoint2DDouble}
+        spec.items.replace %w{wxPoint2DInt wxPoint2DDouble wxRect2DDouble}
 
         spec.ignore 'wxPoint2DInt::m_x', 'wxPoint2DInt::m_y',
-                    'wxPoint2DDouble::m_x', 'wxPoint2DDouble::m_y'
+                    'wxPoint2DDouble::m_x', 'wxPoint2DDouble::m_y',
+                    'wxRect2DDouble::m_x', 'wxRect2DDouble::m_y',
+                    'wxRect2DDouble::m_width', 'wxRect2DDouble::m_height'
 
+        spec.ignore 'wxPoint2DInt::GetFloor(wxInt32 *, wxInt32 *)',
+                    'wxPoint2DInt::GetRounded(wxInt32 *, wxInt32 *)'
         spec.add_extend_code 'wxPoint2DInt', <<~__HEREDOC
           wxInt32 get_x()
           {
@@ -73,6 +77,8 @@ module WXRuby3
           }
           __HEREDOC
 
+        spec.ignore 'wxPoint2DDouble::GetFloor(wxInt32 *, wxInt32 *)',
+                    'wxPoint2DDouble::GetRounded(wxInt32 *, wxInt32 *)'
         spec.add_extend_code 'wxPoint2DDouble', <<~__HEREDOC
           wxDouble get_x()
           {
@@ -128,7 +134,53 @@ module WXRuby3
           }
           __HEREDOC
 
-        spec.map_apply 'int * OUTPUT' => 'wxInt32 *'
+
+        spec.add_extend_code 'wxRect2DDouble', <<~__HEREDOC
+          wxDouble get_x()
+          {
+            return $self->m_x;
+          }
+          wxDouble set_x(wxDouble v)
+          {
+            return ($self->m_x = v);
+          }
+          wxDouble get_y()
+          {
+            return $self->m_y;
+          }
+          wxDouble set_y(wxDouble v)
+          {
+            return ($self->m_y = v);
+          }
+          wxDouble get_width()
+          {
+            return $self->m_width;
+          }
+          wxDouble set_width(wxDouble v)
+          {
+            return ($self->m_width = v);
+          }
+          wxDouble get_height()
+          {
+            return $self->m_height;
+          }
+          wxDouble set_height(wxDouble v)
+          {
+            return ($self->m_height = v);
+          }
+          void assign(const wxRect2DDouble& rect)
+          {
+            (*$self) = rect;
+          }
+          __HEREDOC
+        # implement in pure Ruby
+        spec.ignore 'wxRect2DDouble::Intersect(const wxRect2DDouble &, const wxRect2DDouble &, wxRect2DDouble *)',
+                    'wxRect2DDouble::Union(const wxRect2DDouble &, const wxRect2DDouble &, wxRect2DDouble *)',
+                    ignore_doc: false
+        spec.map 'wxRect2DDouble *dest' => 'Wx::Rect2DDouble', swig: false do
+          map_in ignore: true, code: ''
+          map_argout code: ''
+        end
 
         # ignore all friend operators
         spec.do_not_generate :functions

data/rakelib/lib/director/graphics_context.rb

@@ -98,12 +98,17 @@ module WXRuby3
               delete old_dashes;
           }
           __HEREDOC
+        if Config.instance.wx_version_check('3.3.0') >= 0
+          spec.ignore 'wxGraphicsContext::GetClipBox(wxDouble *, wxDouble *, wxDouble *, wxDouble *)'
+        else
+          # Typemap to fix GraphicsContext#get_clip_box
+          spec.map_apply 'double *OUTPUT' => ['wxDouble *x', 'wxDouble *y', 'wxDouble *w', 'wxDouble *h']
+        end
         # type mappings
-        # Typemap to fix GraphicsContext#get_text_extent and get_dpi and get_clip_box
+        # Typemap to fix GraphicsContext#get_text_extent and get_dpi
         spec.map_apply 'double *OUTPUT' => [ 'wxDouble* width', 'wxDouble* height',
                                              'wxDouble* descent', 'wxDouble* externalLeading',
-                                             'wxDouble *dpiX', 'wxDouble *dpiY',
-                                             'wxDouble *x', 'wxDouble *y', 'wxDouble *w', 'wxDouble *h']
+                                             'wxDouble *dpiX', 'wxDouble *dpiY']
         spec.map 'wxDouble* width, wxDouble* height, wxDouble* descent, wxDouble* externalLeading' do
           map_directorargout code: <<~__CODE
             if ( (TYPE(result) == T_ARRAY) && (RARRAY_LEN(result) >= 2) )

data/rakelib/lib/director/graphics_object.rb

@@ -39,9 +39,36 @@ module WXRuby3
         spec.map_apply 'double *OUTPUT' => [ 'wxDouble *a', 'wxDouble *b',
                                              'wxDouble *c', 'wxDouble *d',
                                              'wxDouble *tx' , 'wxDouble *ty' ]
-        spec.ignore 'wxGraphicsPath::GetBox() const',
+        # Deal with GraphicsMatrix#transform_point and #transform_distance methods
+        spec.ignore 'wxGraphicsMatrix::TransformPoint', 'wxGraphicsMatrix::TransformDistance'
+        spec.map_apply 'double *INOUT' => [ 'wxDouble *x' , 'wxDouble *y',
+                                            'wxDouble *dx', 'wxDouble *dy']
+        spec.add_extend_code 'wxGraphicsMatrix', <<~__CODE
+          wxPoint2DDouble transform_point(wxDouble x, wxDouble y)
+          {
+            $self->TransformPoint(&x, &y);
+            return wxPoint2DDouble(x, y);
+          }
+          wxPoint2DDouble transform_point(const wxPoint2DDouble& pt)
+          {
+            wxDouble x = pt.m_x, y = pt.m_y;
+            $self->TransformPoint(&x, &y);
+            return wxPoint2DDouble(x, y);
+          }
+          wxPoint2DDouble transform_distance(wxDouble dx, wxDouble dy)
+          {
+            $self->TransformDistance(&dx, &dy);
+            return wxPoint2DDouble(dx, dy);
+          }
+          wxPoint2DDouble transform_distance(const wxPoint2DDouble& p)
+          {
+            wxDouble dx = p.m_x, dy = p.m_y;
+            $self->TransformDistance(&dx, &dy);
+            return wxPoint2DDouble(dx, dy);
+          }
+          __CODE
+        spec.ignore 'wxGraphicsPath::GetBox(wxDouble *, wxDouble *, wxDouble *, wxDouble *) const',
                     'wxGraphicsPath::GetCurrentPoint(wxDouble*,wxDouble*) const'
-        spec.map_apply 'double * OUTPUT' => 'wxDouble *'
         # wxGraphicsRenderer::GetVersion
         spec.map_apply 'int * OUTPUT' => ['int *major', 'int *minor', 'int *micro']
         if Config.platform == :mingw

data/rakelib/lib/director/html_listbox.rb

@@ -19,7 +19,7 @@ module WXRuby3
       def setup
         spec.items << 'wxSimpleHtmlListBox' << 'wxItemContainer'
         super
-        spec.override_inheritance_chain('wxHtmlListBox', %w[wxVListBox wxVScrolledWindow wxPanel wxWindow wxEvtHandler wxObject])
+        spec.override_inheritance_chain('wxHtmlListBox', ['wxVListBox', { 'wxVScrolledWindow' => 'wxHVScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
         spec.make_abstract 'wxHtmlListBox'
         # provide base implementation for OnGetItem
         spec.add_header_code <<~__HEREDOC
@@ -34,7 +34,7 @@ module WXRuby3
           protected:
             virtual wxString 	OnGetItem (size_t n) const
             {
-              rb_raise(rb_eNoMethodError, "Not implemented");
+              return {};
             }
           };
         __HEREDOC
@@ -48,7 +48,7 @@ module WXRuby3
           {
             $self->GetFileSystem().ChangePathTo(location, is_dir);
           }
-          __HEREDOC
+        __HEREDOC
         # make sure protected methods are included
         spec.regard 'wxHtmlListBox::OnGetItem',
                     'wxHtmlListBox::OnGetItemMarkup',
@@ -62,9 +62,10 @@ module WXRuby3
                               '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'
+        spec.no_proxy 'wxVListBox::OnGetRowHeight'
 
         # override inheritance chain
-        spec.override_inheritance_chain('wxSimpleHtmlListBox', %w[wxHtmlListBox wxVListBox wxVScrolledWindow wxPanel wxWindow wxEvtHandler wxObject])
+        spec.override_inheritance_chain('wxSimpleHtmlListBox', ['wxHtmlListBox', 'wxVListBox', { 'wxVScrolledWindow' => 'wxHVScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
         spec.fold_bases('wxSimpleHtmlListBox' => %w[wxItemContainer])
         # override SWIG's confusion
         spec.make_concrete 'wxSimpleHtmlListBox'
@@ -187,7 +188,7 @@ module WXRuby3
             }
             return rc;
           }
-          __HEREDOC
+        __HEREDOC
       end
     end # class HtmlListBox
 

data/rakelib/lib/director/hvscrolled_window.rb

@@ -0,0 +1,140 @@
+# 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 HVScrolledWindow < Window
+
+      def setup
+        super
+        spec.items << 'wxVarScrollHelperBase' << 'wxVarHVScrollHelper' <<
+                      'wxVarVScrollHelper' << 'wxVScrolledWindow' <<
+                      'wxVarHScrollHelper' << 'wxHScrolledWindow' <<
+                      'wxPosition'
+        spec.override_inheritance_chain('wxVScrolledWindow', %w[wxPanel wxWindow wxEvtHandler wxObject])
+        spec.fold_bases('wxVScrolledWindow' => %w[wxVarVScrollHelper wxVarScrollHelperBase])
+        spec.make_abstract 'wxVScrolledWindow'
+        spec.force_proxy 'wxVScrolledWindow'
+        spec.override_inheritance_chain('wxHScrolledWindow', %w[wxPanel wxWindow wxEvtHandler wxObject])
+        spec.fold_bases('wxHScrolledWindow' => %w[wxVarHScrollHelper wxVarScrollHelperBase])
+        spec.make_abstract 'wxHScrolledWindow'
+        spec.force_proxy 'wxHScrolledWindow'
+        spec.override_inheritance_chain('wxHVScrolledWindow', %w[wxPanel wxWindow wxEvtHandler wxObject])
+        spec.fold_bases('wxHVScrolledWindow' => %w[wxVarHVScrollHelper wxVarHScrollHelper wxVarVScrollHelper wxVarScrollHelperBase])
+        spec.make_abstract 'wxHVScrolledWindow'
+        spec.force_proxy 'wxHVScrolledWindow'
+        # provide base implementations for pure virtuals
+        spec.add_header_code <<~__HEREDOC
+          // Custom subclass implementation. 
+          class wxRubyVScrolledWindow : public wxVScrolledWindow
+          {
+          public:
+            wxRubyVScrolledWindow() 
+              : wxVScrolledWindow () {}
+            wxRubyVScrolledWindow(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name=wxPanelNameStr)
+              : wxVScrolledWindow(parent, id, pos, size, style, name) {}
+          protected:
+            virtual wxCoord OnGetRowHeight(size_t) const
+            {
+              return {};
+            }
+          };
+
+          // Custom subclass implementation. 
+          class wxRubyHScrolledWindow : public wxHScrolledWindow
+          {
+          public:
+            wxRubyHScrolledWindow() 
+              : wxHScrolledWindow () {}
+            wxRubyHScrolledWindow(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name=wxPanelNameStr)
+              : wxHScrolledWindow(parent, id, pos, size, style, name) {}
+          protected:
+            virtual wxCoord OnGetColumnWidth(size_t) const
+            {
+              return {};
+            }
+          };
+
+          // Custom subclass implementation. 
+          class wxRubyHVScrolledWindow : public wxHVScrolledWindow
+          {
+          public:
+            wxRubyHVScrolledWindow() 
+              : wxHVScrolledWindow () {}
+            wxRubyHVScrolledWindow(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name=wxPanelNameStr)
+              : wxHVScrolledWindow(parent, id, pos, size, style, name) {}
+          protected:
+            virtual wxCoord OnGetRowHeight(size_t) const
+            {
+              return {};
+            }
+            virtual wxCoord OnGetColumnWidth(size_t) const
+            {
+              return {};
+            }
+          };
+        __HEREDOC
+        # make Ruby director and wrappers use custom implementation
+        spec.use_class_implementation('wxVScrolledWindow', 'wxRubyVScrolledWindow')
+        spec.use_class_implementation('wxHScrolledWindow', 'wxRubyHScrolledWindow')
+        spec.use_class_implementation('wxHVScrolledWindow', 'wxRubyHVScrolledWindow')
+        # regard protected methods
+        spec.regard 'wxVarVScrollHelper::OnGetRowHeight',
+                    'wxVarVScrollHelper::OnGetRowsHeightHint'
+        spec.regard 'wxVarHScrollHelper::OnGetColumnWidth',
+                    'wxVarHScrollHelper::OnGetColumnsWidthHint'
+        # ignore internal implementation methods
+        spec.ignore 'wxVarScrollHelperBase::GetNonOrientationTargetSize',
+                    'wxVarScrollHelperBase::GetOrientation',
+                    'wxVarScrollHelperBase::GetOrientationTargetSize',
+                    'wxVarScrollHelperBase::OnGetUnitSize',
+                    'wxVarScrollHelperBase::CalcScrolledPosition',
+                    'wxVarScrollHelperBase::CalcUnscrolledPosition',
+                    'wxVarScrollHelperBase::GetTargetWindow',
+                    'wxVarScrollHelperBase::SetTargetWindow',
+                    'wxVarScrollHelperBase::UpdateScrollbar',
+                    'wxVarScrollHelperBase::RefreshAll'
+        spec.map 'const wxPosition&' => 'Array(Integer, Integer), Wx::Position' do
+          add_header_code '#include <memory>'
+          map_in temp: 'std::unique_ptr<$1_basetype> tmp', code: <<~__CODE
+            if ( TYPE($input) == T_DATA )
+            {
+              void* argp$argnum;
+              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0);
+              $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
+            }
+            else if ( TYPE($input) == T_ARRAY )
+            {
+              $1 = new $1_basetype( NUM2INT( rb_ary_entry($input, 0) ),
+                                   NUM2INT( rb_ary_entry($input, 1) ) );
+              tmp.reset($1); // auto destruct when method scope ends 
+            }
+            else
+            {
+              rb_raise(rb_eTypeError, "Wrong type for $1_basetype parameter");
+            }
+            __CODE
+          map_typecheck precedence: 'POINTER', code: <<~__CODE
+            void *vptr = 0;
+            $1 = 0;
+            if (TYPE($input) == T_ARRAY && RARRAY_LEN($input) == 2)
+              $1 = 1;
+            else if (TYPE($input) == T_DATA && SWIG_CheckState (SWIG_ConvertPtr ($input, &vptr, $1_descriptor, 0)))
+              $1 = 1;
+            __CODE
+        end
+      end
+    end # class HVScrolledWindow
+
+  end # class Director
+
+end # module WXRuby3

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,7 +14,7 @@ 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
@@ -57,7 +57,7 @@ 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

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,7 +120,7 @@ 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'
+          if Config.instance.wx_version_check('3.3.0') < 0
             spec.ignore %w[wxPGProperty::AddChild wxPGProperty::GetValueString]
           else
             spec.ignore 'wxPGProperty::AddChild'

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,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