wxruby3 1.3.0 → 1.4.2

data/lib/wx/rbn/ribbon_control.rb

@@ -6,7 +6,7 @@ class Wx::RBN::RibbonControl
 
   # manage RibbonArtProvider for GC
   wx_set_art_provider = instance_method :set_art_provider
-  define_method :set_art_provider do |prov|
+  wx_redefine_method :set_art_provider do |prov|
     @art_provider = nil # clear any previously set
     wx_set_art_provider.bind(self).call(prov)
     if prov != get_ancestor_ribbon_bar.get_art_provider

data/lib/wx/rbn/ribbon_page.rb

@@ -6,7 +6,7 @@ class Wx::RBN::RibbonPage
 
   # manage RibbonArtProvider for GC
   wx_set_art_provider = instance_method :set_art_provider
-  define_method :set_art_provider do |prov|
+  wx_redefine_method :set_art_provider do |prov|
     @art_provider = nil # clear any previously set
     wx_set_art_provider.bind(self).call(prov)
     if prov != get_ancestor_ribbon_bar.get_art_provider

data/lib/wx/rbn/ribbon_panel.rb

@@ -6,7 +6,7 @@ class Wx::RBN::RibbonPanel
 
   # manage RibbonArtProvider for GC
   wx_set_art_provider = instance_method :set_art_provider
-  define_method :set_art_provider do |prov|
+  wx_redefine_method :set_art_provider do |prov|
     @art_provider = nil # clear any previously set
     wx_set_art_provider.bind(self).call(prov)
     if prov != get_ancestor_ribbon_bar.get_art_provider

data/lib/wx/rtc/require.rb

@@ -14,5 +14,3 @@ require_relative './rich_text_paragraph'
 require_relative './richtext_formatting_dialog'
 require_relative './symbol_picker_dialog'
 require_relative './richtext_style_organiser_dialog'
-
-Wx::Dialog.setup_dialog_functors(Wx::RTC)

data/lib/wx/rtc/rich_text_composite_object.rb

@@ -10,7 +10,7 @@ module Wx
 
       # Overload to provide Enumerator without block
       wx_each_child = instance_method :each_child
-      define_method :each_child do |&block|
+      wx_redefine_method :each_child do |&block|
         if block
           wx_each_child.bind(self).call(&block)
         else

data/lib/wx/rtc/rich_text_ctrl.rb

@@ -10,7 +10,7 @@ module Wx
 
       # Overload to provide Enumerator without block
       wx_each_line = instance_method :each_line
-      define_method :each_line do |&block|
+      wx_redefine_method :each_line do |&block|
         if block
           wx_each_line.bind(self).call(&block)
         else

data/lib/wx/rtc/rich_text_paragraph.rb

@@ -10,7 +10,7 @@ module Wx
 
       # Overload to provide Enumerator without block
       wx_each_line = instance_method :each_line
-      define_method :each_line do |&block|
+      wx_redefine_method :each_line do |&block|
         if block
           wx_each_line.bind(self).call(&block)
         else

data/lib/wx/rtc/richtext_buffer.rb

@@ -6,7 +6,7 @@ class Wx::RTC::RichTextBuffer
 
   class << self
     wx_each_handler = instance_method :each_handler
-    define_method :each_handler do |&block|
+    wx_redefine_method :each_handler do |&block|
       if block_given?
         wx_each_handler.bind(self).call(&block)
       else
@@ -15,7 +15,7 @@ class Wx::RTC::RichTextBuffer
     end
 
     wx_each_field_type = instance_method :each_field_type
-    define_method :each_field_type do |&block|
+    wx_redefine_method :each_field_type do |&block|
       if block_given?
         wx_each_field_type.bind(self).call(&block)
       else
@@ -24,7 +24,7 @@ class Wx::RTC::RichTextBuffer
     end
 
     wx_each_drawing_handler = instance_method :each_drawing_handler
-    define_method :each_drawing_handler do |&block|
+    wx_redefine_method :each_drawing_handler do |&block|
       if block_given?
         wx_each_drawing_handler.bind(self).call(&block)
       else

data/lib/wx/rtc/richtext_formatting_dialog.rb

@@ -8,7 +8,7 @@ module Wx::RTC
     class << self
 
       wx_set_formatting_dialog_factory = instance_method :set_formatting_dialog_factory
-      define_method :set_formatting_dialog_factory do |factory|
+      wx_redefine_method :set_formatting_dialog_factory do |factory|
         wx_set_formatting_dialog_factory.bind(self).call(factory)
         @factory = factory # cache here to prevent GC collection
       end
@@ -23,7 +23,7 @@ module Wx::RTC
     end
 
     # now redefine the overridden ctor to account for deviating arglist
-    def initialize(flags = nil, parent = nil, *mixed_args, &block)
+    wx_redefine_method :initialize do |flags = nil, parent = nil, *mixed_args, &block|
       # allow zero-args ctor for use with XRC
       if flags.nil?
         pre_wx_kwctor_init

data/lib/wx/rtc/richtext_style_organiser_dialog.rb

@@ -12,7 +12,7 @@ class Wx::RTC::RichTextStyleOrganiserDialog
   end
 
   # now redefine the overridden ctor to account for deviating arglist
-  def initialize(flags, sheet, ctrl, parent = nil, *mixed_args, &block)
+  wx_redefine_method :initialize do |flags, sheet, ctrl, parent = nil, *mixed_args, &block|
     real_args = begin
                   [ flags, sheet, ctrl, parent ] + self.class.args_as_list(*mixed_args)
                 rescue => err

data/lib/wx/rtc/symbol_picker_dialog.rb

@@ -13,7 +13,7 @@ class Wx::RTC::SymbolPickerDialog
   end
 
   # now redefine the overridden ctor to account for deviating arglist
-  def initialize(symbol, initialFont, normalTextFont, parent = nil, *mixed_args, &block)
+  wx_redefine_method :initialize do |symbol, initialFont, normalTextFont, parent = nil, *mixed_args, &block|
     real_args = begin
                   [ symbol, initialFont, normalTextFont, parent ] + self.class.args_as_list(*mixed_args)
                 rescue => err

data/lib/wx/stc/require.rb

@@ -7,5 +7,3 @@
 require_relative './events/evt_list'
 require_relative './keyword_defs'
 require_relative './styled_text_ctrl'
-
-Wx::Dialog.setup_dialog_functors(Wx::STC)

data/lib/wx/stc/styled_text_ctrl.rb

@@ -10,7 +10,7 @@ module Wx
 
       # Overload to provide Enumerator without block
       wx_each_line = instance_method :each_line
-      define_method :each_line do |&block|
+      wx_redefine_method :each_line do |&block|
         if block
           wx_each_line.bind(self).call(&block)
         else

data/lib/wx/version.rb

@@ -3,5 +3,5 @@
 # This software is released under the MIT license.
 
 module Wx
-  WXRUBY_VERSION    = '1.3.0'
+  WXRUBY_VERSION    = '1.4.2'
 end

data/lib/wx/wxruby/base.rb

@@ -55,6 +55,10 @@ module WxRuby
         puts
       end
 
+      def show_version
+        system(%Q[#{RUBY} -r wx -e 'puts "wxRuby3 v\#{Wx::WXRUBY_VERSION} (wxWidgets v\#{Wx::WXWIDGETS_VERSION})"' 2> /dev/null])
+      end
+
       def run(cmdid, args)
         commands[cmdid.to_s].call(args)
       end
@@ -65,9 +69,11 @@ module WxRuby
             "    COMMAND\t\t\t\tSpecifies wxruby command to execute."
         opts.separator ''
         opts.on('-v', '--verbose',
-                'Show verbose output') { |v| ::WxRuby::Commands.options[:verbose] = true }
+                'Show verbose output') { |_| ::WxRuby::Commands.options[:verbose] = true }
+        opts.on('-V', '--version',
+                'Show versions.') { |_| show_version } if setup_done?
         opts.on('-h', '--help',
-                 'Show this message.') do |v|
+                 'Show this message.') do |_|
           puts opts
           puts
           describe_all

data/lib/wx/wxruby/cmd/setup.rb

@@ -6,6 +6,7 @@
 #--------------------------------------------------------------------
 
 require 'fileutils'
+require 'json'
 
 module WxRuby
   module Commands
@@ -55,6 +56,16 @@ module WxRuby
         opts.parse!(args) rescue ($stderr.puts $!.message; exit(127))
       end
 
+      class << self
+
+        private
+
+        def check_wx_config
+          !(`which #{@wx_config} 2>/dev/null`).chomp.empty?
+        end
+
+      end
+
       def self.run(argv)
         return description if argv == :describe
 
@@ -74,48 +85,61 @@ module WxRuby
         cfg_cmd = 'rake configure'
         cfg_cmd << "[#{cfg_args.join(',')}]" unless cfg_args.empty?
 
-        result = false
-        FileUtils.chdir(WxRuby::ROOT) do
-          steps = 0
-          actions_txt = if Setup.options['autoinstall'] != false
-                          steps = 1
-                          '(possibly) install required software'
-                        else
-                          ''
-                        end
-          if Setup.options['with-wxwin'] || Setup.options['wxwin'].nil?
-            actions_txt << ', ' if steps>0
-            actions_txt << 'build the wxWidgets libraries (if needed), '
-            actions_txt << "\n" if steps>0
-            steps += 1
+        log_file = File.join(WxRuby::ROOT, 'setup.log')
+        if Setup.options['log']
+          if File.directory?(Setup.options['log']) && File.writable?(Setup.options['log'])
+            log_file = File.join(Setup.options['log'], 'setup.log')
           else
-            actions_txt << ',' if steps>0
+            $stderr.puts "ERROR: cannot write log to #{Setup.options['log']}. Log path must exist and be writable."
+            exit(1)
           end
-          actions_txt << 'build the native wxRuby3 extensions '
-          actions_txt << "\n" if steps==1
-          actions_txt << 'and generate the wxRuby3 reference documentation.'
-          $stdout.puts <<~__INFO_TXT
-
-            ---            
-            Now running wxRuby3 post-install setup.
-            This will #{actions_txt}
-            Please be patient as this may take quite a while depending on your system.
-            ---
-
-            __INFO_TXT
-          log_file = File.join(WxRuby::ROOT, 'setup.log')
-          if Setup.options['log']
-            if File.directory?(Setup.options['log']) && File.writable?(Setup.options['log'])
-              log_file = File.join(Setup.options['log'], 'setup.log')
+        end
+        run_env = {'WXRUBY_RUN_SILENT' => "#{log_file}"}
+        run_env['WXRUBY_VERBOSE'] = '1' if Setup.options[:verbose]
+
+        result = false
+
+        FileUtils.chdir(WxRuby::ROOT) do
+          # first run the configure command
+          result = system(run_env, "#{cfg_cmd}")
+
+          # if succeeded
+          if result
+            # load the wxRuby3 build config
+            build_cfg = ::JSON.load(File.read('.wxconfig'))
+
+            # now determine the steps to execute
+            steps = 0
+            actions_txt = if Setup.options['autoinstall'] != false
+                            steps = 1
+                            '(possibly) install required software'
+                          else
+                            ''
+                          end
+            if build_cfg['with-wxwin'] || (!build_cfg['wxwin'].to_s.empty? && build_cfg['wxwin'].to_s != '@system')
+              actions_txt << ', ' if steps>0
+              actions_txt << 'build the wxWidgets libraries, '
+              actions_txt << "\n" if steps>0
+              steps += 1
             else
-              $stderr.puts "ERROR: cannot write log to #{Setup.options['log']}. Log path must exist and be writable."
-              exit(1)
+              actions_txt << ',' if steps>0
             end
+            actions_txt << 'build the native wxRuby3 extensions '
+            actions_txt << "\n" if steps==1
+            actions_txt << 'and generate the wxRuby3 reference documentation.'
+            $stdout.puts <<~__INFO_TXT
+  
+              ---            
+              Now running wxRuby3 post-install setup.
+              This will #{actions_txt}
+              Please be patient as this may take quite a while depending on your system.
+              (#{steps >= 2 ? '10-15' : '5-10'} min on a modern PC with multicore CPU but longer with older/slower CPUs)
+              ---
+  
+              __INFO_TXT
+            # can't rely on FileUtils#chdir returning the block result (bug in older Rubies) so assign result here
+            result = system(run_env, "rake -m wxruby:gem:setup#{Setup.options['log'] ? '[:keep_log]' : ''} && gem rdoc wxruby3 --overwrite")
           end
-          run_env = {'WXRUBY_RUN_SILENT' => "#{log_file}"}
-          run_env['WXRUBY_VERBOSE'] = '1' if Setup.options[:verbose]
-          # can't rely on FileUtils#chdir returning the block result (bug in older Rubies) so assign result here
-          result = system(run_env, "#{cfg_cmd} && rake -m wxruby:gem:setup#{Setup.options['log'] ? '[:keep_log]' : ''} && gem rdoc wxruby3 --overwrite")
         end
         exit(result ? 0 : 1)
       end

data/rakelib/gem.rb

@@ -214,16 +214,18 @@ module WXRuby3
             end
           elsif uri.scheme == 'http' || uri.scheme == 'https'
             # download the binary release package
-            $stdout.puts "Downloading #{uri.path}..."
+            $stdout.puts "Downloading #{uri}..."
             filename = File.basename(uri.path)
-            if WXRuby3.config.download_file(uri.path, filename)
+            if WXRuby3.config.download_file(uri.to_s, filename)
               sha_file = File.basename(filename, '.*')+DIGEST_EXT
-              uri.path = File.join(File.dirname(uri.path), sha_file)
-              unless WXRuby3.config.download_file(uri.path, sha_file)
+              sha_uri = File.join(File.dirname(uri.to_s), sha_file)
+              unless WXRuby3.config.download_file(sha_uri, sha_file)
                 $stderr.puts "ERROR: Unable to download digest signature for binary release package : #{package}"
                 exit(1)
               end
               exit(1) unless install_bin_pkg(filename)
+              # cleanup, remove downloaded files
+              FileUtils.rm_f([filename, sha_file])
               true
             else
               $stderr.puts "ERROR: Unable to download binary release package (#{package})!"
@@ -241,6 +243,8 @@ module WXRuby3
               exit(1)
             end
             exit(1) unless install_bin_pkg(bin_pkg_name+BINPKG_EXT)
+            # cleanup, remove downloaded files
+            FileUtils.rm_f([bin_pkg_name+BINPKG_EXT, bin_pkg_name+DIGEST_EXT])
             true
           else
             if prebuilt_only

data/rakelib/lib/config/mingw.rb

@@ -98,7 +98,7 @@ module WXRuby3
           private
 
           def wx_configure
-            bash('./configure --prefix=`pwd`/install --disable-tests --without-subdirs --without-regex --with-expat=builtin --with-zlib=builtin --disable-debug_info')
+            bash('./configure --prefix=`pwd`/install --disable-tests --without-subdirs --without-regex --without-libcurl --with-expat=builtin --with-zlib=builtin --disable-debug_info')
           end
 
           def wx_make

data/rakelib/lib/core/include/swigrubyrun.inc

@@ -59,9 +59,9 @@ extern "C" {
 #endif
 
 WXRB_EXPORT_FLAG VALUE
-SWIG_Ruby_AppendOutput(VALUE target, VALUE o)
+SWIG_wxRuby_AppendOutput(VALUE target, VALUE o, int is_void)
 {
-  if (NIL_P(target))
+  if (NIL_P(target) && is_void != 0)
   {
     target = o;
   }

data/rakelib/lib/director/about_dialog_info.rb

@@ -19,6 +19,7 @@ module WXRuby3
           map_check code: ''
         end
         super
+        spec.ignore 'wxGenericAboutBox' # wrapped with wxGenericAboutDialog
       end
     end # class AboutDialogInfo
 

data/rakelib/lib/director/aui_manager.rb

@@ -16,7 +16,103 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_object
+        spec.gc_as_object 'wxAuiManager'
+        if Config.instance.wx_version >= '3.3.0'
+          spec.items  << 'wxAuiSerializer' << 'wxAuiDockLayoutInfo' << 'wxAuiPaneLayoutInfo' << 'wxAuiTabLayoutInfo' << 'wxAuiDeserializer'
+          spec.gc_as_untracked 'wxAuiSerializer', 'wxAuiDeserializer', 'wxAuiDockLayoutInfo', 'wxAuiPaneLayoutInfo', 'wxAuiTabLayoutInfo'
+          spec.regard 'wxAuiDockLayoutInfo::dock_direction',
+                      'wxAuiDockLayoutInfo::dock_layer',
+                      'wxAuiDockLayoutInfo::dock_row',
+                      'wxAuiDockLayoutInfo::dock_pos',
+                      'wxAuiDockLayoutInfo::dock_proportion',
+                      'wxAuiDockLayoutInfo::dock_size',
+                      'wxAuiPaneLayoutInfo::name',
+                      'wxAuiPaneLayoutInfo::floating_pos',
+                      'wxAuiPaneLayoutInfo::floating_size',
+                      'wxAuiPaneLayoutInfo::is_maximized'
+          spec.add_extend_code 'wxAuiTabLayoutInfo', <<~__HEREDOC
+            VALUE get_pages()
+            {
+              VALUE rc = rb_ary_new();
+              for (int page : self->pages)
+              {
+                rb_ary_push(rc, INT2NUM(page));
+              }
+              return rc;
+            }
+
+            void set_pages(VALUE rb_pages)
+            {
+              if (TYPE(rb_pages) == T_ARRAY) 
+              {
+                std::vector<int> pgs;
+                for (int i = 0; i < RARRAY_LEN(rb_pages); i++)
+                {
+                  pgs.push_back(NUM2INT(rb_ary_entry(rb_pages, i)));
+                }
+                self->pages = pgs;
+              }
+              else 
+              {
+                rb_raise(rb_eTypeError, "Expected Array of Integer for 1");
+              }
+            } 
+            __HEREDOC
+          spec.map 'std::vector<wxAuiPaneLayoutInfo>' => 'Array<Wx::AuiPaneLayoutInfo>' do
+            map_out code: <<~__CODE
+              $result = rb_ary_new();
+              std::vector<wxAuiPaneLayoutInfo>& panes = (std::vector<wxAuiPaneLayoutInfo>&)$1;
+              for (const wxAuiPaneLayoutInfo& pane : panes)
+              {
+                VALUE r_pane = SWIG_NewPointerObj(new wxAuiPaneLayoutInfo(pane), SWIGTYPE_p_wxAuiPaneLayoutInfo, SWIG_POINTER_OWN);
+                rb_ary_push($result, r_pane);
+              }
+              __CODE
+            map_directorout code: <<~__CODE
+              if (TYPE($input) == T_ARRAY)
+              {
+                for (int i = 0; i < RARRAY_LEN($input); i++)
+                {
+                  void *ptr;
+                  VALUE r_pane = rb_ary_entry($input, i);
+                  int res = SWIG_ConvertPtr(r_pane, &ptr, SWIGTYPE_p_wxAuiPaneLayoutInfo, 0);
+                  if (!SWIG_IsOK(res) || !ptr) {
+                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "load_panes", rb_eTypeError, "in return value. Expected Array of Wx::AuiPaneLayoutInfo"); 
+                  }
+                  wxAuiPaneLayoutInfo *pane = reinterpret_cast< wxAuiPaneLayoutInfo * >(ptr);
+                  $result.push_back(*pane);
+                }
+              }
+              __CODE
+          end
+          spec.map 'std::vector<wxAuiTabLayoutInfo>' => 'Array<Wx::AuiTabLayoutInfo>' do
+            map_out code: <<~__CODE
+              $result = rb_ary_new();
+              std::vector<wxAuiTabLayoutInfo>& tabs = (std::vector<wxAuiTabLayoutInfo>&)$1;
+              for (const wxAuiTabLayoutInfo& tab : tabs)
+              {
+                VALUE r_tab = SWIG_NewPointerObj(new wxAuiTabLayoutInfo(tab), SWIGTYPE_p_wxAuiTabLayoutInfo, SWIG_POINTER_OWN);
+                rb_ary_push($result, r_tab);
+              }
+              __CODE
+            map_directorout code: <<~__CODE
+              if (TYPE($input) == T_ARRAY)
+              {
+                for (int i = 0; i < RARRAY_LEN($input); i++)
+                {
+                  void *ptr;
+                  VALUE r_tab = rb_ary_entry($input, i);
+                  int res = SWIG_ConvertPtr(r_tab, &ptr, SWIGTYPE_p_wxAuiTabLayoutInfo, 0);
+                  if (!SWIG_IsOK(res) || !ptr) {
+                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "load_docks", rb_eTypeError, "in return value. Expected Array of Wx::AuiTabLayoutInfo"); 
+                  }
+                  wxAuiTabLayoutInfo *tab = reinterpret_cast< wxAuiTabLayoutInfo * >(ptr);
+                  $result.push_back(*tab);
+                }
+              }
+              __CODE
+          end
+        end
         # need a custom implementation to handle (event handler proc) cleanup
         spec.add_header_code <<~__HEREDOC
           #include "wx/aui/aui.h"
@@ -80,7 +176,7 @@ module WXRuby3
               rb_gc_mark( rb_art_prov );
             }
           }
-          __HEREDOC
+        __HEREDOC
         spec.add_swig_code '%markfunc wxAuiManager "GC_mark_wxAuiManager";'
         # provide pure Ruby implementation based on use custom alternative provided below
         spec.ignore('wxAuiManager::GetAllPanes')
@@ -110,12 +206,37 @@ module WXRuby3
             WXRubyAuiManager* aui_mng = dynamic_cast<WXRubyAuiManager*> (self);
             managedWnd->Bind(wxEVT_CLOSE_WINDOW, &WXRubyAuiManager::OnManagedWindowClose, aui_mng);
           }
-          __HEREDOC
+        __HEREDOC
         spec.suppress_warning(473, 'wxAuiManager::CreateFloatingFrame')
         spec.do_not_generate(:variables, :defines, :enums, :functions) # with AuiPaneInfo
       end
+
+      def doc_generator
+        AuiManagerDocGenerator.new(self)
+      end
     end # class AuiManager
 
+    class AuiManagerDocGenerator < DocGenerator
+
+      def gen_class_doc_members(fdoc, clsdef, cls_members, alias_methods)
+        super
+        if Config.instance.wx_version >= '3.3.0' && clsdef.name == 'wxAuiTabLayoutInfo'
+          fdoc.doc.puts 'Returns the indices of the pages in this tab control in their order on screen.'
+          fdoc.doc.puts 'If this array is empty, it means that the tab control contains all notebook pages in natural order.'
+          fdoc.doc.puts '@return [::Array<Integer>] indices of the pages in this tab control'
+          fdoc.puts 'def get_pages; end'
+          fdoc.puts 'alias :pages :get_pages'
+          fdoc.puts
+          fdoc.doc.puts 'Set the indices of the pages in this tab control in their order on screen.'
+          fdoc.doc.puts 'If this array is empty, it means that the tab control contains all notebook pages in natural order.'
+          fdoc.doc.puts '@param [::Array<Integer>] pages indices of the pages in this tab control'
+          fdoc.puts 'def set_pages(pages) end'
+          fdoc.puts 'alias :pages= :set_pages'
+        end
+      end
+
+    end
+
   end # class Director
 
 end # module WXRuby3

data/rakelib/lib/director/aui_notebook.rb

@@ -25,6 +25,13 @@ module WXRuby3
                          wxAuiNotebookPage::bitmap
                          wxAuiNotebookPage::rect
                          wxAuiNotebookPage::active]
+          if Config.instance.wx_version >= '3.3.0'
+            spec.items << 'wxAuiNotebookPosition'
+            spec.regard 'wxAuiNotebookPosition::tabctrl',
+                        'wxAuiNotebookPosition::page'
+            spec.make_readonly 'wxAuiNotebookPosition::tabctrl',
+                               'wxAuiNotebookPosition::page'
+          end
           # reset type mapping done in BookCtrls as the non-const arg is used for query-ing here (FindTab)
           # (wxWidgets should have made this a const arg)
           spec.map_apply 'SWIGTYPE *' => 'wxWindow* page'

data/rakelib/lib/director/colour.rb

@@ -16,7 +16,7 @@ module WXRuby3
         spec.gc_as_untracked('wxColour')
         spec.require_app 'wxColour::wxColour(const wxColour&)'
         spec.ignore(%w[
-          wxColour::GetPixel wxTransparentColour wxColour::operator!=
+          wxColour::GetPixel wxTransparentColour wxColour::operator!= wxColour::operator==
           wxBLACK wxBLUE wxCYAN wxGREEN wxYELLOW wxLIGHT_GREY wxRED wxWHITE
           ])
         spec.map 'unsigned char *' => 'Integer' do

data/rakelib/lib/director/data_format.rb

@@ -15,7 +15,7 @@ module WXRuby3
       def setup
         super
         spec.gc_as_object
-        spec.ignore 'wxDataFormat::operator ==(wxDataFormatId)'
+        spec.ignore 'wxDataFormat::operator=='
         if Config.platform == :mingw
           # The formal signature for these is NativeFormat; this is required on
           # MSVC as otherwise an impermissible implicit cast is tried, and so

data/rakelib/lib/director/dialog.rb

@@ -230,8 +230,10 @@ module WXRuby3
           # regard protected methods
           spec.regard 'wxGenericAboutDialog::DoAddCustomControls',
                       'wxGenericAboutDialog::AddControl',
-                      'wxGenericAboutDialog::AddText',
-                      'wxGenericAboutDialog::GetCustomControlParent'
+                      'wxGenericAboutDialog::AddText'
+          if Config.instance.wx_version >= '3.3.0'
+            spec.regard 'wxGenericAboutDialog::GetCustomControlParent'
+          end
           if Config.instance.features_set?('USE_COLLPANE')
             spec.regard 'wxGenericAboutDialog::AddCollapsiblePane'
           end

data/rakelib/lib/director/event.rb

@@ -47,6 +47,7 @@ module WXRuby3
               if (class_name == "wxEvent" || class_name == "wxCommandEvent")
               {
                 // special clones for Ruby derived events are already managed and tracked
+                // (this also covers Wx::AsyncProcCallEvent)
                 return SWIG_RubyInstanceFor((void *)wx_evt);
               }