wxruby3 0.9.7 → 1.0.0

data/rakelib/lib/director/dc.rb

@@ -36,13 +36,8 @@ module WXRuby3
           'wxDC::GetLogicalOrigin(wxCoord *,wxCoord *) const',
           'wxDC::GetHandle'
         ]
-        # ignore Matrix Transformation methods until someone asks for them
-        # TODO : possibly wrap at a later time
-        spec.ignore 'wxDC::SetTransformMatrix',
-                    'wxDC::GetTransformMatrix',
-                    'wxDC::ResetTransformMatrix',
-                    'wxDC::CanUseTransformMatrix'
         spec.disable_proxies
+        spec.disown 'wxGraphicsContext *ctx'
         spec.rename_for_ruby({
           'GetDimensions' => 'wxDC::GetSize(wxCoord *, wxCoord *) const',
           'GetDimensionsMM' => 'wxDC::GetSizeMM(wxCoord *, wxCoord *) const',

data/rakelib/lib/director/derived_dc.rb

@@ -16,7 +16,8 @@ module WXRuby3
         super
         spec.disable_proxies
         spec.gc_as_untracked spec.module_name
-        if spec.module_name == 'wxScreenDC'
+        case spec.module_name
+        when 'wxScreenDC'
           spec.make_abstract 'wxScreenDC'
           # as a ScreenDC should always be a temporary stack object
           # we do not allow creation in Ruby but rather provide a class
@@ -41,7 +42,7 @@ module WXRuby3
           spec.ignore 'wxScreenDC::StartDrawingOnTop',
                       'wxScreenDC::EndDrawingOnTop',
                       'wxScreenDC::wxScreenDC'
-        elsif spec.module_name == 'wxClientDC'
+        when 'wxClientDC'
           spec.make_abstract 'wxClientDC'
           spec.ignore 'wxClientDC::wxClientDC'
           # as a ClientDC should best always be a temporary stack object
@@ -63,19 +64,38 @@ module WXRuby3
               return rc;
             }
           __HEREDOC
-        elsif spec.module_name == 'wxPaintDC'
+        when 'wxPaintDC'
           spec.make_abstract 'wxPaintDC'
           spec.ignore 'wxPaintDC::wxPaintDC'
-        elsif spec.module_name == 'wxMemoryDC'
-          spec.items << 'wxBufferedDC' << 'wxBufferedPaintDC' << 'wxAutoBufferedPaintDC'
+          spec.add_header_code <<~__HEREDOC
+            // we need this static method here because we do not want SWIG to parse the preprocessor 
+            // statements (#if/#else/#endif) which it does in %extend blocks
+            #include "wx/dcbuffer.h"
+            static VALUE do_check_native_double_buffer()
+            {
+            #if wxALWAYS_NATIVE_DOUBLE_BUFFER
+              return Qtrue;
+            #else
+              return Qfalse;
+            #endif
+            }
+            __HEREDOC
+          spec.add_extend_code 'wxPaintDC', <<~__HEREDOC
+            #include "wx/dcbuffer.h"
+            static VALUE has_native_double_buffer()
+            {
+              return do_check_native_double_buffer();
+            }  
+            __HEREDOC
+        when 'wxMemoryDC'
+          spec.items << 'wxBufferedDC' << 'wxBufferedPaintDC'
+          spec.gc_as_untracked %w[wxBufferedDC wxBufferedPaintDC]
           spec.make_abstract 'wxMemoryDC'
           spec.make_abstract 'wxBufferedDC'
           spec.make_abstract 'wxBufferedPaintDC'
-          spec.make_abstract 'wxAutoBufferedPaintDC'
           spec.ignore 'wxMemoryDC::wxMemoryDC',
                       'wxBufferedDC::wxBufferedDC',
-                      'wxBufferedPaintDC::wxBufferedPaintDC',
-                      'wxAutoBufferedPaintDC::wxAutoBufferedPaintDC'
+                      'wxBufferedPaintDC::wxBufferedPaintDC'
           # like all DC's these should best always be a temporary stack objects
           # we do not allow creation in Ruby but rather provide a class
           # method for block execution on a temp dc
@@ -197,23 +217,7 @@ module WXRuby3
               return rc;
             }
           __HEREDOC
-          spec.add_extend_code 'wxAutoBufferedPaintDC', <<~__HEREDOC
-            static VALUE draw_on(wxWindow* tgt)
-            {
-              if (!wxRuby_IsAppRunning()) 
-                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
-              VALUE rc = Qnil;
-              if (rb_block_given_p ())
-              {
-                wxAutoBufferedPaintDC dc(tgt);
-                wxAutoBufferedPaintDC* dc_ptr = &dc;
-                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxAutoBufferedPaintDC, 0);
-                rc = rb_yield(rb_dc);
-              }
-              return rc;
-            }
-          __HEREDOC
-        elsif spec.module_name == 'wxMirrorDC'
+        when 'wxMirrorDC'
           spec.make_abstract 'wxMirrorDC'
           spec.ignore 'wxMirrorDC::wxMirrorDC'
           # as a MirrorDC should best always be a temporary stack object
@@ -235,7 +239,7 @@ module WXRuby3
               return rc;
             }
           __HEREDOC
-        elsif spec.module_name == 'wxSVGFileDC'
+        when 'wxSVGFileDC'
           spec.items.concat %w[wxSVGBitmapHandler wxSVGBitmapFileHandler wxSVGBitmapEmbedHandler]
           spec.make_abstract 'wxSVGFileDC'
           spec.ignore 'wxSVGFileDC::wxSVGFileDC'
@@ -272,7 +276,7 @@ module WXRuby3
                       'wxSVGFileDC::EndDoc',
                       'wxSVGFileDC::StartPage',
                       'wxSVGFileDC::EndPage'
-        elsif spec.module_name == 'wxGCDC'
+        when 'wxGCDC'
           spec.make_abstract 'wxGCDC'
           spec.ignore 'wxGCDC::wxGCDC'
           # like all DC this should best always be a temporary stack object
@@ -301,6 +305,24 @@ module WXRuby3
               __HEREDOC
           end
           spec.add_extend_code 'wxGCDC', <<~__HEREDOC
+            static VALUE draw_on()
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                // Somehow there seems to be a problem with the Ruby GCDC value 
+                // being GC-ed unless we block GC for the duration of the block
+                // execution. Unclear why. We have similar code for other objects
+                // where this issue does not come up.
+                wxGCDC gc_dc;
+                wxGCDC* dc_ptr = &gc_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxGCDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
             static VALUE draw_on(const wxWindowDC& dc)
             {
               if (!wxRuby_IsAppRunning()) 
@@ -355,9 +377,10 @@ module WXRuby3
               }
               return rc;
             }
-          __HEREDOC
+            __HEREDOC
+          spec.disown 'wxGraphicsContext *gc'
           spec.ignore 'wxGCDC::wxGCDC(const wxEnhMetaFileDC &)'
-        elsif spec.module_name == 'wxScaledDC'
+        when 'wxScaledDC'
           spec.items.clear # wxRuby extension; no XML docs
           spec.override_inheritance_chain('wxScaledDC', %w[wxDC wxObject])
           # as there are no dependencies parsed from XML make sure we're initialized after Wx::DC
@@ -398,7 +421,7 @@ module WXRuby3
               wxScaledDC(wxDC& target, double scale);
             };
             __HEREDOC
-        elsif spec.module_name == 'wxPrinterDC'
+        when 'wxPrinterDC'
           spec.make_abstract 'wxPrinterDC'
           spec.ignore 'wxPrinterDC::wxPrinterDC'
           # as a PrinterDC should best always be a temporary stack object
@@ -420,7 +443,7 @@ module WXRuby3
               return rc;
             }
           __HEREDOC
-        elsif spec.module_name == 'wxPostScriptDC'
+        when 'wxPostScriptDC'
           spec.make_abstract 'wxPostScriptDC'
           spec.ignore 'wxPostScriptDC::wxPostScriptDC'
           # as a PostScriptDC should best always be a temporary stack object
@@ -442,6 +465,40 @@ module WXRuby3
               return rc;
             }
           __HEREDOC
+        when 'wxDCOverlay'
+          spec.items << 'wxOverlay'
+          spec.make_abstract 'wxDCOverlay'
+          spec.ignore 'wxDCOverlay::wxDCOverlay'
+          spec.add_extend_code 'wxDCOverlay', <<~__HEREDOC
+            static VALUE draw_on(wxOverlay &overlay, wxDC *dc)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxDCOverlay ovl_dc(overlay, dc);
+                wxDCOverlay* ovl_dc_ptr = &ovl_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxDCOverlay, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            static VALUE draw_on(wxOverlay &overlay, wxDC *dc, int x, int y, int width, int height)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxDCOverlay ovl_dc(overlay, dc, x, y, width, height);
+                wxDCOverlay* ovl_dc_ptr = &ovl_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxDCOverlay, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            __HEREDOC
         else
           # ctors of all other derived DC require a running App
           spec.require_app spec.module_name

data/rakelib/lib/director/geometry.rb

@@ -0,0 +1,142 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+module WXRuby3
+
+  class Director
+
+    class Geometry < Director
+
+      def setup
+        spec.items.replace %w{wxPoint2DInt wxPoint2DDouble}
+
+        spec.ignore 'wxPoint2DInt::m_x', 'wxPoint2DInt::m_y',
+                    'wxPoint2DDouble::m_x', 'wxPoint2DDouble::m_y'
+
+        spec.add_extend_code 'wxPoint2DInt', <<~__HEREDOC
+          wxInt32 get_x()
+          {
+            return $self->m_x;
+          }
+          wxInt32 set_x(wxInt32 v)
+          {
+            return ($self->m_x = v);
+          }
+          wxInt32 get_y()
+          {
+            return $self->m_y;
+          }
+          wxInt32 set_y(wxInt32 v)
+          {
+            return ($self->m_y = v);
+          }
+          void assign(const wxPoint2DInt& pt)
+          {
+            (*$self) = pt;
+          }
+          void add(const wxPoint2DInt& pt)
+          {
+            (*$self) += pt;
+          }
+          void sub(const wxPoint2DInt& pt)
+          {
+            (*$self) -= pt;
+          }
+          void mul(const wxPoint2DInt& pt)
+          {
+            (*$self) *= pt;
+          }
+          void mul(wxDouble v)
+          {
+            $self->m_x *= v; $self->m_y *= v;
+          }
+          void mul(wxInt32 v)
+          {
+            $self->m_x *= v; $self->m_y *= v;
+          }
+          void div(const wxPoint2DInt& pt)
+          {
+            (*$self) /= pt;
+          }
+          void div(wxDouble v)
+          {
+            $self->m_x /= v; $self->m_y /= v;
+          }
+          void div(wxInt32 v)
+          {
+            $self->m_x /= v; $self->m_y /= v;
+          }
+          __HEREDOC
+
+        spec.add_extend_code 'wxPoint2DDouble', <<~__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);
+          }
+          void assign(const wxPoint2DDouble& pt)
+          {
+            (*$self) = pt;
+          }
+          void add(const wxPoint2DDouble& pt)
+          {
+            (*$self) += pt;
+          }
+          void sub(const wxPoint2DDouble& pt)
+          {
+            (*$self) -= pt;
+          }
+          void mul(const wxPoint2DDouble& pt)
+          {
+            (*$self) *= pt;
+          }
+          void mul(wxDouble v)
+          {
+            $self->m_x *= v; $self->m_y *= v;
+          }
+          void mul(wxInt32 v)
+          {
+            $self->m_x *= v; $self->m_y *= v;
+          }
+          void div(const wxPoint2DDouble& pt)
+          {
+            (*$self) /= pt;
+          }
+          void div(wxDouble v)
+          {
+            $self->m_x /= v; $self->m_y /= v;
+          }
+          void div(wxInt32 v)
+          {
+            $self->m_x /= v; $self->m_y /= v;
+          }
+          __HEREDOC
+
+        spec.map_apply 'int * OUTPUT' => 'wxInt32 *'
+
+        # ignore all friend operators
+        spec.do_not_generate :functions
+
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/director/graphics_context.rb

@@ -29,12 +29,13 @@ module WXRuby3
                     'wxGraphicsContext::CreateFromNativeHDC',
                     'wxGraphicsContext::CreateFromUnknownDC',
                     'wxGraphicsContext::GetNativeContext',
-                    'wxGraphicsContext::Create',
+                    'wxGraphicsContext::Create(const wxEnhMetaFileDC &)',
                     '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 *)'
         spec.ignore_unless(Config::AnyOf.new('WXMSW', 'WXOSX', 'USE_GTKPRINT'), 'wxGraphicsContext::Create(const wxPrinterDC &)')
+        spec.new_object 'wxGraphicsContext::Create'
         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
@@ -55,7 +56,7 @@ module WXRuby3
         # 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(%w[wxGraphicsPenInfo::GetDashes wxGraphicsPenInfo::Dashes])
         spec.ignore 'wxGraphicsPenInfo::GetDash'
         spec.add_extend_code 'wxGraphicsPenInfo', <<~__HEREDOC
           // Returns a ruby array with the dash lengths

data/rakelib/lib/director/graphics_object.rb

@@ -14,43 +14,36 @@ module WXRuby3
 
       def setup
         super
-        spec.items.concat %w[wxGraphicsPen wxGraphicsBrush wxGraphicsPath wxGraphicsFont wxGraphicsMatrix wxGraphicsBitmap]
+        spec.items.concat %w[wxGraphicsPen wxGraphicsBrush wxGraphicsPath wxGraphicsFont wxGraphicsMatrix wxGraphicsBitmap wxGraphicsRenderer]
         spec.disable_proxies
-        spec.ignore 'wxGraphicsObject::GetRenderer'
         spec.ignore 'wxGraphicsMatrix::Concat(const wxGraphicsMatrix &)'
         spec.ignore 'wxGraphicsMatrix::IsEqual(const wxGraphicsMatrix &)'
         spec.ignore 'wxGraphicsMatrix::GetNativeMatrix'
         spec.ignore 'wxGraphicsBitmap::GetNativeBitmap'
         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)'
+                    'wxGraphicsPath::UnGetNativePath'
+        spec.ignore 'wxGraphicsRenderer::CreateContextFromNativeHDC',
+                    'wxGraphicsRenderer::CreateBitmapFromNativeBitmap',
+                    'wxGraphicsRenderer::CreateContextFromNativeContext',
+                    'wxGraphicsRenderer::CreateContextFromNativeWindow',
+                    'wxGraphicsRenderer::CreateContext(const wxEnhMetaFileDC&)'
+        unless Config.instance.features_set?('USE_CAIRO')
+          spec.ignore 'wxGraphicsRenderer::GetCairoRenderer'
+        end
+        unless Config.instance.features_set?('WXMSW')
+          spec.ignore 'wxGraphicsRenderer::GetGDIPlusRenderer',
+                      'wxGraphicsRenderer::GetDirect2DRenderer'
+        end
+        spec.new_object 'wxGraphicsRenderer::CreateContext'
         # Deal with GraphicsMatrix#get method
         spec.map_apply 'double *OUTPUT' => [ 'wxDouble *a', 'wxDouble *b',
                                              'wxDouble *c', 'wxDouble *d',
                                              'wxDouble *tx' , 'wxDouble *ty' ]
-        # type mapping for GraphicsPath wxPoint2DDouble args
-        spec.map 'const wxPoint2DDouble&' => 'Array<Float,Float>' do
-          map_in temp: 'wxPoint2DDouble tmp_pt', code: <<~__CODE
-            if (TYPE($input) == T_ARRAY && RARRAY_LEN($input) == 2)
-            {
-              tmp_pt = wxPoint2DDouble(NUM2DBL(rb_ary_entry($input, 0)),
-                                       NUM2DBL(rb_ary_entry($input, 1)));
-              $1 = &tmp_pt;
-            }
-            else
-            {
-              rb_raise(rb_eTypeError, "Wrong type for %i", $argnum-1);
-            }
-            __CODE
-        end
         spec.ignore 'wxGraphicsPath::GetBox() const',
-                    'wxGraphicsPath::GetCurrentPoint() 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
           # 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_ctrl.rb

@@ -237,9 +237,9 @@ module WXRuby3
           static const rb_data_type_t __wxGridWindow_type = {
             "GridWindow",
           #if RUBY_API_VERSION_MAJOR >= 3
-            { NULL, NULL, __wxGridWindow_size, 0, 0},
+            { NULL, NULL, __wxGridWindow_size, 0, {}},
           #else
-            { NULL, NULL, __wxGridWindow_size, 0},
+            { NULL, NULL, __wxGridWindow_size, {}},
           #endif 
             NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
           };

data/rakelib/lib/director/image.rb

@@ -212,6 +212,65 @@ module WXRuby3
             return rb_img_hist;
           }
           __HEREDOC
+        # make sure to wrap the public attributes
+        spec.regard 'wxImage::HSVValue::hue',
+                    'wxImage::HSVValue::saturation',
+                    'wxImage::HSVValue::value',
+                    'wxImage::RGBValue::red',
+                    'wxImage::RGBValue::green',
+                    'wxImage::RGBValue::blue'
+        # ignore these and add customs
+        spec.ignore 'wxImage::HSVtoRGB',
+                    'wxImage::RGBtoHSV'
+        spec.add_extend_code 'wxImage', <<~__HEREDOC
+          static wxImage::RGBValue hsv_to_rgb(VALUE arg)
+          {
+            std::unique_ptr<wxImage::HSVValue> tmp;
+            wxImage::HSVValue* p_hsv;
+            if ( TYPE(arg) == T_DATA )
+            {
+              void* argp;
+              SWIG_ConvertPtr(arg, &argp, SWIGTYPE_p_wxImage__HSVValue, 0);
+              p_hsv = reinterpret_cast< wxImage::HSVValue * >(argp);
+            }
+            else if ( TYPE(arg) == T_ARRAY && RARRAY_LEN(arg) == 3 )
+            {
+              p_hsv = new wxImage::HSVValue( NUM2DBL( rb_ary_entry(arg, 0) ),
+                                             NUM2DBL( rb_ary_entry(arg, 1) ),
+                                             NUM2DBL( rb_ary_entry(arg, 2) ) );
+              tmp.reset(p_hsv); // auto destruct when method scope ends 
+            }
+            else
+            {
+              rb_raise(rb_eArgError, "Expected either Array(Float,Float,Float) or Wx::Image::HSVValue for #0");
+            }
+            return wxImage::HSVtoRGB(*p_hsv);
+          }
+
+          static wxImage::HSVValue rgb_to_hsv(VALUE arg)
+          {
+            std::unique_ptr<wxImage::RGBValue> tmp;
+            wxImage::RGBValue* p_rgb;
+            if ( TYPE(arg) == T_DATA )
+            {
+              void* argp;
+              SWIG_ConvertPtr(arg, &argp, SWIGTYPE_p_wxImage__RGBValue, 0);
+              p_rgb = reinterpret_cast< wxImage::RGBValue * >(argp);
+            }
+            else if ( TYPE(arg) == T_ARRAY && RARRAY_LEN(arg) == 3 )
+            {
+              p_rgb = new wxImage::RGBValue( NUM2DBL( rb_ary_entry(arg, 0) ),
+                                             NUM2DBL( rb_ary_entry(arg, 1) ),
+                                             NUM2DBL( rb_ary_entry(arg, 2) ) );
+              tmp.reset(p_rgb); // auto destruct when method scope ends 
+            }
+            else
+            {
+              rb_raise(rb_eArgError, "Expected either Array(Float,Float,Float) or Wx::Image::RGBValue for #0");
+            }
+            return wxImage::RGBtoHSV(*p_rgb);
+          }
+          __HEREDOC
         spec.do_not_generate(:functions)
       end
     end # class Image

data/rakelib/lib/director/menu.rb

@@ -90,9 +90,8 @@ module WXRuby3
         # fix SWIG's problems with const& return value
         spec.ignore('wxMenu::GetTitle', ignore_doc: false) # keep doc
         spec.add_extend_code 'wxMenu', <<~__HEREDOC
-          wxString* GetTitle() const {
-            wxString const& title = $self->GetTitle();
-            return &const_cast<wxString&> (title);
+          wxString GetTitle() const {
+            return $self->GetTitle();
           }
 
           VALUE each_item()

data/rakelib/lib/director/menu_bar.rb

@@ -23,9 +23,6 @@ module WXRuby3
                 'wxMenuBar::GetLabelTop',
                 'wxMenuBar::SetLabelTop',
                 'wxMenuBar::Refresh')
-        unless Config.instance.wx_version >= '3.3' || Config.instance.wx_abi_version > '3.0.0'
-          spec.ignore 'wxMenuBar::OSXGetAppleMenu'
-        end
         # for FindItem
         spec.map 'wxMenu **' => 'Wx::Menu' do
           map_in ignore: true, temp: 'wxMenu *tmp', code: '$1 = &tmp;'

data/rakelib/lib/director/pen.rb

@@ -79,7 +79,7 @@ module WXRuby3
         # dealt with below - these require special handling because of the use
         # of wxDash array, which cannot be freed until the pen(info) is disposed of
         # or until a new dash pattern is specified.
-        spec.ignore(%w[wxPen::GetDashes wxPen::SetDashes wxPenInfo::GetDashes wxPenInfo::Dashes], ignore_doc: false)
+        spec.ignore(%w[wxPen::GetDashes wxPen::SetDashes wxPenInfo::GetDashes wxPenInfo::Dashes])
         spec.ignore 'wxPenInfo::GetDash'
         spec.add_extend_code 'wxPen', <<~__HEREDOC
           // Returns a ruby array with the dash lengths

data/rakelib/lib/director/richtext_composite_object.rb

@@ -93,9 +93,9 @@ module WXRuby3
             static const rb_data_type_t __wxRichTextFloatCollector_type = {
               "RichTextFloatCollector",
             #if RUBY_API_VERSION_MAJOR >= 3
-              { NULL, NULL, __wxRichTextFloatCollector_size, 0, 0},
+              { NULL, NULL, __wxRichTextFloatCollector_size, 0, {}},
             #else
-              { NULL, NULL, __wxRichTextFloatCollector_size, 0},
+              { NULL, NULL, __wxRichTextFloatCollector_size, {}},
             #endif 
               NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
             };
@@ -177,12 +177,10 @@ module WXRuby3
             {
               VALUE rc = Qnil;
               const wxRichTextLineVector &lines = $self->GetLines();
-              int lnr = 0;
               for (const wxRichTextLine* line : lines)
               {
                 VALUE rb_ln = SWIG_NewPointerObj(SWIG_as_voidptr(const_cast<wxRichTextLine*> (line)), SWIGTYPE_p_wxRichTextLine, 0);
                 rc = rb_yield(rb_ln);
-                ++lnr;
               }
               return rc;
             }

data/rakelib/lib/director/richtext_ctrl.rb

@@ -146,7 +146,7 @@ module WXRuby3
             {
               if (TYPE(result) == T_FIXNUM)
               {
-                *newPos = NUM2LONG(result);
+                if (newPos) *newPos = NUM2LONG(result);
                 c_result = true;
               }
               else