wxruby3 0.9.0 → 0.9.2

data/rakelib/lib/director/data_object_simple_base.rb

@@ -105,8 +105,7 @@ module WXRuby3
               }
               else
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError, 
-                                                           "get_data_here should return a string, or nil on failure");
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, "get_data_here should return a string, or nil on failure");
               }
             }
             else

data/rakelib/lib/director/derived_dc.rb

@@ -278,7 +278,7 @@ module WXRuby3
           # like all DC this should best always be a temporary stack object
           # we do not allow creation in Ruby but rather provide class
           # methods for block execution on a temp dc
-          unless Config.platform == :linux
+          if Config.instance.features_set?('USE_PRINTING_ARCHITECTURE', Director.AnyOf(*%w[WXMSW WXOSX USE_GTKPRINT]))
             spec.add_extend_code 'wxGCDC', <<~__HEREDOC
               static VALUE draw_on(const wxPrinterDC& dc)
               {

data/rakelib/lib/director/dialog.rb

@@ -24,6 +24,7 @@ module WXRuby3
         when 'wxDialog'
           spec.items << 'wxDialogLayoutAdapter'
           spec.gc_as_object 'wxDialogLayoutAdapter'
+          spec.suppress_warning(514, 'wxDialogLayoutAdapter')
           spec.disown 'wxDialogLayoutAdapter* adapter'
           spec.new_object 'wxDialog::SetLayoutAdapter'
           spec.ignore('wxDialog::GetContentWindow',
@@ -87,6 +88,11 @@ module WXRuby3
           end
           spec.do_not_generate :functions
         when 'wxPropertySheetDialog'
+          # need to adjust sizer arg name to apply disown specs
+          spec.ignore 'wxPropertySheetDialog::SetInnerSizer(wxSizer *)', ignore_doc: false
+          spec.extend_interface 'wxPropertySheetDialog',
+                                'void SetInnerSizer(wxSizer *sizer_disown)'
+          spec.disown 'wxSizer *sizer_disown'
           spec.ignore 'wxPropertySheetDialog::GetContentWindow'
           # In Ruby a derived class with customized '#initialize' is far easier
           spec.ignore 'wxPropertySheetDialog::CreateBookCtrl'

data/rakelib/lib/director/dialup_event.rb

@@ -0,0 +1,44 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './event'
+
+module WXRuby3
+
+  class Director
+
+    class DialUpEvent < Event
+
+      def setup
+        super
+        spec.disable_proxies
+        # missing from interface docs
+        spec.add_swig_code '%constant int EVT_DIALUP_CONNECTED = wxEVT_DIALUP_CONNECTED;'
+        spec.add_swig_code '%constant int EVT_DIALUP_DISCONNECTED = wxEVT_DIALUP_DISCONNECTED;'
+      end
+
+      def doc_generator
+        DialUpEventDocGenerator.new(self)
+      end
+
+    end # class DialupEvent
+
+  end # class Director
+
+  class DialUpEventDocGenerator < DocGenerator
+
+    protected def gen_constants_doc(fdoc)
+      super
+      xref_table = package.all_modules.reduce(DocGenerator.constants_db) { |db, mod| db[mod] }
+      gen_constant_doc(fdoc, 'EVT_DIALUP_CONNECTED', xref_table['EVT_DIALUP_CONNECTED'], 'connected event')
+      gen_constant_doc(fdoc, 'EVT_DIALUP_DISCONNECTED', xref_table['EVT_DIALUP_DISCONNECTED'], 'disconnected event')
+    end
+
+  end
+
+end # module WXRuby3

data/rakelib/lib/director/dialup_manager.rb

@@ -0,0 +1,45 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 Defs director
+###
+
+module WXRuby3
+
+  class Director
+
+    class DialUpManager < Director
+
+      def setup
+        super
+        spec.gc_as_untracked
+        spec.make_abstract 'wxDialUpManager'
+        spec.disable_proxies
+        spec.ignore 'wxDialUpManager::GetISPNames', ignore_doc: false
+        spec.add_extend_code 'wxDialUpManager', <<~__HEREDOC
+          VALUE get_isp_names() const
+          {
+            VALUE rb_isps = rb_ary_new();
+            wxArrayString isps;
+            size_t n_isps = $self->GetISPNames(isps);
+            for (size_t i=0; i<n_isps ;++i)
+            {
+              rb_ary_push(rb_isps, WXSTR_TO_RSTR(isps.Item(i)));
+            }
+            return rb_isps;
+          }
+          __HEREDOC
+        spec.map 'wxArrayString& names', swig: false do
+          map_in ignore: true, code: ''
+          map_out ignore: 'size_t'
+          map_argout as: 'Array<String>'
+        end
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/director/drag_image.rb

@@ -15,9 +15,8 @@ module WXRuby3
       include Typemap::TreeItemId
 
       def setup
-        unless Config.instance.features_set?('__WXUNIVERSAL__')
-          spec.ignore('wxDragImage::DoDrawImage', 'wxDragImage::GetImageRect', 'wxDragImage::UpdateBackingFromWindow')
-        end
+        # If wxRuby ever supports WXUNIVERSAL this should change to #ignore_unless
+        spec.ignore('wxDragImage::DoDrawImage', 'wxDragImage::GetImageRect', 'wxDragImage::UpdateBackingFromWindow')
         super
       end
     end # class DragImage

data/rakelib/lib/director/event.rb

@@ -195,14 +195,12 @@ module WXRuby3
             }
             __HEREDOC
           spec.ignore 'wxQueueEvent'
-          spec.ignore('wxEVT_HOTKEY') unless Config.instance.features_set?('wxUSE_HOTKEY')
-          spec.ignore('wxEVT_MOUSE_CAPTURE_CHANGED', 'wxEVT_MOUSE_CAPTURE_LOST', 'wxEVT_DISPLAY_CHANGED') unless Config.instance.features_set?('__WXMSW__')
+          spec.ignore_unless('USE_HOTKEY', 'wxEVT_HOTKEY')
+          spec.ignore_unless('WXMSW', 'wxEVT_MOUSE_CAPTURE_CHANGED', 'wxEVT_MOUSE_CAPTURE_LOST', 'wxEVT_DISPLAY_CHANGED')
           # make sure this event constant definition exists
           spec.add_swig_code %Q{%constant wxEventType wxEVT_MENU_HIGHLIGHT_ALL = wxEVT_MENU_HIGHLIGHT;}
           # add event type constant missing from interface defs
           spec.add_swig_code %Q{%constant wxEventType wxEVT_NC_PAINT = wxEVT_NC_PAINT;}
-          # add undocumented global function
-          spec.add_swig_code 'wxWindow* wxFindFocusDescendant(wxWindow* ancestor);'
         end
         super
       end
@@ -237,8 +235,28 @@ module WXRuby3
         end
         defmod
       end
+
+      def doc_generator
+        if spec.module_name == 'wxEvent'
+          EventDocGenerator.new(self)
+        else
+          super
+        end
+      end
+
     end # class Event
 
   end # class Director
 
+  class EventDocGenerator < DocGenerator
+
+    protected def gen_constants_doc(fdoc)
+      super
+      xref_table = package.all_modules.reduce(DocGenerator.constants_db) { |db, mod| db[mod] }
+      gen_constant_doc(fdoc, 'EVT_MENU_HIGHLIGHT_ALL', xref_table['EVT_MENU_HIGHLIGHT'], '')
+      gen_constant_doc(fdoc, 'EVT_NC_PAINT', xref_table['EVT_NC_PAINT'], '')
+    end
+
+  end
+
 end # module WXRuby3

data/rakelib/lib/director/file_ctrl.rb

@@ -0,0 +1,35 @@
+# 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 FileCtrl < Window
+
+      def setup
+        super
+        # for GetFileNames and GetPaths
+        spec.map 'wxArrayString &filenames', 'wxArrayString &paths', as: 'Array<String>' do
+          map_in ignore: true, temp: 'wxArrayString tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__HEREDOC
+            $result = rb_ary_new();
+            for (size_t i=0; i<tmp$argnum.Count() ;++i)
+            {
+              rb_ary_push($result, WXSTR_TO_RSTR(tmp$argnum.Item(i)));
+            }
+            __HEREDOC
+        end
+      end
+    end # class FileCtrl
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/file_ctrl_event.rb

@@ -0,0 +1,26 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './event'
+
+module WXRuby3
+
+  class Director
+
+    class FileCtrlEvent < Event
+
+      def setup
+        super
+        spec.disable_proxies
+        spec.do_not_generate(:variables, :defines, :enums, :functions) # with FileCtrl
+      end
+    end # class FileCtrlEvent
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/frame.rb

@@ -21,9 +21,7 @@ module WXRuby3
         when 'wxFrame'
           spec.ignore %w[
             wxFrame::OnCreateStatusBar wxFrame::OnCreateToolBar]
-          unless Config.instance.features_set?(*%w[__WXMSW__ wxUSE_TASKBARBUTTON])
-            spec.ignore('wxFrame::MSWGetTaskBarButton')
-          end
+          spec.ignore_unless(%w[WXMSW USE_TASKBARBUTTON], 'wxFrame::MSWGetTaskBarButton')
           # this reimplemented window base method need to be properly wrapped but
           # is missing from the XML docs
           spec.extend_interface('wxFrame', 'virtual void OnInternalIdle()')

data/rakelib/lib/director/gdicommon.rb

@@ -22,6 +22,24 @@ module WXRuby3
         spec.ignore %w{
           wxTheColourDatabase
         }
+        if Config.instance.wx_version >= '3.3.0'
+          spec.ignore 'wxColourDatabase::GetAllNames', ignore_doc: false
+          spec.add_extend_code 'wxColourDatabase', <<~__HEREDOC
+            VALUE get_all_names() const
+            {
+              wxVector<wxString> nms = $self->GetAllNames();
+              VALUE rb_nms = rb_ary_new();
+              for (const wxString& nm : nms)
+              {
+                rb_ary_push(rb_nms, WXSTR_TO_RSTR(nm));
+              } 
+              return rb_nms;
+            }
+            __HEREDOC
+          spec.map 'wxVector<wxString>' => 'Array<String>', swig: false do
+            map_out code: ''
+          end
+        end
         spec.ignore [
           'wxClientDisplayRect(int *,int *,int *,int *)',
           'wxDisplaySize(int *,int *)',
@@ -38,7 +56,7 @@ module WXRuby3
             if ( TYPE($input) == T_DATA )
             {
               void* argp$argnum;
-              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 1 );
+              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0);
               $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
             }
             else
@@ -60,16 +78,14 @@ module WXRuby3
           wxPoint::x wxPoint::y
           wxRealPoint::x wxRealPoint::y
           ]
-        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.ignore_unless('WXGTK', 'wxStockCursor.wxCURSOR_DEFAULT')
+        spec.ignore_unless 'WXX11', %w{
+          wxStockCursor.wxCURSOR_CROSS_REVERSE
+          wxStockCursor.wxCURSOR_DOUBLE_ARROW
+          wxStockCursor.wxCURSOR_BASED_ARROW_UP
+          wxStockCursor.wxCURSOR_BASED_ARROW_DOWN
+        }
+        spec.ignore_unless('WXOSX', 'wxStockCursor.wxCURSOR_COPY_ARROW')
         spec.add_extend_code 'wxRect', <<~__HEREDOC
           wxRect add(const wxRect &rect) const {
             return (*(const wxRect*)$self) + rect;

data/rakelib/lib/director/graphics_context.rb

@@ -34,9 +34,7 @@ module WXRuby3
                     '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.ignore_unless(Config::AnyOf.new('WXMSW', 'WXOSX', 'USE_GTKPRINT'), 'wxGraphicsContext::Create(const wxPrinterDC &)')
         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
@@ -229,7 +227,7 @@ module WXRuby3
             __CODE
         end
         # add convenience method providing efficient gc memory management
-        unless Config.platform == :linux
+        if Config.instance.features_set?('USE_PRINTING_ARCHITECTURE', Director.AnyOf(*%w[WXMSW WXOSX USE_GTKPRINT]))
           spec.add_extend_code 'wxGraphicsContext', <<~__HEREDOC
             static VALUE draw_on(const wxPrinterDC& dc)
             {

data/rakelib/lib/director/grid_cell_editor.rb

@@ -182,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)
@@ -197,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
@@ -206,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)
@@ -220,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'");
                 }
               }
@@ -366,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

data/rakelib/lib/director/grid_ctrl.rb

@@ -87,10 +87,13 @@ module WXRuby3
             __CODE
         end
 
-        spec.ignore 'wxGrid::GetSelectedBlocks' # ignore
+        spec.ignore 'wxGrid::GetSelectedBlocks', ignore_doc: false  # ignore
+        spec.map 'wxGridBlocks' => 'Array<Wx::GRID::GridBlockCoords>', swig: false do
+          map_out code: ''
+        end
         # add rubified API (finish in pure Ruby)
         spec.add_extend_code 'wxGrid', <<~__HEREDOC
-          VALUE selected_blocks()
+          VALUE each_selected_block()
           {
             VALUE rc = Qnil;
             if (rb_block_given_p())
@@ -103,6 +106,34 @@ module WXRuby3
             }
             return rc;  
           }
+
+          VALUE each_selected_row_block()
+          {
+            VALUE rc = Qnil;
+            if (rb_block_given_p())
+            {
+              wxGridBlockCoordsVector sel = $self->GetSelectedRowBlocks();
+              for (const wxGridBlockCoords& gbc : sel)
+              {
+                rc = rb_yield (SWIG_NewPointerObj(new wxGridBlockCoords(gbc), SWIGTYPE_p_wxGridBlockCoords, SWIG_POINTER_OWN));
+              }
+            }
+            return rc;  
+          }
+
+          VALUE each_selected_col_block()
+          {
+            VALUE rc = Qnil;
+            if (rb_block_given_p())
+            {
+              wxGridBlockCoordsVector sel = $self->GetSelectedColBlocks();
+              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'
@@ -113,7 +144,7 @@ module WXRuby3
           typedef wxGrid::TabBehaviour TabBehaviour;
           __HEREDOC
 
-        spec.map 'wxGridBlockCoordsVector' => 'Array<Wx::GRID::GridBlockCoords' do
+        spec.map 'wxGridBlockCoordsVector' => 'Array<Wx::GRID::GridBlockCoords>' do
           map_out code: <<~__CODE
             $result = rb_ary_new();
             for (const wxGridBlockCoords& gbc: $1)

data/rakelib/lib/director/help_controller.rb

@@ -16,7 +16,7 @@ module WXRuby3
 
       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

data/rakelib/lib/director/icon.rb

@@ -25,9 +25,12 @@ module WXRuby3
         spec.ignore('wxIcon::wxIcon(const char *const *)', 'wxIcon::wxIcon(const char[],int,int)')
         # xml specs incorrectly list this method for MWS while it does not exist anymore
         spec.ignore('wxIcon::ConvertToDisabled')
-        unless Config.platform == :mingw
+        if Config.platform == :mingw
+          spec.ignore 'wxIconBundle::wxIconBundle(const wxString &, WXHINSTANCE)',
+                      'wxIconBundle::AddIcon(const wxString&,WXHINSTANCE)',
+                      'wxIcon::CreateFromHICON'
+        else
           spec.override_inheritance_chain('wxIcon', %w[wxBitmap wxGDIObject wxObject])
-          spec.ignore 'wxIconBundle::wxIconBundle(const wxString &, WXHINSTANCE)'
         end
         super
       end

data/rakelib/lib/director/list_ctrl.rb

@@ -55,12 +55,11 @@ module WXRuby3
             (void)self->EditLabel(item);
           }
         __HEREDOC
-        unless Config.instance.features_set?('wxHAS_LISTCTRL_COLUMN_ORDER')
-          spec.ignore %w[wxListCtrl::GetColumnIndexFromOrder
-                         wxListCtrl::GetColumnOrder
-                         wxListCtrl::GetColumnsOrder
-                         wxListCtrl::SetColumnsOrder]
-        end
+        spec.ignore_unless 'HAS_LISTCTRL_COLUMN_ORDER',
+                           %w[wxListCtrl::GetColumnIndexFromOrder
+                              wxListCtrl::GetColumnOrder
+                              wxListCtrl::GetColumnsOrder
+                              wxListCtrl::SetColumnsOrder]
         # these are protected so ignored by default but we want them here
         spec.regard %w[
             wxListCtrl::OnGetItemAttr

data/rakelib/lib/director/locale.rb

@@ -28,9 +28,7 @@ module WXRuby3
           wxLanguageInfo::DescriptionNative
           wxLanguageInfo::LayoutDirection
           ]
-        if Config.instance.features_set?('__WXMSW__')
-          spec.regard('wxLanguageInfo::WinLang', 'wxLanguageInfo::WinSublang')
-        end
+        spec.ignore_unless('WXMSW', 'wxLanguageInfo::WinLang', 'wxLanguageInfo::WinSublang')
       end
     end # class Locale
 

data/rakelib/lib/director/log.rb

@@ -14,16 +14,13 @@ module WXRuby3
 
       def setup
         spec.gc_as_object %w[wxLog wxLogChain wxLogInterposer wxLogWindow]
-        spec.items.concat(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogStream wxLogTextCtrl wxLogInterposer wxLogWindow wxLogNull wxLogRecordInfo])
+        spec.items.concat(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogTextCtrl wxLogInterposer wxLogWindow wxLogNull wxLogRecordInfo])
         spec.no_proxy(%w[wxLogBuffer wxLogGui wxLogStderr wxLogTextCtrl wxLogWindow])
         spec.force_proxy(%w[wxLogInterposer])
         spec.ignore 'wxLog::SetFormatter'
         spec.regard %w[wxLog::DoLogRecord wxLog::DoLogTextAtLevel wxLog::DoLogText]
         spec.ignore 'wxLogBuffer::Flush'
         spec.ignore 'wxLogGui::Flush'
-        if Config.instance.features_set?('wxUSE_STD_IOSTREAM')
-          spec.ignore 'wxLogStream'
-        end
         # wxLogStderr
         spec.ignore 'wxLogStderr::wxLogStderr'
         spec.add_extend_code 'wxLogStderr', <<~__HEREDOC

data/rakelib/lib/director/media_ctrl.rb

@@ -16,6 +16,60 @@ module WXRuby3
 
       def setup
         super
+        spec.map 'const wxURI&' => 'URI' do
+          add_header <<~__CODE
+            static VALUE wxRuby_GetRubyURIClass()
+            {
+              static VALUE rb_cURI = Qnil;
+              if (NIL_P(rb_cURI))
+              {
+                rb_require("uri");
+                rb_cURI = rb_const_get(rb_cObject, rb_intern("URI"));
+              }
+              return rb_cURI;
+            }
+            static WxRuby_ID to_s_id("to_s");
+            __CODE
+          map_in temp: 'wxURI tmp', code: <<~__CODE
+            if (rb_obj_is_kind_of($input, wxRuby_GetRubyURIClass()))
+            {
+              VALUE s = rb_funcall($input, to_s_id(), 0);
+              tmp = wxURI(RSTR_TO_WXSTR(s));
+              $1 = &tmp;
+            }
+            else
+            {
+              rb_raise(rb_eArgError, "expected URI for %d", $argnum-1);
+            }                        
+            __CODE
+          map_typecheck precedence: 'POINTER', code: '$1 = rb_obj_is_kind_of($input, wxRuby_GetRubyURIClass());'
+        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.do_not_generate :variables, :enums, :defines, :functions
       end
     end # class MediaCtrl

data/rakelib/lib/director/menu.rb

@@ -85,6 +85,8 @@ module WXRuby3
         spec.add_swig_code <<~__HEREDOC
           %markfunc wxMenu "mark_wxMenu";
         __HEREDOC
+        # ignore MSW specific method
+        spec.ignore 'wxMenu::MSWCommand'
         # fix SWIG's problems with const& return value
         spec.ignore('wxMenu::GetTitle', ignore_doc: false) # keep doc
         spec.add_extend_code 'wxMenu', <<~__HEREDOC
@@ -92,7 +94,20 @@ module WXRuby3
             wxString const& title = $self->GetTitle();
             return &const_cast<wxString&> (title);
           }
-        __HEREDOC
+
+          VALUE each_item()
+          {
+            VALUE rc = Qnil;
+            for (size_t i=0; i<$self->GetMenuItemCount(); ++i)
+            {
+              wxMenuItem *wx_menu_item = $self->FindItemByPosition(i);
+              VALUE rb_menu_item = SWIG_NewPointerObj(SWIG_as_voidptr(wx_menu_item), 
+                                                      SWIGTYPE_p_wxMenuItem, 0);
+              rc = rb_yield(rb_menu_item);
+            }
+            return rc;
+          }
+          __HEREDOC
         super
       end
     end # class Menu

data/rakelib/lib/director/menu_item.rb

@@ -21,11 +21,11 @@ module WXRuby3
         spec.ignore(%w[wxMenuItem::GetLabel wxMenuItem::GetName wxMenuItem::GetText wxMenuItem::SetText wxMenuItem::GetLabelFromText])
         # ignore this as there is no implementation anymore
         spec.ignore 'wxMenuItem::GetAccelFromString'
-        spec.ignore('wxMenuItem::GetAccel') unless Config.instance.features_set?('wxUSE_ACCEL')
+        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.3.0'
-          spec.ignore('wxMenuItem::SetBackgroundColour','wxMenuItem::SetFont','wxMenuItem::SetTextColour') unless Config.instance.features_set?('__WXMSW__')
+          spec.ignore_unless('WXMSW', 'wxMenuItem::SetBackgroundColour','wxMenuItem::SetFont','wxMenuItem::SetTextColour')
         end
         super
       end

data/rakelib/lib/director/pgarray_editor_dialog.rb

@@ -53,12 +53,6 @@ module WXRuby3
         spec.suppress_warning(473, 'wxPGArrayEditorDialog::GetTextCtrlValidator')
         # make sure SWIG knows this type is an enum
         spec.add_swig_code 'enum wxPGPropertyFlags;'
-        if Config.instance.wx_version >= '3.3.0'
-          # internal use only
-          spec.ignore 'wxPG_PROP_PASSWORD',
-                      'wxPG_PROP_USE_CHECKBOX',
-                      'wxPG_PROP_USE_DCC'
-        end
       end
     end # class PGArrayEditorDialog