wxruby3 0.9.0.pre.rc.3 → 0.9.0

data/rakelib/lib/director/font_picker_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'

data/rakelib/lib/director/frame.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 './top_level_window'
@@ -16,57 +19,66 @@ module WXRuby3
         # only for wxFrame class itself
         case spec.module_name
         when 'wxFrame'
-          spec.no_proxy %w[
-            wxFrame::CreateStatusBar
-            wxFrame::CreateToolBar
-            wxFrame::SetMenuBar
-            wxFrame::GetMenuBar
-            wxFrame::SetStatusBar
-            wxFrame::GetStatusBar
-            wxFrame::SetToolBar
-            wxFrame::GetToolBar]
           spec.ignore %w[
             wxFrame::OnCreateStatusBar wxFrame::OnCreateToolBar]
-          spec.set_only_for(%w[__WXMSW__ wxUSE_TASKBARBUTTON], 'wxFrame::MSWGetTaskBarButton')
+          unless Config.instance.features_set?(*%w[__WXMSW__ wxUSE_TASKBARBUTTON])
+            spec.ignore('wxFrame::MSWGetTaskBarButton')
+          end
           # this reimplemented window base method need to be properly wrapped but
           # is missing from the XML docs
           spec.extend_interface('wxFrame', 'virtual void OnInternalIdle()')
           spec.disown 'wxMenuBar *'
-          spec.map 'int n, int * widths' do
-            map_in from: {type: 'Array<Integer>', index: 1},
-                   temp: 'int size, int i, std::unique_ptr<int[]> arr', code: <<~__CODE
+          # handled; can be suppressed
+          spec.suppress_warning(473,
+                                'wxFrame::CreateStatusBar',
+                                'wxFrame::CreateToolBar',
+                                'wxFrame::GetMenuBar',
+                                'wxFrame::GetStatusBar',
+                                'wxFrame::GetToolBar')
+        end
+        # for SetStatusWidths
+        spec.map 'int n, int * widths_field' do
+          map_in from: {type: 'Array<Integer>', index: 1},
+                 temp: 'int size, std::unique_ptr<int[]> arr', code: <<~__CODE
               size = RARRAY_LEN($input);
               arr.reset(new int[size]);
-              for(i = 0; i < size; i++)
+              for(int i = 0; i < size; i++)
               {
                 arr.get()[i] = NUM2INT(rb_ary_entry($input,i));
               }
               $1 = size;
               $2 = arr.get();
               __CODE
-          end
-          # handled; can be suppressed
-          spec.suppress_warning(473,
-                                'wxFrame::CreateStatusBar',
-                                'wxFrame::CreateToolBar',
-                                'wxFrame::GetMenuBar',
-                                'wxFrame::GetStatusBar',
-                                'wxFrame::GetToolBar')
-        else # 'wxMiniFrame', 'wxMDIFrame', 'wxAuiMDIParentFrame'
-          spec.items.each do |cls|
+          map_directorin code: <<~__CODE
+            $input = rb_ary_new();
+            for (int i = 0; i < $1; i++)
+            {
+              rb_ary_push($input, INT2NUM($2[i]));
+            }
+            __CODE
+        end
+      end
+
+      def process(gendoc: false)
+        defmod = super
+        spec.items.each do |citem|
+          def_item = defmod.find_item(citem)
+          if Extractor::ClassDef === def_item && (citem == 'wxFrame' || spec.is_derived_from?(def_item, 'wxFrame'))
             spec.no_proxy %W[
-              #{cls}::CreateStatusBar
-              #{cls}::CreateToolBar
-              #{cls}::SetMenuBar
-              #{cls}::GetMenuBar
-              #{cls}::SetStatusBar
-              #{cls}::GetStatusBar
-              #{cls}::SetToolBar
-              #{cls}::GetToolBar
+              #{spec.class_name(citem)}::CreateStatusBar
+              #{spec.class_name(citem)}::CreateToolBar
+              #{spec.class_name(citem)}::SetMenuBar
+              #{spec.class_name(citem)}::GetMenuBar
+              #{spec.class_name(citem)}::SetStatusBar
+              #{spec.class_name(citem)}::GetStatusBar
+              #{spec.class_name(citem)}::SetToolBar
+              #{spec.class_name(citem)}::GetToolBar
               ]
           end
         end
+        defmod
       end
+      
     end # class Frame
 
   end # class Director

data/rakelib/lib/director/fs_file.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
@@ -10,6 +13,7 @@ module WXRuby3
     class FSFile < Director
 
       include Typemap::IOStreams
+      include Typemap::DateTime
 
       def setup
         super
@@ -31,6 +35,32 @@ module WXRuby3
             }
           __CODE
         end
+        spec.map 'wxFileOffset' => 'Integer' do
+          # we need these inline methods here as we do not want SWIG to preprocess the code
+          # as it will do in the type mapping code sections
+          add_header_code <<~__CODE
+            inline wxFileOffset __ruby2wxFileOffset(VALUE num)
+            {
+            #ifdef wxHAS_HUGE_FILES
+              return static_cast<wxFileOffset> (NUM2LL(num));
+            #else
+              return static_cast<wxFileOffset> (NUM2LONG(num));
+            #endif
+            } 
+            inline VALUE __wxFileOffset2ruby(wxFileOffset offs)
+            {
+            #ifdef wxHAS_HUGE_FILES
+              return LL2NUM(offs);
+            #else
+              return LONG2NUM(offs);
+            #endif
+            } 
+            __CODE
+
+          map_in code: '$1 = __ruby2wxFileOffset($input);'
+          map_out code: '$result = __wxFileOffset2ruby($1);'
+          map_typecheck code: '$1 = TYPE($input) == T_FIXNUM;'
+        end
         spec.new_object 'wxFSFile::DetachStream'
         # ignore troublesome methods
         spec.ignore 'wxInputStream::Read(void *, size_t)',
@@ -346,6 +376,27 @@ module WXRuby3
         spec.add_init_code 'wxRuby_AppendMarker(wxRuby_markRbStreams);'
       end
 
+      def process(gendoc: false)
+        defmod = super
+        # wxSeekMode is documented in a separate module with a lot of defs we do not want
+        # so let's manually insert it's definition here
+        seek_mode_enum = Extractor::EnumDef.new(name: 'wxSeekMode',
+                                                brief_doc: 'Parameter indicating how file offset should be interpreted.')
+        seek_mode_enum.items << Extractor::EnumValueDef.new(enum: seek_mode_enum, name: 'wxFromStart', brief_doc: 'Seek from the file beginning.')
+        seek_mode_enum.items << Extractor::EnumValueDef.new(enum: seek_mode_enum, name: 'wxFromCurrent', brief_doc: 'Seek from the current position.')
+        seek_mode_enum.items << Extractor::EnumValueDef.new(enum: seek_mode_enum, name: 'wxFromEnd', brief_doc: 'Seek from end of the file.')
+        defmod.items << seek_mode_enum
+        # same for this
+        stream_error_enum = Extractor::EnumDef.new(name: 'wxStreamError',
+                                                brief_doc: 'IO stream error codes.')
+        stream_error_enum.items << Extractor::EnumValueDef.new(enum: stream_error_enum, name: 'wxSTREAM_NO_ERROR', brief_doc: 'No error occurred.')
+        stream_error_enum.items << Extractor::EnumValueDef.new(enum: stream_error_enum, name: 'wxSTREAM_EOF', brief_doc: 'EOF reached.')
+        stream_error_enum.items << Extractor::EnumValueDef.new(enum: stream_error_enum, name: 'wxSTREAM_WRITE_ERROR', brief_doc: 'generic write error on the last write call.')
+        stream_error_enum.items << Extractor::EnumValueDef.new(enum: stream_error_enum, name: 'wxSTREAM_READ_ERROR', brief_doc: 'generic read error on the last read call.')
+        defmod.items << stream_error_enum
+        defmod
+      end
+
     end # class FSFile
 
   end # class Director

data/rakelib/lib/director/functions.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
@@ -59,10 +62,12 @@ module WXRuby3
               if (!NIL_P(rb_comp) && TYPE(rb_comp) == T_STRING) component = StringValuePtr(rb_comp);
             }
 
-            VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-            va_list list;
-            va_start(list, argv); // just a dummy to satisfy wxLogger::LogV 
-            wxLogger(lvl, filename, line, func, component).LogV(RSTR_TO_WXSTR(log_msg), list);
+            if ( lvl == wxLOG_FatalError ||
+                    wxLog::IsLevelEnabled(lvl, wxASCII_STR(component)) )
+            {
+              VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
+              wxLogger(lvl, filename, line, func, component).Log(RSTR_TO_WXSTR(log_msg));
+            }
           }
 
           // Log a Wx message with the given level to the current Wx log output
@@ -192,6 +197,7 @@ module WXRuby3
             }
             __CODE
         end
+        spec.map_apply 'int *OUTPUT' => ['int *indexDefaultExtension']
         # hardcoded interface declarations
         spec.add_interface_code <<~__HEREDOC
           bool wxSafeYield(wxWindow* win = NULL, bool onlyIfNeeded = false);

data/rakelib/lib/director/gdi_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/gdicommon.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
@@ -57,14 +60,16 @@ module WXRuby3
           wxPoint::x wxPoint::y
           wxRealPoint::x wxRealPoint::y
           ]
-        spec.set_only_for '__WXGTK__', 'wxStockCursor.wxCURSOR_DEFAULT'
-        spec.set_only_for '__X__', %w{
-          wxStockCursor.wxCURSOR_CROSS_REVERSE
-          wxStockCursor.wxCURSOR_DOUBLE_ARROW
-          wxStockCursor.wxCURSOR_BASED_ARROW_UP
-          wxStockCursor.wxCURSOR_BASED_ARROW_DOWN
-        }
-        spec.set_only_for '__WXMAC__', 'wxStockCursor.wxCURSOR_COPY_ARROW'
+        spec.ignore('wxStockCursor.wxCURSOR_DEFAULT') unless Config.instance.features_set?('__WXGTK__')
+        unless Config.instance.features_set?('__X__')
+          spec.ignore %w{
+            wxStockCursor.wxCURSOR_CROSS_REVERSE
+            wxStockCursor.wxCURSOR_DOUBLE_ARROW
+            wxStockCursor.wxCURSOR_BASED_ARROW_UP
+            wxStockCursor.wxCURSOR_BASED_ARROW_DOWN
+          }
+        end
+        spec.ignore('wxStockCursor.wxCURSOR_COPY_ARROW') unless Config.instance.features_set?('__WXOSX__')
         spec.add_extend_code 'wxRect', <<~__HEREDOC
           wxRect add(const wxRect &rect) const {
             return (*(const wxRect*)$self) + rect;

data/rakelib/lib/director/generic_dirctrl.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/graphics_context.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
@@ -11,21 +14,97 @@ module WXRuby3
 
       def setup
         super
+        spec.items << 'wxGraphicsGradientStop' << 'wxGraphicsGradientStops' << 'wxGraphicsPenInfo'
         spec.disable_proxies
         # do not track GraphicContext objects as that causes problems probably for similar
         # reasons as for DC objects
         spec.gc_as_untracked
+        # doc error
+        spec.ignore 'wxGraphicsGradientStop::wxGraphicsGradientStop'
+        spec.extend_interface 'wxGraphicsGradientStop',
+                              'wxGraphicsGradientStop(wxColour col=wxTransparentColour, float pos=0.0)'
         # ignore all these; wxRuby only supports the ::draw_on methods
         spec.ignore 'wxGraphicsContext::CreateFromNative',
                     'wxGraphicsContext::CreateFromNativeWindow',
                     'wxGraphicsContext::CreateFromNativeHDC',
                     'wxGraphicsContext::CreateFromUnknownDC',
                     'wxGraphicsContext::GetNativeContext',
-                    'wxGraphicsContext::Create'
+                    'wxGraphicsContext::Create',
+                    'wxGraphicsContext::CreateMatrix(const wxAffineMatrix2DBase &) const',
+                    'wxGraphicsContext::DrawLines(size_t, const wxPoint2DDouble *, wxPolygonFillMode)',
+                    'wxGraphicsContext::StrokeLines(size_t, const wxPoint2DDouble *)',
+                    'wxGraphicsContext::StrokeLines (size_t, const wxPoint2DDouble *, const wxPoint2DDouble *)'
+        if Config.platform == :linux
+          spec.ignore 'wxGraphicsContext::Create(const wxPrinterDC &)'
+        end
+        spec.add_header_code <<~__HEREDOC
+          // special free funcs are needed to clean up Dashes array if it has been
+          // set; wxWidgets does not do this automatically so will leak if not
+          // dealt with.
+          void GC_free_wxGraphicsPenInfo(wxGraphicsPenInfo *pen_info) 
+          {
+            SWIG_RubyRemoveTracking(pen_info);
+            if (pen_info)
+            {
+              wxDash *dashes;
+              int dash_count = pen_info->GetDashes(&dashes);
+              if ( dash_count )
+                delete dashes;
+            }
+            delete pen_info;
+          }
+          __HEREDOC
+        # dealt with below - these require special handling because of the use
+        # of wxDash array, which cannot be freed until the peninfo is disposed of
+        # or until a new dash pattern is specified.
+        spec.ignore(%w[wxGraphicsPenInfo::GetDashes wxGraphicsPenInfo::Dashes], ignore_doc: false)
+        spec.ignore 'wxGraphicsPenInfo::GetDash'
+        spec.add_extend_code 'wxGraphicsPenInfo', <<~__HEREDOC
+          // Returns a ruby array with the dash lengths
+          VALUE get_dashes() 
+          {
+            VALUE rb_dashes = rb_ary_new();
+            wxDash* dashes;
+            int dash_count = $self->GetDashes(&dashes);
+            for ( int i = 0; i < dash_count; i++ )
+            {
+              rb_ary_push(rb_dashes, INT2NUM(dashes[i]));
+            }
+            return rb_dashes;
+          }
+        
+          // Sets the dashes to have the lengths defined in the ruby array of ints
+          void dashes(VALUE rb_dashes) 
+          {
+            // Check right parameter type
+            if ( TYPE(rb_dashes) != T_ARRAY )
+              rb_raise(rb_eTypeError, 
+                       "Wrong argument type for set_dashes, should be Array");
+        
+            // Get old value in case it needs to be deallocated to avoid leaking
+            wxDash* old_dashes;
+            int old_dashes_count = $self->GetDashes(&old_dashes);
+        
+            // Create a C++ wxDash array to hold the new dashes, and populate
+            int new_dash_count = RARRAY_LEN(rb_dashes);
+            wxDash* new_dashes = new wxDash[ new_dash_count ];
+            for ( int i = 0; i < new_dash_count; i++ )
+            {
+              new_dashes[i] = NUM2INT(rb_ary_entry(rb_dashes, i));
+            }
+            $self->Dashes(new_dash_count, new_dashes);
+        
+            // Clean up the old if it existed
+            if ( old_dashes_count )
+              delete old_dashes;
+          }
+          __HEREDOC
         # type mappings
-        # Typemap to fix GraphicsContext#get_text_extent
+        # Typemap to fix GraphicsContext#get_text_extent and get_dpi and get_clip_box
         spec.map_apply 'double *OUTPUT' => [ 'wxDouble* width', 'wxDouble* height',
-                                             'wxDouble* descent', 'wxDouble* externalLeading' ]
+                                             'wxDouble* descent', 'wxDouble* externalLeading',
+                                             'wxDouble *dpiX', 'wxDouble *dpiY',
+                                             'wxDouble *x', 'wxDouble *y', 'wxDouble *w', 'wxDouble *h']
         spec.map 'wxDouble* width, wxDouble* height, wxDouble* descent, wxDouble* externalLeading' do
           map_directorargout code: <<~__CODE
             if ( (TYPE(result) == T_ARRAY) && (RARRAY_LEN(result) >= 2) )
@@ -137,7 +216,37 @@ module WXRuby3
             }
             __CODE
         end
+        # for GetPartialTextExtents
+        spec.map 'wxArrayDouble &widths' => 'Array<Float>' do
+          map_in ignore: true, temp: 'wxArrayDouble tmp', code: '$1 = &tmp;'
+
+          map_argout code: <<~__CODE
+            $result = rb_ary_new();
+            for (size_t i = 0; i < $1->GetCount(); i++)
+            {
+              rb_ary_push($result,DBL2NUM( $1->Item(i) ) );
+            }
+            __CODE
+        end
         # add convenience method providing efficient gc memory management
+        unless Config.platform == :linux
+          spec.add_extend_code 'wxGraphicsContext', <<~__HEREDOC
+            static VALUE draw_on(const wxPrinterDC& dc)
+            {
+              VALUE rc = Qnil;
+              if (rb_block_given_p())
+              {
+                wxGraphicsContext* p_gc = wxGraphicsContext::Create(dc);
+                VALUE rb_gc = SWIG_NewPointerObj(SWIG_as_voidptr(p_gc), SWIGTYPE_p_wxGraphicsContext, 1);
+                rc = rb_yield(rb_gc);
+                SWIG_RubyRemoveTracking((void *)p_gc);
+                DATA_PTR(rb_gc) = NULL;
+                delete p_gc;
+              }
+              return rc;
+            }
+            __HEREDOC
+        end
         spec.add_extend_code 'wxGraphicsContext', <<~__HEREDOC
           static VALUE draw_on(wxWindow* win)
           {
@@ -181,20 +290,6 @@ module WXRuby3
             }
             return rc;
           }
-          static VALUE draw_on(const wxPrinterDC& dc)
-          {
-            VALUE rc = Qnil;
-            if (rb_block_given_p())
-            {
-              wxGraphicsContext* p_gc = wxGraphicsContext::Create(dc);
-              VALUE rb_gc = SWIG_NewPointerObj(SWIG_as_voidptr(p_gc), SWIGTYPE_p_wxGraphicsContext, 1);
-              rc = rb_yield(rb_gc);
-              SWIG_RubyRemoveTracking((void *)p_gc);
-              DATA_PTR(rb_gc) = NULL;
-              delete p_gc;
-            }
-            return rc;
-          }
           static VALUE draw_on(wxImage& img)
           {
             VALUE rc = Qnil;

data/rakelib/lib/director/graphics_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
@@ -18,7 +21,14 @@ module WXRuby3
         spec.ignore 'wxGraphicsMatrix::IsEqual(const wxGraphicsMatrix &)'
         spec.ignore 'wxGraphicsMatrix::GetNativeMatrix'
         spec.ignore 'wxGraphicsBitmap::GetNativeBitmap'
-        spec.ignore 'wxGraphicsPath::GetNativePath', 'wxGraphicsPath::UnGetNativePath'
+        spec.ignore 'wxGraphicsPath::GetNativePath',
+                    'wxGraphicsPath::UnGetNativePath',
+                    'wxGraphicsPath::AddCurveToPoint(const wxPoint2DDouble &, const wxPoint2DDouble &, const wxPoint2DDouble &)',
+                    'wxGraphicsPath::AddLineToPoint(const wxPoint2DDouble &)',
+                    'wxGraphicsPath::Contains(const wxPoint2DDouble &, wxPolygonFillMode) const',
+                    'wxGraphicsPath::GetCurrentPoint',
+                    'wxGraphicsPath::MoveToPoint(const wxPoint2DDouble &)',
+                    'wxGraphicsPath::AddArc(const wxPoint2DDouble &, wxDouble, wxDouble, wxDouble, bool)'
         # Deal with GraphicsMatrix#get method
         spec.map_apply 'double *OUTPUT' => [ 'wxDouble *a', 'wxDouble *b',
                                              'wxDouble *c', 'wxDouble *d',
@@ -40,6 +50,7 @@ module WXRuby3
         end
         spec.ignore 'wxGraphicsPath::GetBox() const',
                     'wxGraphicsPath::GetCurrentPoint() const'
+        spec.map_apply 'double * OUTPUT' => 'wxDouble *'
         if Config.platform == :mingw
           # it seems for WXMSW there is a problem cleaning up GraphicsObjects in GC after
           # the wxApp has ended (probably because some other wxWidgets cleanup already

data/rakelib/lib/director/grid_cell_attr.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
@@ -16,7 +19,24 @@ module WXRuby3
         # exposing the mixin wxClientDataContainer/wxSharedClientDataContainer has no real upside
         # for wxRuby; far easier to just use member variables in derived classes
         spec.override_inheritance_chain('wxGridCellAttr', [])
-        spec.gc_as_untracked_refcounted('wxGridCellAttr')
+        spec.gc_as_untracked('wxGridCellAttr')
+        # use custom free func to be able to account for more complex inheritance
+        spec.add_header_code <<~__HEREDOC
+          static void GC_free_GridCellAttr(void *ptr)
+          {
+            wxGridCellAttr* gc_attr = (wxGridCellAttr*)ptr; 
+            if (ptr)
+              gc_attr->DecRef();
+          }
+          __HEREDOC
+        spec.add_swig_code '%feature("freefunc") wxGridCellAttr "GC_free_GridCellAttr";'
+        # these do not provide usable refcount handling and would be unsafe for GC
+        # are actually more for internal Grid use than anything else anyway
+        spec.ignore 'wxGridCellAttr::wxGridCellAttr(wxGridCellAttr *)',
+                    'wxGridCellAttr::SetDefAttr',
+                    'wxGridCellAttr::MergeWith'
+        # replace with true default ctor
+        spec.extend_interface('wxGridCellAttr', 'wxGridCellAttr()')
         spec.ignore %w[wxGridCellAttr::IncRef wxGridCellAttr::DecRef]
         spec.ignore('wxGridCellAttr::GetEditorPtr',
                     'wxGridCellAttr::GetRendererPtr')
@@ -39,9 +59,13 @@ module WXRuby3
           map_check code: 'wxRuby_RegisterGridCellRenderer($1, argv[$argnum-2]);'
         end
         # argout type mappings
-        spec.map_apply 'int* OUTPUT' => ['int *hAlign', 'int *vAlign', 'int *num_rows', 'int *num_cols']
+        spec.map_apply 'int* OUTPUT' => ['int *num_rows', 'int *num_cols']
+        spec.map 'int *hAlign', 'int *vAlign', as: 'Integer' do
+          map_in ignore: true, temp: 'int tmp', code: 'tmp = wxALIGN_INVALID; $1 = &tmp;'
+          map_argout code: '$result = SWIG_Ruby_AppendOutput($result, INT2NUM(*$1));'
+        end
         # for docs only
-        spec.map ['int *hAlign', 'int *vAlign', 'int *num_rows', 'int *num_cols'] => 'Integer', swig: false do
+        spec.map 'int *num_rows', 'int *num_cols', as: 'Integer', swig: false do
           map_in ignore: true
           map_argout
         end

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
@@ -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 ;
@@ -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'