wxruby3 1.3.1 → 1.5.0

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/macosx.rb

@@ -158,10 +158,37 @@ module WXRuby3
           private
 
           def wx_configure
-            bash("./configure --with-macosx-version-min=#{WXRuby3.config.sysinfo.os.release}.0 " +
-                   "--disable-optimise --disable-sys-libs --without-liblzma --without-regex " +
-                   "--prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info " +
-                   "CFLAGS=\"-Wno-unused-but-set-variable\"")
+            wxw_ver = nil
+            if WXRuby3.config.sysinfo.os.release >= '15'
+              # try to detect wxWidgets version
+              verfile = File.join(ext_path, 'wxWidgets', 'include', 'wx', 'version.h')
+              if File.exist?(verfile)
+                v_major = v_minor = v_release = nil
+                File.foreach(verfile) do |line|
+                  case line
+                  when /\#define\s+wxMAJOR_VERSION\s+(\d+)/
+                    v_major = $1.to_i
+                  when /\#define\s+wxMINOR_VERSION\s+(\d+)/
+                    v_minor = $1.to_i
+                  when /\#define\s+wxRELEASE_NUMBER\s+(\d+)/
+                    v_release = $1.to_i
+                  end
+                end
+                wxw_ver = "#{v_major}.#{v_minor}.#{v_release}"
+              end
+            end
+            if WXRuby3.config.sysinfo.os.release >= '15' && (wxw_ver.nil? || wxw_ver <= '3.2.6')
+              # circumvent compilation problems on MacOS 15 or higher with older wxWidgets releases
+              bash("./configure " +
+                     "--disable-optimise --disable-sys-libs --without-liblzma --without-regex " +
+                     "--prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info " +
+                     "CFLAGS=\"-Wno-unused-but-set-variable\"")
+            else
+              bash("./configure --with-macosx-version-min=#{WXRuby3.config.sysinfo.os.release}.0 " +
+                     "--disable-optimise --disable-sys-libs --without-liblzma --without-regex " +
+                     "--prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info " +
+                     "CFLAGS=\"-Wno-unused-but-set-variable\"")
+            end
           end
 
           def wx_make

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/config/pkgman/linux.rb

@@ -30,6 +30,13 @@ module WXRuby3
             self
           end
 
+          def alias(distro, release, alias_distro, alias_release)
+            if @dependencies.has_key?(distro) && @dependencies[distro].has_key?(release)
+              @dependencies[alias_distro][alias_release] = @dependencies[distro][release]
+            end
+            self
+          end
+
           def get(distro, release: nil)
             @dependencies[distro][release]
           end
@@ -37,7 +44,8 @@ module WXRuby3
 
         PLATFORM_DEPS = {
           debian: PlatformDependencies.new(%w[libgtk-3-dev libwebkit2gtk-4.0-dev libgspell-1-dev libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcurl4-openssl-dev libsecret-1-dev libnotify-dev])
-                                      .add('ubuntu', %w[libgtk-3-dev libwebkit2gtk-4.1-dev libgspell-1-dev libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcurl4-openssl-dev libsecret-1-dev libnotify-dev], release: '24.04'),
+                                      .add('ubuntu', %w[libgtk-3-dev libwebkit2gtk-4.1-dev libgspell-1-dev libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcurl4-openssl-dev libsecret-1-dev libnotify-dev], release: '24.04')
+                                      .alias('ubuntu', '24.04', 'linuxmint', '22'),
           rhel: PlatformDependencies.new(%w[expat-devel findutils gspell-devel gstreamer1-plugins-base-devel gtk3-devel libcurl-devel libjpeg-devel libnotify-devel libpng-devel libSM-devel libsecret-devel libtiff-devel SDL-devel webkit2gtk4.1-devel zlib-devel]),
           suse: PlatformDependencies.new(%w[gtk3-devel webkit2gtk3-devel gspell-devel gstreamer-devel gstreamer-plugins-base-devel libcurl-devel libsecret-devel libnotify-devel libSDL-devel zlib-devel libjpeg-devel libpng-devel]),
           arch: PlatformDependencies.new(%w[pkg-config gtk3 webkit2gtk gspell libunwind gstreamer curl libsecret libnotify libpng12])

data/rakelib/lib/core/package.rb

@@ -526,28 +526,6 @@ module WXRuby3
         end
       end
 
-      def generate_event_types(fout, item, evts_handled)
-        fout.puts "  # from #{item.name}"
-        item.event_types.each do |evt_hnd, evt_type, evt_arity, evt_klass, _|
-          evh_name = evt_hnd.downcase
-          unless evts_handled.include?(evh_name)
-            evt_klass ||= if item.event
-                            item.name
-                          else
-                            raise "Don't know Event class for #{evh_name} event type (from #{item.name})"
-                          end
-            fout.puts '  '+<<~__HEREDOC.split("\n").join("\n  ")
-              self.register_event_type EventType[
-                  '#{evh_name}', #{evt_arity},
-                  #{fullname}::#{evt_type},
-                  #{fullname}::#{evt_klass.sub(/\Awx/i, '')}
-                ] if #{fullname}.const_defined?(:#{evt_type})
-            __HEREDOC
-            evts_handled << evh_name
-          end
-        end
-      end
-
       class << self
         # need to share these over all packages since events may be defined in multiple
         def generated_events
@@ -561,6 +539,46 @@ module WXRuby3
           end
           @event_list_packages
         end
+
+        # some event handler (catch-all) macros need custom coding so we need to skip
+        # them when generating
+        def ignored_event_handlers
+          @ignored_event_handlers ||= Set.new
+        end
+
+        def full_docs?
+          if @full_docs.nil?
+            @full_docs = !!ENV['WXRUBY_FULLDOCS']
+          end
+          @full_docs
+        end
+      end
+
+      def generate_event_types(fout, item, evts_handled)
+        fout.puts "  # from #{item.name}"
+        item.event_types.each do |evt_hnd, evt_type, evt_arity, evt_klass, _|
+          unless Package.ignored_event_handlers.include?(evt_hnd)
+            evh_name = evt_hnd.downcase
+            unless evts_handled.include?(evh_name)
+              evt_klass ||= item.name if item.event
+              # skip if we do not have an actually existing event class
+              if (item.event && item.name == evt_klass) ||
+                    (evt_klass && included_directors.any? { |dir| dir.defmod.find_item(evt_klass) })
+
+                evt_klass ||= item.name
+                fout.puts '  '+<<~__HEREDOC.split("\n").join("\n  ")
+                  self.register_event_type EventType[
+                      '#{evh_name}', #{evt_arity},
+                      #{fullname}::#{evt_type},
+                      #{fullname}::#{evt_klass.sub(/\Awx/i, '')}
+                    ]
+                __HEREDOC
+                evts_handled << evh_name
+
+              end
+            end
+          end
+        end
       end
 
       def generate_event_list
@@ -635,31 +653,36 @@ module WXRuby3
         item.event_types.each do |evt_hnd, evt_type, evt_arity, evt_klass, evt_nodoc|
           evh_name = evt_hnd.downcase
           unless evts_handled.include?(evh_name)
-            evt_klass ||= item.name
-            evh_args, evh_docstr = evt_nodoc ? nil : find_event_doc(evh_name)
-            fdoc.doc.puts evh_docstr if evh_docstr
-            fdoc.doc.puts "Processes a {#{fullname}::#{evt_type}} event." unless /Process.*\s(event|command)/ =~ evh_docstr
-            case evt_arity
-            when 0
-              evh_args = 'meth = nil, &block' unless evh_args
-            when 1
-              evh_args = 'id, meth = nil, &block' unless evh_args
-              argnms = evh_args.split(',')
-              fdoc.doc.puts "@param [Integer,Wx::Enum,Wx::Window,Wx::MenuItem,Wx::ToolBarTool,Wx::Timer] #{argnms.shift.strip} window/control id"
-            when 2
-              evh_args = 'first_id, last_id, meth = nil, &block' unless evh_args
-              argnms = evh_args.split(',')
-              fdoc.doc.puts "@param [Integer,Wx::Enum,Wx::Window,Wx::MenuItem,Wx::ToolBarTool,Wx::Timer] #{argnms.shift.strip} first window/control id of range"
-              fdoc.doc.puts "@param [Integer,Wx::Enum,Wx::Window,Wx::MenuItem,Wx::ToolBarTool,Wx::Timer] #{argnms.shift.strip} last window/control id of range"
-            end
-            fdoc.doc.puts "@param [String,Symbol,Method,Proc] meth (name of) method or handler proc"
-            #fdoc.doc.puts "@param [Proc] block handler block"
-            fdoc.doc.puts "@yieldparam [#{fullname}::#{evt_klass.sub(/\Awx/i, '')}] event the event to handle"
+            evt_klass ||= item.name if item.event
+            # skip if we do not have an actually existing event class (for this platform)
+            if Package.full_docs? || (item.event && item.name == evt_klass) ||
+              (evt_klass && included_directors.any? { |dir| dir.defmod.find_item(evt_klass) })
+
+              evh_args, evh_docstr = evt_nodoc ? nil : find_event_doc(evh_name)
+              fdoc.doc.puts evh_docstr if evh_docstr
+              fdoc.doc.puts "Processes a {#{fullname}::#{evt_type}} event." unless /Process.*\s(event|command)/ =~ evh_docstr
+              case evt_arity
+              when 0
+                evh_args = 'meth = nil, &block' unless evh_args
+              when 1
+                evh_args = 'id, meth = nil, &block' unless evh_args
+                argnms = evh_args.split(',')
+                fdoc.doc.puts "@param [Integer,Wx::Enum,Wx::Window,Wx::MenuItem,Wx::ToolBarTool,Wx::Timer] #{argnms.shift.strip} window/control id"
+              when 2
+                evh_args = 'first_id, last_id, meth = nil, &block' unless evh_args
+                argnms = evh_args.split(',')
+                fdoc.doc.puts "@param [Integer,Wx::Enum,Wx::Window,Wx::MenuItem,Wx::ToolBarTool,Wx::Timer] #{argnms.shift.strip} first window/control id of range"
+                fdoc.doc.puts "@param [Integer,Wx::Enum,Wx::Window,Wx::MenuItem,Wx::ToolBarTool,Wx::Timer] #{argnms.shift.strip} last window/control id of range"
+              end
+              fdoc.doc.puts "@param [String,Symbol,Method,Proc] meth (name of) method or handler proc"
+              #fdoc.doc.puts "@param [Proc] block handler block"
+              fdoc.doc.puts "@yieldparam [#{fullname}::#{evt_klass.sub(/\Awx/i, '')}] event the event to handle"
 
-            fdoc.puts "def #{evh_name}(#{evh_args}) end"
-            fdoc.puts
+              fdoc.puts "def #{evh_name}(#{evh_args}) end"
+              fdoc.puts
 
-            evts_handled << evh_name
+              evts_handled << evh_name
+            end
           end
         end
       end
@@ -788,10 +811,6 @@ module WXRuby3
       end
       private :generate_core_doc
 
-      def self.full_docs?
-        !!ENV['WXRUBY_FULLDOCS']
-      end
-
       def generate_docs
         # make sure all modules have been extracted from xml
         included_directors.each {|dir| dir.extract_interface(false, gendoc: true) }

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

@@ -18,48 +18,53 @@ module WXRuby3
         super
         spec.gc_as_object 'wxAuiManager'
         if Config.instance.wx_version >= '3.3.0'
-          spec.items << 'wxAuiSerializer' << 'wxAuiDockInfo' << 'wxAuiDeserializer'
-          spec.gc_as_untracked 'wxAuiSerializer', 'wxAuiDockInfo'
-          spec.regard 'wxAuiDockInfo::rect',
-                      'wxAuiDockInfo::dock_direction',
-                      'wxAuiDockInfo::dock_layer',
-                      'wxAuiDockInfo::dock_row',
-                      'wxAuiDockInfo::size',
-                      'wxAuiDockInfo::min_size',
-                      'wxAuiDockInfo::resizable',
-                      'wxAuiDockInfo::toolbar',
-                      'wxAuiDockInfo::fixed',
-                      'wxAuiDockInfo::reserved1'
-          spec.make_readonly 'wxAuiDockInfo::rect',
-                             'wxAuiDockInfo::dock_direction',
-                             'wxAuiDockInfo::dock_layer',
-                             'wxAuiDockInfo::dock_row',
-                             'wxAuiDockInfo::size',
-                             'wxAuiDockInfo::min_size',
-                             'wxAuiDockInfo::resizable',
-                             'wxAuiDockInfo::toolbar',
-                             'wxAuiDockInfo::fixed',
-                             'wxAuiDockInfo::reserved1'
-          spec.add_extend_code 'wxAuiDockInfo', <<~__HEREDOC
-            VALUE each_pane()
+          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()
             {
-              wxAuiPaneInfoPtrArray panes = self->panes;
-              VALUE rc = Qnil;
-              for (wxAuiPaneInfo* pane : panes)
+              VALUE rc = rb_ary_new();
+              for (int page : self->pages)
               {
-                VALUE r_pane = SWIG_NewPointerObj(pane, SWIGTYPE_p_wxAuiPaneInfo, 0);
-                rc = rb_yield(r_pane);
-              }	
+                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<wxAuiPaneInfo>' => 'Array<Wx::AuiPaneInfo>' do
+          spec.map 'std::vector<wxAuiPaneLayoutInfo>' => 'Array<Wx::AuiPaneLayoutInfo>' do
             map_out code: <<~__CODE
               $result = rb_ary_new();
-              std::vector<wxAuiPaneInfo>& panes = (std::vector<wxAuiPaneInfo>&)$1;
-              for (const wxAuiPaneInfo& pane : panes)
+              std::vector<wxAuiPaneLayoutInfo>& panes = (std::vector<wxAuiPaneLayoutInfo>&)$1;
+              for (const wxAuiPaneLayoutInfo& pane : panes)
               {
-                VALUE r_pane = SWIG_NewPointerObj(new wxAuiPaneInfo(pane), SWIGTYPE_p_wxAuiPaneInfo, SWIG_POINTER_OWN);
+                VALUE r_pane = SWIG_NewPointerObj(new wxAuiPaneLayoutInfo(pane), SWIGTYPE_p_wxAuiPaneLayoutInfo, SWIG_POINTER_OWN);
                 rb_ary_push($result, r_pane);
               }
               __CODE
@@ -70,24 +75,24 @@ module WXRuby3
                 {
                   void *ptr;
                   VALUE r_pane = rb_ary_entry($input, i);
-                  int res = SWIG_ConvertPtr(r_pane, &ptr, SWIGTYPE_p_wxAuiPaneInfo, 0);
+                  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::AuiPaneInfo"); 
+                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "load_panes", rb_eTypeError, "in return value. Expected Array of Wx::AuiPaneLayoutInfo"); 
                   }
-                  wxAuiPaneInfo *pane = reinterpret_cast< wxAuiPaneInfo * >(ptr);
+                  wxAuiPaneLayoutInfo *pane = reinterpret_cast< wxAuiPaneLayoutInfo * >(ptr);
                   $result.push_back(*pane);
                 }
               }
               __CODE
           end
-          spec.map 'std::vector<wxAuiDockInfo>' => 'Array<Wx::AuiDockInfo>' do
+          spec.map 'std::vector<wxAuiTabLayoutInfo>' => 'Array<Wx::AuiTabLayoutInfo>' do
             map_out code: <<~__CODE
               $result = rb_ary_new();
-              std::vector<wxAuiDockInfo>& docks = (std::vector<wxAuiDockInfo>&)$1;
-              for (const wxAuiDockInfo& dock : docks)
+              std::vector<wxAuiTabLayoutInfo>& tabs = (std::vector<wxAuiTabLayoutInfo>&)$1;
+              for (const wxAuiTabLayoutInfo& tab : tabs)
               {
-                VALUE r_dock = SWIG_NewPointerObj(new wxAuiDockInfo(dock), SWIGTYPE_p_wxAuiDockInfo, SWIG_POINTER_OWN);
-                rb_ary_push($result, r_dock);
+                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
@@ -96,13 +101,13 @@ module WXRuby3
                 for (int i = 0; i < RARRAY_LEN($input); i++)
                 {
                   void *ptr;
-                  VALUE r_dock = rb_ary_entry($input, i);
-                  int res = SWIG_ConvertPtr(r_dock, &ptr, SWIGTYPE_p_wxAuiDockInfo, 0);
+                  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::AuiDockInfo"); 
+                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "load_docks", rb_eTypeError, "in return value. Expected Array of Wx::AuiTabLayoutInfo"); 
                   }
-                  wxAuiDockInfo *dock = reinterpret_cast< wxAuiDockInfo * >(ptr);
-                  $result.push_back(*dock);
+                  wxAuiTabLayoutInfo *tab = reinterpret_cast< wxAuiTabLayoutInfo * >(ptr);
+                  $result.push_back(*tab);
                 }
               }
               __CODE
@@ -215,17 +220,18 @@ module WXRuby3
 
       def gen_class_doc_members(fdoc, clsdef, cls_members, alias_methods)
         super
-        if Config.instance.wx_version >= '3.3.0' && clsdef.name == 'wxAuiDockInfo'
-          fdoc.doc.puts 'Yield each pane to the given block.'
-          fdoc.doc.puts 'If no block passed returns an Enumerator.'
-          fdoc.doc.puts '@yieldparam [Wx::AUI::AuiPaneInfo] pane the Aui pane info yielded'
-          fdoc.doc.puts '@return [::Object, ::Enumerator] result of last block execution or enumerator'
-          fdoc.puts 'def each_pane; end'
+        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 'Returns an array of Wx::AuiPaneInfo for all panes managed by the frame manager.'
-          fdoc.doc.puts '@return [Array<Wx::AUI::AuiPaneInfo>] info for all managed panes'
-          fdoc.puts 'def get_panes; end'
-          fdoc.puts 'alias_method :panes, :get_panes'
+          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
 

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/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);
               }