wxruby3 0.9.0.pre.rc.3 → 0.9.1

data/rakelib/lib/director/grid_cell_editor.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -13,7 +16,10 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_untracked_refcounted
+        spec.gc_as_untracked
+        # use custom free func to be able to account for more complex inheritance
+        spec.add_header_code 'extern void GC_free_GridCellEditor(void *ptr);'
+        spec.add_swig_code '%feature("freefunc") wxGridCellEditor "GC_free_GridCellEditor";'
         if spec.module_name == 'wxGridCellEditor'
           spec.post_processors << :fix_gridcelleditor
           # exposing the mixin wxClientDataContainer/wxSharedClientDataContainer has no real upside
@@ -101,7 +107,14 @@ module WXRuby3
               wxRuby_RegisterGridCellEditor(const_cast<wxGridCellEditor*> (wx_gce), rb_gce);
               return rb_gce;
             }
-          __CODE
+
+            extern void GC_free_GridCellEditor(void *ptr)
+            {
+              wxGridCellEditor* gc_edt = (wxGridCellEditor*)ptr; 
+              if (ptr)
+                gc_edt->DecRef();
+            }
+            __CODE
         elsif spec.module_name == 'wxGridCellActivatableEditor'
           spec.post_processors << :fix_gridcelleditor
           spec.override_inheritance_chain('wxGridCellActivatableEditor', %w[wxGridCellEditor])
@@ -126,6 +139,10 @@ module WXRuby3
           case spec.module_name
           when 'wxGridCellEnumEditor'
             spec.override_inheritance_chain(spec.module_name, %w[wxGridCellChoiceEditor wxGridCellEditor])
+          when 'wxGridCellChoiceEditor'
+            # unnecessary overload
+            spec.ignore 'wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t, const wxString [], bool)'
+            spec.override_inheritance_chain(spec.module_name, %w[wxGridCellEditor])
           when 'wxGridCellAutoWrapStringEditor', 'wxGridCellFloatEditor', 'wxGridCellNumberEditor'
             spec.override_inheritance_chain(spec.module_name, %w[wxGridCellTextEditor wxGridCellEditor])
           else
@@ -165,12 +182,12 @@ module WXRuby3
             static WxRuby_ID ga_mouse_id("mouse");
 
             inline wxGridActivationResult
-            array_to_wxGridActivationResult(VALUE rbarr)
+            array_to_wxGridActivationResult(VALUE self, const char* method, VALUE rbarr)
             {
               if (rbarr == Qnil || 
                 !(TYPE(rbarr) == T_ARRAY || TYPE(rbarr) == T_SYMBOL))
               {
-                Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
+                Swig::DirectorTypeMismatchException::raise(self, method, SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
                                                            "in output value of type 'wxGridActivationResult'");
               }
               if (TYPE(rbarr) == T_SYMBOL)
@@ -180,7 +197,7 @@ module WXRuby3
                 else if (SYM2ID(rbarr) == ga_show_editor_id())
                   return wxGridActivationResult::DoEdit();
                 else
-                  Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
+                  Swig::DirectorTypeMismatchException::raise(self, method, SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
                                                              "in output value of type 'wxGridActivationResult'");
               }
               else
@@ -189,7 +206,7 @@ module WXRuby3
                 VALUE rbStr = rb_ary_shift(rbarr); // could be nil
                 if (rbAction == Qnil || TYPE(rbAction) != T_SYMBOL)
                 {
-                  Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
+                  Swig::DirectorTypeMismatchException::raise(self, method, SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
                                                              "in output value of type 'wxGridActivationResult'");
                 }
                 else if (SYM2ID(rbAction) == ga_change_id() && rbStr != Qnil)
@@ -203,7 +220,7 @@ module WXRuby3
                   else if (SYM2ID(rbAction) == ga_show_editor_id())
                     return wxGridActivationResult::DoEdit();
                   else
-                    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
+                    Swig::DirectorTypeMismatchException::raise(self, method, SWIG_ErrorType(SWIG_ArgError(SWIG_ERROR)), 
                                                                "in output value of type 'wxGridActivationResult'");
                 }
               }
@@ -335,7 +352,7 @@ module WXRuby3
             elsif line["wxGridActivationResult SwigDirector_#{module_name}::TryActivate("]
               skip_lines = true
               # append new method implementation
-              line << <<~__METHOD__
+              line << "\n" << <<~__METHOD__
                 static WxRuby_ID try_activate_id("try_activate");
 
                 VALUE obj0 = Qnil ;
@@ -349,7 +366,7 @@ module WXRuby3
                 obj2 = SWIG_NewPointerObj(SWIG_as_voidptr(grid), SWIGTYPE_p_wxGrid,  0 );
                 obj3 = wxGridActivationSource_to_array(actSource); 
                 result = rb_funcall(swig_get_self(), try_activate_id(), 4,obj0,obj1,obj2,obj3);
-                return array_to_wxGridActivationResult(result);
+                return array_to_wxGridActivationResult(swig_get_self(), "try_activate", result);
                 __METHOD__
             elsif !helpers_added && line["SwigDirector_#{module_name}::SwigDirector_#{module_name}(VALUE self"]
               # insert helper methods
@@ -358,7 +375,7 @@ module WXRuby3
             elsif line["_wrap_#{module_name}_TryActivate(int argc, VALUE *argv, VALUE self) {"]
               skip_lines = true
               # append new method implementation
-              line << <<~__METHOD__
+              line << "\n" << <<~__METHOD__
                   #{module_name} *arg1 = (#{module_name} *) 0 ;
                   int arg2 ;
                   int arg3 ;

data/rakelib/lib/director/grid_cell_renderer.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -13,7 +16,10 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_untracked_refcounted
+        spec.gc_as_untracked
+        # use custom free func to be able to account for more complex inheritance
+        spec.add_header_code 'extern void GC_free_GridCellRenderer(void *ptr);'
+        spec.add_swig_code '%feature("freefunc") wxGridCellRenderer "GC_free_GridCellRenderer";'
         if spec.module_name == 'wxGridCellRenderer'
           # exposing the mixin wxClientDataContainer/wxSharedClientDataContainer has no real upside
           # for wxRuby; far easier to just use member variables in derived classes
@@ -97,7 +103,14 @@ module WXRuby3
               wxRuby_RegisterGridCellRenderer(const_cast<wxGridCellRenderer*> (wx_gcr), rb_gcr);
               return rb_gcr;
             }
-          __CODE
+
+            extern void GC_free_GridCellRenderer(void *ptr)
+            {
+              wxGridCellRenderer* gc_rdr = (wxGridCellRenderer*)ptr; 
+              if (ptr)
+                gc_rdr->DecRef();
+            }
+            __CODE
         else
           case spec.module_name
           when 'wxGridCellStringRenderer'

data/rakelib/lib/director/grid_ctrl.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -15,9 +18,10 @@ module WXRuby3
 
       def setup
         # replace before calling super
-        spec.items.replace %w[wxGrid]
+        spec.items.replace %w[wxGrid wxGridBlockCoords wxGridBlockDiffResult wxGridSizesInfo wxGridFitMode]
         super
-        spec.gc_as_window
+        spec.gc_as_untracked %w[wxGridBlockCoords wxGridBlockDiffResult wxGridSizesInfo wxGridFitMode]
+        spec.gc_as_window 'wxGrid'
         spec.override_inheritance_chain('wxGrid', %w[wxScrolledCanvas wxWindow wxEvtHandler wxObject])
         spec.no_proxy 'wxGrid::SendAutoScrollEvents'
         # All of the methods have alternate versions that accept row, col pair
@@ -40,13 +44,85 @@ module WXRuby3
         spec.ignore 'wxGrid::SetCellValue(const wxString &,int,int)'
         spec.ignore 'wxGrid::SetTable' # there is wxGrid::AssignTable now that always takes ownership
 
-        spec.ignore 'wxGrid::GetSelectedBlocks' # for now (flawed interface)
+        spec.regard 'wxGridSizesInfo::m_sizeDefault',
+                    'wxGridSizesInfo::m_customSizes'
+        spec.rename_for_ruby 'size_default' => 'wxGridSizesInfo::m_sizeDefault',
+                             'custom_sizes' => 'wxGridSizesInfo::m_customSizes'
+        spec.map 'wxUnsignedToIntHashMap' => 'Hash' do
+          add_header_code <<~__CODE
+            #if RUBY_API_VERSION_MAJOR<3 && RUBY_API_VERSION_MINOR<7
+            typedef int (*rb_foreach_func)(ANYARGS);
+            #else
+            typedef int (*rb_foreach_func)(VALUE, VALUE, VALUE);
+            #endif
+            #define FOREACH_FUNC(x) reinterpret_cast<rb_foreach_func>((void*)&(x))
+            static int _wxrb_cvt_custom_sizes(VALUE key, VALUE value, VALUE rbWxMap)
+            {
+              wxUnsignedToIntHashMap* wxMap;
+              Data_Get_Struct(rbWxMap, wxUnsignedToIntHashMap, wxMap);
+              (*wxMap)[NUM2UINT(key)] = NUM2INT(value);
+              return ST_CONTINUE;
+            }
+            __CODE
+          map_in code: <<~__CODE
+            if (TYPE($input) == T_HASH)
+            {
+              void* ptr = &($1);
+              VALUE rbWxMap = Data_Wrap_Struct(rb_cObject, 0, 0, ptr);
+              rb_hash_foreach($input, FOREACH_FUNC(_wxrb_cvt_custom_sizes), rbWxMap);
+            }
+            else
+            {
+              rb_raise(rb_eArgError, "Expected Hash for %d", $argnum-1);
+            }
+            __CODE
+
+          map_out code: <<~__CODE
+            $result = rb_hash_new();
+            wxUnsignedToIntHashMap::const_iterator it = $1.begin();
+            for (; it != $1.end() ;++it)
+            {
+              rb_hash_aset($result, UINT2NUM(it->first), INT2NUM(it->second));
+            } 
+            __CODE
+        end
+
+        spec.ignore 'wxGrid::GetSelectedBlocks' # ignore
+        # add rubified API (finish in pure Ruby)
+        spec.add_extend_code 'wxGrid', <<~__HEREDOC
+          VALUE selected_blocks()
+          {
+            VALUE rc = Qnil;
+            if (rb_block_given_p())
+            {
+              wxGridBlocks sel = $self->GetSelectedBlocks();
+              for (const wxGridBlockCoords& gbc : sel)
+              {
+                rc = rb_yield (SWIG_NewPointerObj(new wxGridBlockCoords(gbc), SWIGTYPE_p_wxGridBlockCoords, SWIG_POINTER_OWN));
+              }
+            }
+            return rc;  
+          }
+          __HEREDOC
+
+        spec.ignore 'wxGrid::GetGridWindowOffset(const wxGridWindow *, int &, int &) const'
 
         spec.add_header_code <<~__HEREDOC
           typedef wxGrid::wxGridSelectionModes wxGridSelectionModes;
           typedef wxGrid::CellSpan CellSpan;
           typedef wxGrid::TabBehaviour TabBehaviour;
           __HEREDOC
+
+        spec.map 'wxGridBlockCoordsVector' => 'Array<Wx::GRID::GridBlockCoords' do
+          map_out code: <<~__CODE
+            $result = rb_ary_new();
+            for (const wxGridBlockCoords& gbc: $1)
+            {
+              rb_ary_push($result, SWIG_NewPointerObj(new wxGridBlockCoords(gbc), SWIGTYPE_p_wxGridBlockCoords, SWIG_POINTER_OWN));
+            }
+            __CODE
+        end
+
         # Needed for methods that return cell and label alignments and other argout type mappings
         spec.map_apply 'int *OUTPUT' => [ 'int *horiz', 'int *vert' ,
                                           'int *num_rows', 'int *num_cols' ]
@@ -108,6 +184,71 @@ module WXRuby3
                               'wxGrid::GetDefaultEditorForType',
                               'wxGrid::GetDefaultRendererForCell',
                               'wxGrid::GetDefaultRendererForType')
+
+        # create a lightweight, but typesafe, wrapper for wxGridWindow
+        spec.add_init_code <<~__HEREDOC
+          // define wxGridWindow wrapper class
+          mWxGridWindow = rb_define_class_under(mWxGRID, "GridWindow", rb_cObject);
+          rb_undef_alloc_func(mWxGridWindow);
+          __HEREDOC
+
+        spec.add_header_code <<~__HEREDOC
+          VALUE mWxGridWindow;
+
+          // wxGridWindow wrapper class definition and helper functions
+          static size_t __wxGridWindow_size(const void* data)
+          {
+            return 0;
+          }
+
+          #include <ruby/version.h> 
+
+          static const rb_data_type_t __wxGridWindow_type = {
+            "GridWindow",
+          #if RUBY_API_VERSION_MAJOR >= 3
+            { NULL, NULL, __wxGridWindow_size, 0, 0},
+          #else
+            { NULL, NULL, __wxGridWindow_size, 0},
+          #endif 
+            NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+          };
+
+          VALUE _wxRuby_Wrap_wxGridWindow(wxGridWindow* gw)
+          {
+            if (gw)
+            {
+              void* data = gw;
+              VALUE ret = TypedData_Wrap_Struct(mWxGridWindow, &__wxGridWindow_type, data);
+              return ret;
+            }
+            else
+              return Qnil;
+          } 
+
+          wxGridWindow* _wxRuby_Unwrap_wxGridWindow(VALUE rbgw)
+          {
+            if (NIL_P(rbgw))
+              return nullptr;
+            else
+            {
+              void *data = 0;
+              TypedData_Get_Struct(rbgw, void, &__wxGridWindow_type, data);
+              return reinterpret_cast<wxGridWindow*> (data);
+            }
+          }
+
+          bool _wxRuby_Is_wxGridWindow(VALUE rbgw)
+          {
+            return rb_typeddata_is_kind_of(rbgw, &__wxGridWindow_type) == 1;
+          } 
+          __HEREDOC
+
+        spec.map 'wxGridWindow*' => 'Wx::GRID::GridWindow' do
+          map_in code: '$1 = _wxRuby_Unwrap_wxGridWindow($input);'
+          map_out code: '$result = _wxRuby_Wrap_wxGridWindow($1);'
+          map_typecheck code: '$1 = _wxRuby_Is_wxGridWindow($input);'
+        end
+
         # Add custom code to handle GC marking for Grid cell attributes, editors and renderers.
         # Ruby created instances of these are registered in global tables whenever they are assigned to
         # a Grid (for a cell, default or named type). The global tables will be scanned during the GC marking stage
@@ -347,7 +488,7 @@ module WXRuby3
         # add type mappings to handle registration
         # first declare 'normal' type mapping for const pointer (for DrawCellHighlight)
         spec.map 'const wxGridCellAttr *'  => 'Wx::GRID::GridCellAttr' do
-          map_check code: 'wxRuby_RegisterGridCellAttr($1, argv[$argnum-2]);'
+          map_check code: ''  # do nothing; this instance does not get managed by wxWidgets
         end
         # next handle registering mappings
         spec.map 'wxGridCellAttr *' => 'Wx::GRID::GridCellAttr' do

data/rakelib/lib/director/grid_range_select_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'

data/rakelib/lib/director/grid_table_base.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -9,6 +12,8 @@ module WXRuby3
 
     class GridTableBase < Director
 
+      include Typemap::GridCoords
+
       def setup
         super
         spec.ignore %w[

data/rakelib/lib/director/grid_table_message.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/header_ctrl.rb

@@ -0,0 +1,37 @@
+# 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 HeaderCtrl < Window
+
+      def setup
+        super
+        spec.items << 'wxHeaderColumn' << 'wxHeaderCtrlSimple' << 'wxSettableHeaderColumn' << 'wxHeaderColumnSimple'
+        spec.regard 'wxHeaderCtrl::GetColumn',
+                    'wxHeaderCtrl::UpdateColumnVisibility',
+                    'wxHeaderCtrl::UpdateColumnsOrder',
+                    'wxHeaderCtrl::UpdateColumnWidthToFit',
+                    'wxHeaderCtrl::OnColumnCountChanging'
+        spec.regard 'wxHeaderCtrlSimple::GetBestFittingWidth'
+        spec.extend_interface 'wxHeaderCtrlSimple',
+                              'virtual const wxHeaderColumn& GetColumn(unsigned int idx) const',
+                              visibility: 'protected'
+        # handled; can be suppressed
+        spec.suppress_warning(473, 'wxHeaderCtrl::GetColumn', 'wxHeaderCtrlSimple::GetColumn')
+        spec.do_not_generate :typedefs, :variables, :enums, :defines, :functions
+      end
+    end # class HeaderCtrl
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/help_controller.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -9,9 +12,11 @@ module WXRuby3
 
     class HelpController < Director
 
+      include Typemap::ConfigBase
+
       def setup
         super
-        spec.items << 'wxHelpControllerBase'
+        spec.items << 'wxHelpControllerBase' << 'helpfrm.h'
         spec.fold_bases(spec.module_name => 'wxHelpControllerBase')
         spec.rename_for_ruby('Init' => "#{spec.module_name}::Initialize")
         # ignore these (pure virtual) decls
@@ -50,10 +55,14 @@ module WXRuby3
             return rc;
           }
           __HEREDOC
+        spec.suppress_warning(473, "#{spec.module_name}::GetParentWindow")
         if spec.module_name == 'wxHtmlHelpController'
-          spec.ignore 'wxHtmlHelpController::CreateHelpFrame'
-          spec.suppress_warning(473,
-                                'wxHtmlHelpController::GetParentWindow')
+          # prevent having to expose HtmlHelpFrame & HtmlHelpDialog
+          # I do not see real use in supporting custom HtmlHelpController derivatives
+          spec.ignore 'wxHtmlHelpController::CreateHelpFrame',
+                      'wxHtmlHelpController::CreateHelpDialog',
+                      'wxHtmlHelpController::GetFrame',
+                      'wxHtmlHelpController::GetDialog'
         elsif spec.module_name == 'wxExtHelpController'
           spec.ignore %w[
             wxExtHelpController::DisplayBlock
@@ -62,8 +71,6 @@ module WXRuby3
             wxExtHelpController::Quit
             wxExtHelpController::GetFrameParameters
           ]
-          spec.suppress_warning(473,
-                                'wxExtHelpController::GetParentWindow')
           # already generated with HelpController
           spec.do_not_generate :variables, :enums, :defines, :functions
         end

data/rakelib/lib/director/help_provider.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/html_cell.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -13,7 +16,7 @@ module WXRuby3
 
       def setup
         super
-        spec.items << 'wxHtmlLinkInfo' << 'wxHtmlContainerCell' << 'htmldefs.h'
+        spec.items << 'wxHtmlLinkInfo' << 'wxHtmlContainerCell' << 'wxHtmlSelection' << 'htmldefs.h'
         # the classes here are internal and for reference only
         # should never be derived from or instantiated in (Ruby) user code
         spec.disable_proxies
@@ -27,7 +30,11 @@ module WXRuby3
                     'wxHtmlCell::Draw',
                     'wxHtmlCell::DrawInvisible',
                     'wxHtmlCell::Layout',
-                    'wxHtmlCell::ProcessMouseClick'
+                    'wxHtmlCell::ProcessMouseClick',
+                    'wxHtmlCell::GetMouseCursor',
+                    'wxHtmlCell::GetMouseCursorAt'
+        spec.ignore 'wxHtmlContainerCell::SetAlign',
+                    'wxHtmlContainerCell::SetWidthFloat'
       end
     end # class HtmlCell
 

data/rakelib/lib/director/html_data_object.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/html_easy_printing.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/html_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'

data/rakelib/lib/director/html_help_data.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/html_help_window.rb

@@ -0,0 +1,30 @@
+# 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 HtmlHelpWindow < Window
+
+      include Typemap::ConfigBase
+
+      def setup
+        super
+        # only allow setting config through propagation from help controller
+        # saves us from management code
+        spec.ignore 'wxHtmlHelpWindow::UseConfig'
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/director/html_listbox.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/html_printout.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -12,6 +15,8 @@ module WXRuby3
       def setup
         super
         spec.override_inheritance_chain('wxHtmlPrintout', {'wxPrintout' => 'wxPrinter'}, 'wxObject')
+        # for GetPageInfo
+        spec.map_apply 'int * OUTPUT' => ['int *minPage', 'int *maxPage', 'int *pageFrom', 'int *pageTo']
         # Deal with sizes argument to SetFonts
         spec.map 'const int *sizes' => 'Array(Integer,Integer,Integer,Integer,Integer,Integer,Integer), nil' do
           map_in temp: 'int tmp[7]', code: <<~__CODE

data/rakelib/lib/director/html_window.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -12,6 +15,7 @@ module WXRuby3
     class HtmlWindow < Window
 
       include Typemap::HtmlCell
+      include Typemap::ConfigBase
 
       def setup
         super
@@ -34,15 +38,13 @@ module WXRuby3
         spec.suppress_warning(473, "wxHtmlWindow::GetHTMLWindow")
         # deprecated; use event handler instead
         spec.ignore 'wxHtmlWindow::OnLinkClicked'
+        # not useful for wxRuby
+        spec.ignore 'wxHtmlWindow::GetParser'
         spec.no_proxy 'wxHtmlWindow::SendAutoScrollEvents'
         spec.add_header_code 'typedef wxHtmlWindow::HTMLCursor HTMLCursor;'
-        # type mapping for LoadFile, SetFonts and OnOpeningURL
-        spec.map 'const wxFileName &filename' => 'String' do
-          # Deal with wxFileName
-          map_in temp: 'wxFileName tmp', code: <<~__CODE
-            tmp = wxFileName(RSTR_TO_WXSTR($input));
-            $1 = &tmp;
-            __CODE
+        spec.map 'HTMLCursor' => 'Integer' do
+          map_in code: '$1 = static_cast<HTMLCursor> (NUM2INT($input));'
+          map_directorin code: '$input = INT2NUM((int)$1);'
         end
         # Deal with sizes argument to SetFonts
         spec.map 'const int *sizes' => 'Array(Integer,Integer,Integer,Integer,Integer,Integer,Integer), nil' do