wxruby3 1.6.0 → 1.7.0

data/lib/wx/stc/events/evt_list.rb

@@ -0,0 +1,178 @@
+#-------------------------------------------------------------------------
+# This file is automatically generated by the WXRuby3 interface generator.
+# Do not alter this file.
+#-------------------------------------------------------------------------
+
+class Wx::EvtHandler
+  # from wxStyledTextEvent
+  self.register_event_type EventType[
+      'evt_stc_autocomp_cancelled', 1,
+      Wx::STC::EVT_STC_AUTOCOMP_CANCELLED,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_autocomp_char_deleted', 1,
+      Wx::STC::EVT_STC_AUTOCOMP_CHAR_DELETED,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_autocomp_completed', 1,
+      Wx::STC::EVT_STC_AUTOCOMP_COMPLETED,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_autocomp_selection', 1,
+      Wx::STC::EVT_STC_AUTOCOMP_SELECTION,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_autocomp_selection_change', 1,
+      Wx::STC::EVT_STC_AUTOCOMP_SELECTION_CHANGE,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_calltip_click', 1,
+      Wx::STC::EVT_STC_CALLTIP_CLICK,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_change', 1,
+      Wx::STC::EVT_STC_CHANGE,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_charadded', 1,
+      Wx::STC::EVT_STC_CHARADDED,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_clipboard_copy', 1,
+      Wx::STC::EVT_STC_CLIPBOARD_COPY,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_clipboard_paste', 1,
+      Wx::STC::EVT_STC_CLIPBOARD_PASTE,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_do_drop', 1,
+      Wx::STC::EVT_STC_DO_DROP,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_doubleclick', 1,
+      Wx::STC::EVT_STC_DOUBLECLICK,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_drag_over', 1,
+      Wx::STC::EVT_STC_DRAG_OVER,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_dwellend', 1,
+      Wx::STC::EVT_STC_DWELLEND,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_dwellstart', 1,
+      Wx::STC::EVT_STC_DWELLSTART,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_hotspot_click', 1,
+      Wx::STC::EVT_STC_HOTSPOT_CLICK,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_hotspot_dclick', 1,
+      Wx::STC::EVT_STC_HOTSPOT_DCLICK,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_hotspot_release_click', 1,
+      Wx::STC::EVT_STC_HOTSPOT_RELEASE_CLICK,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_indicator_click', 1,
+      Wx::STC::EVT_STC_INDICATOR_CLICK,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_indicator_release', 1,
+      Wx::STC::EVT_STC_INDICATOR_RELEASE,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_macrorecord', 1,
+      Wx::STC::EVT_STC_MACRORECORD,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_margin_right_click', 1,
+      Wx::STC::EVT_STC_MARGIN_RIGHT_CLICK,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_marginclick', 1,
+      Wx::STC::EVT_STC_MARGINCLICK,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_modified', 1,
+      Wx::STC::EVT_STC_MODIFIED,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_needshown', 1,
+      Wx::STC::EVT_STC_NEEDSHOWN,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_painted', 1,
+      Wx::STC::EVT_STC_PAINTED,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_romodifyattempt', 1,
+      Wx::STC::EVT_STC_ROMODIFYATTEMPT,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_savepointleft', 1,
+      Wx::STC::EVT_STC_SAVEPOINTLEFT,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_savepointreached', 1,
+      Wx::STC::EVT_STC_SAVEPOINTREACHED,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_start_drag', 1,
+      Wx::STC::EVT_STC_START_DRAG,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_styleneeded', 1,
+      Wx::STC::EVT_STC_STYLENEEDED,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_updateui', 1,
+      Wx::STC::EVT_STC_UPDATEUI,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_userlistselection', 1,
+      Wx::STC::EVT_STC_USERLISTSELECTION,
+      Wx::STC::StyledTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_stc_zoom', 1,
+      Wx::STC::EVT_STC_ZOOM,
+      Wx::STC::StyledTextEvent
+    ]
+end

data/lib/wx/version.rb

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

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

@@ -37,6 +37,11 @@ module WxRuby
                 "build a local copy of wxWidgets for use with wxRuby [false]")  {|v| Setup.options['with-wxwin'] = true}
         opts.on('--with-wxhead',
                 "build with the head (master) version of wxWidgets [false]", "(implies '--with-wxwin')")  {|v| Setup.options['with-wxhead'] = true}
+        opts.on('--wxversion=version',
+                'specify wxWidgets release version (xx.xx.xx) to build with (only valid with --with-wxwin)') do |v|
+          raise "Invalid version #{v} specified. Version should be '<major>.<minor>.<release>'." unless v =~ /^\d+\.\d+\.\d+$/
+          Setup.options['wxversion'] = v
+        end
         opts.on('--swig=path',
                 "the path to swig executable [swig]")  {|v| Setup.options['swig'] = v}
         opts.on('--doxygen=path',
@@ -76,6 +81,7 @@ module WxRuby
         cfg_args << "--wxxml=#{Setup.options['wxxml']}" if Setup.options['wxxml']
         cfg_args << '--with-wxwin' if Setup.options['with-wxwin']
         cfg_args << '--with-wxhead' if Setup.options['with-wxhead']
+        cfg_args << "--wxversion=#{Setup.options['wxversion']}" if Setup.options['wxversion']
         cfg_args << "--swig=#{Setup.options['swig']}" if Setup.options['swig']
         cfg_args << "--doxygen=#{Setup.options['doxygen']}" if Setup.options['doxygen']
         cfg_args << "--git=#{Setup.options['git']}" if Setup.options['git']

data/rakelib/configure.rb

@@ -82,8 +82,15 @@ module WXRuby3
                 "build with the head (master) version of wxWidgets; implies '--with-wxwin'")  { |v|
           CONFIG['with-wxhead'] = true
           CONFIG['with-wxwin'] = true
+          CONFIG['wxversion'] = nil
           CONFIG[WXW_SYS_KEY] = false
         }
+        opts.on('--wxversion=version',
+                'specify wxWidgets release version (xx.xx.xx) to build with (only valid with --with-wxwin)') { |v|
+          raise "Invalid version #{v} specified. Version should be '<major>.<minor>.<release>'." unless v =~ /^\d+\.\d+\.\d+$/
+          CONFIG['wxversion'] = v
+          CONFIG['with-wxhead'] = false
+        }
         opts.on('--with-debug',
                 "build with debugger support [#{instance.get_config('with-debug')}]")  {|v| CONFIG['with-debug'] = true}
         opts.on('--swig=path',
@@ -107,6 +114,8 @@ module WXRuby3
       # should we try to use a system or user defined wxWidgets installation?
       if !get_config('with-wxwin')
 
+        clear_config('wxversion')
+
         # check if a user defined wxWidgets location is specified or should be using a system standard install
         if get_cfg_string('wxwin').empty?
           # assume/force system standard install; will be checked below

data/rakelib/gem.rake

@@ -12,6 +12,8 @@ namespace :wxruby do
 
   namespace :gem do
 
+    task :srcgemspec => ['bin:build', WXRuby3::Gem.gemspec_file]
+
     task :srcgem => ['bin:build', WXRuby3::Gem.gem_file]
 
     # this task only exists for installed (source) gems (where run tasks have been removed)
@@ -60,72 +62,88 @@ namespace :wxruby do
 
 end
 
+file WXRuby3::Gem.gemspec_file => WXRuby3::Gem.manifest do |t|
+  code = <<~__GEMSPEC
+    Gem::Specification.new('wxruby3', '#{WXRuby3::WXRUBY_VERSION}') do |gem|
+      gem.summary = %Q{wxWidgets extension for Ruby}
+      gem.description = %Q{wxRuby3 is a Ruby library providing an extension for the wxWidgets C++ UI framework}
+      gem.email = 'mcorino@m2c-software.nl'
+      gem.homepage = "https://github.com/mcorino/wxRuby3"
+      gem.authors = ['Martin Corino']
+      gem.extensions = ['ext/mkrf_conf_ext.rb']
+      gem.files = [#{WXRuby3::Gem.manifest.collect {|f| "'#{f}'" }.join(',')}]
+      gem.require_paths = %w{lib}
+      gem.bindir = 'bin'
+      gem.executables = [#{WXRuby3::Bin.binaries.collect { |b| "'#{b}'" }.join(',')}]
+      gem.required_ruby_version = '>= 2.5'
+      gem.licenses = ['MIT']
+      gem.add_dependency 'nokogiri', '~> 1.12'
+      gem.add_dependency 'rake'
+      gem.add_dependency 'power_assert', '~> 3.0'
+      gem.add_dependency 'minitest', '>= 5.15'
+      gem.add_dependency 'plat4m', '~> 1.1'
+      gem.add_dependency 'openssl', '~> 4.0'
+      gem.rdoc_options <<
+        '--exclude=\\.dll' <<
+        '--exclude=\\.so' <<
+        '--exclude=lib/wx.rb' <<
+        '--exclude=lib/wx/*.rb' <<
+        "'--exclude=lib/wx/(aui|core|grid|html|pg|prt|rbn|rtc|stc|wxruby)/.*'"
+      gem.metadata = {
+        "bug_tracker_uri"   => "https://github.com/mcorino/wxRuby3/issues",
+        "homepage_uri"      => "https://github.com/mcorino/wxRuby3/wiki",
+        "source_code_uri"   => "https://github.com/mcorino/wxRuby3",
+        "documentation_uri" => "https://mcorino.github.io/wxRuby3",
+        "github_repo"       => "https://github.com/mcorino/wxRuby3"
+      }
+      gem.post_install_message = <<~__MSG
+  
+        The wxRuby3 Gem has been successfully installed including the 'wxruby' utility.
+  
+        In case no suitable binary release package was available for your platform you  
+        will need to run the post-install setup process by executing:
+  
+        $ wxruby setup
+  
+        To check whether wxRuby3 is ready to run or not you can at any time execute the 
+        following command:
+  
+        $ wxruby check
+  
+        Run 'wxruby check -h' for more information.
+  
+        When the wxRuby3 setup has been fully completed you can start using wxRuby3.
+   
+        You can run the regression tests to verify the installation by executing:
+  
+        $ wxruby test
+  
+        The wxRuby3 sample explorer can be run by executing:
+  
+        $ wxruby sampler
+  
+        Have fun using wxRuby3.
+  
+        Run 'wxruby -h' to see information on the available commands.
+  
+        __MSG
+      gem.required_rubygems_version = '>= 0' if gem.respond_to? :required_rubygems_version=
+    end
+    __GEMSPEC
+  File.open(t.name, 'w') { |f| f.puts code }
+end
+
+
+CLOBBER.include WXRuby3::Gem.gemspec_file
+
+desc 'Build wxRuby 3 gemspec'
+task :gemspec => 'wxruby:gem:srcgemspec'
+
+directory 'pkg'
+
 # source gem file
-file WXRuby3::Gem.gem_file => WXRuby3::Gem.manifest do
-  gemspec = WXRuby3::Gem.define_spec do |gem|
-    gem.summary = %Q{wxWidgets extension for Ruby}
-    gem.description = %Q{wxRuby3 is a Ruby library providing an extension for the wxWidgets C++ UI framework}
-    gem.email = 'mcorino@m2c-software.nl'
-    gem.homepage = "https://github.com/mcorino/wxRuby3"
-    gem.authors = ['Martin Corino']
-    gem.extensions = ['ext/mkrf_conf_ext.rb']
-    gem.files = WXRuby3::Gem.manifest
-    gem.require_paths = %w{lib}
-    gem.bindir = 'bin'
-    gem.executables = WXRuby3::Bin.binaries
-    gem.required_ruby_version = '>= 2.5'
-    gem.licenses = ['MIT']
-    gem.add_dependency 'nokogiri', '~> 1.12'
-    gem.add_dependency 'rake'
-    gem.add_dependency 'minitest', '~> 5.15'
-    gem.add_dependency 'test-unit', '~> 3.5'
-    gem.add_dependency 'plat4m', '~> 1.1'
-    gem.rdoc_options <<
-      '--exclude=\\.dll' <<
-      '--exclude=\\.so' <<
-      '--exclude=lib/wx.rb' <<
-      '--exclude=lib/wx/*.rb' <<
-      "'--exclude=lib/wx/(aui|core|grid|html|pg|prt|rbn|rtc|stc|wxruby)/.*'"
-    gem.metadata = {
-      "bug_tracker_uri"   => "https://github.com/mcorino/wxRuby3/issues",
-      "homepage_uri"      => "https://github.com/mcorino/wxRuby3/wiki",
-      "source_code_uri"   => "https://github.com/mcorino/wxRuby3",
-      "documentation_uri" => "https://mcorino.github.io/wxRuby3",
-      "github_repo"       => "https://github.com/mcorino/wxRuby3"
-    }
-    gem.post_install_message = <<~__MSG
-
-      The wxRuby3 Gem has been successfully installed including the 'wxruby' utility.
-
-      In case no suitable binary release package was available for your platform you  
-      will need to run the post-install setup process by executing:
-
-      $ wxruby setup
-
-      To check whether wxRuby3 is ready to run or not you can at any time execute the 
-      following command:
-
-      $ wxruby check
-
-      Run 'wxruby check -h' for more information.
-
-      When the wxRuby3 setup has been fully completed you can start using wxRuby3.
- 
-      You can run the regression tests to verify the installation by executing:
-
-      $ wxruby test
-
-      The wxRuby3 sample explorer can be run by executing:
-
-      $ wxruby sampler
-
-      Have fun using wxRuby3.
-
-      Run 'wxruby -h' to see information on the available commands.
-
-      __MSG
-  end
-  WXRuby3::Gem.build_gem(gemspec)
+file WXRuby3::Gem.gem_file => ['wxruby:gem:srcgemspec', 'pkg'] do
+  WXRuby3.config.sh "gem build #{WXRuby3::Gem.gemspec_file} -o #{WXRuby3::Gem.gem_file}"
 end
 
 desc 'Build wxRuby 3 gem'
@@ -145,7 +163,7 @@ if File.file?(File.join(__dir__, 'run.rake'))
     end
 
     # binary package file
-    file WXRuby3::Gem.bin_pkg_file => WXRuby3::Gem.bin_pkg_manifest do |t|
+    file WXRuby3::Gem.bin_pkg_file => [*WXRuby3::Gem.bin_pkg_manifest, 'pkg'] do |t|
       WXRuby3::Install.install_wxwin_shlibs
       begin
         # create bin package

data/rakelib/gem.rb

@@ -8,11 +8,6 @@
 
 require 'set'
 require 'rubygems'
-require 'rubygems/package'
-begin
-  require 'rubygems/builder'
-rescue LoadError
-end
 require 'zlib'
 require 'tempfile'
 require 'json'
@@ -62,20 +57,12 @@ module WXRuby3
       end
       private :gem_name
 
-      def gem_file
-        File.join('pkg', "#{gem_name}.gem")
+      def gemspec_file
+        "#{gem_name}.gemspec"
       end
 
-      def build_gem(gemspec)
-        if defined?(::Gem::Package) && ::Gem::Package.respond_to?(:build)
-          gem_file_name = ::Gem::Package.build(gemspec)
-        else
-          gem_file_name = ::Gem::Builder.new(gemspec).build
-        end
-
-        FileUtils.mkdir_p('pkg')
-
-        FileUtils.mv(gem_file_name, 'pkg')
+      def gem_file
+        File.join('pkg', "#{gem_name}.gem")
       end
 
       # Binary package helpers
@@ -122,9 +109,6 @@ module WXRuby3
       end
 
       def build_bin_pkg
-        # make sure pkg directory exists
-        FileUtils.mkdir_p('pkg')
-
         fname = bin_pkg_file
 
         # package registry and essential config

data/rakelib/lib/config/linux.rb

@@ -61,7 +61,7 @@ module WXRuby3
             if get_config('with-wxwin') && get_cfg_string('wxwin').empty?
               pkg_deps << 'patchelf' unless system('command -v patchelf>/dev/null')
               pkg_deps << 'make' unless system('command -v make>/dev/null')
-              pkg_deps << 'git' unless system('command -v git>/dev/null')
+              pkg_deps << 'git' unless system("command -v #{get_cfg_string('git')}>/dev/null")
             end
             pkg_deps
           end

data/rakelib/lib/config/macosx.rb

@@ -87,7 +87,21 @@ module WXRuby3
           # add deployment lookup paths for wxwidgets shared libraries
           def update_shlib_wxwin_libpaths(shlib, deplibs)
             if super
-              changes = deplibs.collect { |dl| "-change '#{dl}' '@rpath/#{File.basename(dl)}'"}
+              # reduce deplibs to only base names
+              deplibs.collect! { |dl| File.basename(dl) }
+              # get all full load paths of the library dependencies of `shlib`
+              shlib_deps = expand("otool -L #{shlib}").chomp.split("\n")
+              # loose the first line
+              shlib_deps.shift
+              # extract only the loadpath
+              shlib_deps.collect! { |dl| dl.strip.split(' ').first }
+              # collect required loadpath changes for wxw libs
+              changes = shlib_deps.inject([]) do |list, dl|
+                if deplibs.include?(File.basename(dl))
+                  list << "-change '#{dl}' '@rpath/#{File.basename(dl)}'"
+                end
+                list
+              end
               sh("install_name_tool #{changes.join(' ')} #{shlib} 2>/dev/null", verbose: false) { |_,_| }
               true
             else

data/rakelib/lib/config/pkgman/linux.rb

@@ -44,11 +44,16 @@ 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('debian', %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: '13')
                                       .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').alias('ubuntu', '24.04', 'linuxmint', '22.1'),
+                                      .alias('ubuntu', '24.04', 'linuxmint', '22')
+                                      .alias('ubuntu', '24.04', 'linuxmint', '22.1')
+                                      .alias('ubuntu', '24.04', 'linuxmint', '22.2')
+                                      .alias('ubuntu', '24.04', 'linuxmint', '22.3'),
           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])
+          arch: PlatformDependencies.new(%w[pkg-config gtk3 webkit2gtk-4.1 gspell libunwind gstreamer curl libsecret libnotify libpng])
+                                    .add('manjaro', %w[pkgconf gtk3 webkit2gtk-4.1 gspell libunwind gstreamer curl libsecret libnotify libpng])
         }
         PLATFORM_ALTS = {
           suse: { 'g++' => 'gcc-c++' },

data/rakelib/lib/config/unixish.rb

@@ -58,8 +58,8 @@ module WXRuby3
 
       def check_tool_pkgs
         pkg_deps = super
-        pkg_deps << 'doxygen' unless system('command -v doxygen>/dev/null')
-        pkg_deps << 'swig' unless system('command -v swig>/dev/null')
+        pkg_deps << 'doxygen' unless system("command -v #{get_cfg_string('doxygen')}>/dev/null")
+        pkg_deps << 'swig' unless system("command -v #{get_cfg_string('swig')}>/dev/null")
         pkg_deps
       end
 
@@ -211,7 +211,7 @@ module WXRuby3
           # remove all warning flags provided by Ruby config
           @ruby_cppflags = @ruby_cppflags.collect { |flags| flags.split(' ') }.flatten.
             select { |o| !o.start_with?('-W') || o.start_with?('-Wl,') }
-          @ruby_cppflags.concat %w[-Wall -Wextra -Wno-unused-parameter]   # only keep these
+          @ruby_cppflags.concat %w[-Wall -Wextra -Wno-unused-parameter -Wno-cpp]   # only keep these
           # add include flags
           @ruby_cppflags.concat ['-I.', *@ruby_includes.collect { |inc| "-I#{inc}" }]
           @ruby_ldflags << "-Wl,-rpath,'#{get_rpath_origin}/../lib'"      # add default rpath

data/rakelib/lib/config.rb

@@ -74,19 +74,20 @@ module WXRuby3
                   'wxwin' => ENV['WXWIN'] || '',
                   'wxxml' => ENV['WXXML'] || '',
                   'wxwininstdir' => '',
-                  'with-wxwin' => !!ENV['WITH_WXWIN'],
+                  'with-wxwin' => ((ENV['WXRUBY_WITH_WXWIN'] || '') == '1'),
                   'with-debug' => ((ENV['WXRUBY_DEBUG'] || '') == '1'),
                   'swig' => ENV['WXRUBY_SWIG'] || 'swig',
                   'doxygen' => ENV['WXRUBY_DOXYGEN'] || 'doxygen',
                   'git' => ENV['WXRUBY_GIT'] || 'git'
                 })
   CONFIG['autoinstall'] = (ENV['WXRUBY_AUTOINSTALL'] != '0') if ENV['WXRUBY_AUTOINSTALL']
+  CONFIG['wxversion'] = ENV['WXRUBY_WXVERSION'] if ENV['WXRUBY_WXVERSION']
   BUILD_CFG = '.wxconfig'
 
-  # Ruby 2.5 is the minimum version for wxRuby3
+  # Ruby 2.7 is the minimum version for wxRuby3
   __rb_ver = RUBY_VERSION.split('.').collect {|v| v.to_i}
-  if (__rb_major = __rb_ver.shift) < 2 || (__rb_major == 2 && __rb_ver.shift < 5)
-    $stderr.puts 'ERROR: wxRuby3 requires Ruby >= 2.5.0!'
+  if (__rb_major = __rb_ver.shift) < 2 || (__rb_major == 2 && __rb_ver.shift < 7)
+    $stderr.puts 'ERROR: wxRuby3 requires Ruby >= 2.7.0!'
     exit(1)
   end
 
@@ -351,7 +352,7 @@ module WXRuby3
     alias :bash :sh
 
     def test(*tests, **options)
-      errors = 0
+      errors = []
       excludes = (ENV['WXRUBY_TEST_EXCLUDE'] || '').split(':')
       tests = Dir.glob(File.join(Config.instance.test_dir, '*.rb')) if tests.empty?
       tests.each do |test|
@@ -360,10 +361,10 @@ module WXRuby3
             test = File.join(Config.instance.test_dir, test)
             test = Dir.glob(test+'.rb').shift || test unless File.exist?(test)
           end
-          Rake.sh(Config.instance.exec_env.merge({'RUBYLIB'=>rb_lib_path}), FileUtils::RUBY, test) { |ok,status| errors += 1 unless ok }
+          Rake.sh(Config.instance.exec_env.merge({'RUBYLIB'=>rb_lib_path}), FileUtils::RUBY, test) { |ok,status| errors << File.basename(test, '.rb') unless ok }
         end
       end
-      fail "ERRORS: ##{errors} test scripts failed." if errors>0
+      fail "ERRORS: ##{errors.size} test scripts failed.\n\t#{errors.join("\n\t")}" unless errors.empty?
     end
 
     def irb(**options)
@@ -439,6 +440,10 @@ module WXRuby3
       Config.set_config(key, val)
     end
 
+    def clear_config(key)
+      Config.clear_config(key)
+    end
+
     def dll_mask
       "#{dll_ext}*"
     end
@@ -581,7 +586,7 @@ module WXRuby3
                       :extra_libs, :cpp_out_flag, :link_output_flag, :obj_ext, :dll_ext,
                       :cxxflags, :libs, :cpp, :ld, :verbose_flag
           attr_reader :wx_port, :wx_path, :wx_cppflags, :wx_libs, :wx_setup_h, :wx_xml_path
-          attr_reader :swig_major, :swig_dir, :swig_path, :src_dir, :src_path, :src_gen_dir, :src_gen_path, :obj_dir, :obj_path,
+          attr_reader :swig_dir, :swig_path, :src_dir, :src_path, :src_gen_dir, :src_gen_path, :obj_dir, :obj_path,
                       :rake_deps_dir, :rake_deps_path, :dest_dir, :test_dir, :classes_dir, :classes_path,
                       :common_dir, :common_path, :interface_dir, :interface_path,
                       :ext_dir, :ext_path, :wxruby_dir, :wxruby_path, :exec_env
@@ -771,6 +776,8 @@ module WXRuby3
               "v#{@wx_version}"
             elsif get_config('with-wxhead')
               'master'
+            elsif get_config('wxversion')
+              "v#{get_config('wxversion')}"
             else
               nil
             end
@@ -898,6 +905,10 @@ module WXRuby3
         WXRuby3::CONFIG[key.to_s] = val
       end
 
+      def clear_config(key)
+        WXRuby3::CONFIG.delete(key.to_s)
+      end
+
       def is_configured?
         instance.is_configured?
       end

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

@@ -122,7 +122,7 @@ namespace Swig
     void setup_error(VALUE error);
 
   public:
-    virtual ~DirectorException() throw();
+    virtual ~DirectorException() SWIG_NOEXCEPT;
 
     VALUE getType() const
     {
@@ -140,7 +140,7 @@ namespace Swig
       return swig_msg;
     }
 
-    const char *what() const throw()
+    const char *what() const SWIG_NOEXCEPT
     {
       return swig_msg.c_str();
     }
@@ -157,7 +157,7 @@ namespace Swig
     this->setup_error(error);
   }
 
-  DirectorException::~DirectorException() throw()
+  DirectorException::~DirectorException() SWIG_NOEXCEPT
   {}
 
 

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

@@ -15,11 +15,9 @@
 WXRB_EXPORT_FLAG VALUE
 getNullReferenceError(void)
 {
-  static int init = 0;
-  static VALUE rb_eNullReferenceError ;
-  if (!init)
+  static VALUE rb_eNullReferenceError = Qnil;
+  if (rb_eNullReferenceError == Qnil)
   {
-    init = 1;
     rb_eNullReferenceError = rb_define_class("NullReferenceError", rb_eRuntimeError);
   }
   return rb_eNullReferenceError;
@@ -28,11 +26,9 @@ getNullReferenceError(void)
 WXRB_EXPORT_FLAG VALUE
 getObjectPreviouslyDeletedError(void)
 {
-  static int init = 0;
-  static VALUE rb_eObjectPreviouslyDeleted ;
-  if (!init)
+  static VALUE rb_eObjectPreviouslyDeleted = Qnil;
+  if (rb_eObjectPreviouslyDeleted == Qnil)
   {
-    init = 1;
     rb_eObjectPreviouslyDeleted = rb_define_class("ObjectPreviouslyDeleted", rb_eRuntimeError);
   }
   return rb_eObjectPreviouslyDeleted;