wxruby3 1.7.0 → 1.8.1

data/lib/wx/doc/rt/shared_event_handler.rb

@@ -0,0 +1,49 @@
+# :stopdoc:
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+
+# Shared event handler methods documentation stubs.
+# :startdoc:
+
+
+
+module Wx
+
+  # The RT (Ruby|Ractor Threading) module provides the {RT::SharedEvtHandler} and {RT::ThreadEvent}
+  # classes which can be used provide thread-(or Ractor-)safe event messaging in wxRuby3.
+  module RT
+
+    # This class provides a threadsafe (Ractor shareable) reference to a {Wx:EvtHandler} providing
+    # only 2 methods; {RT::SharedEvtHandler#clone} and {RT::SharedEvtHandler#queue_event}
+    class SharedEvtHandler
+
+      # Returns a cloned instance referencing the same {Wx::EvtHandler}.
+      # @return [Wx::RT::SharedEvtHandler]
+      def clone; end
+
+      # Essentially the same functionality as {Wx::EvtHandler#queue_event} except that this method only
+      # accepts {Wx::RT::ThreadEvent} or derived instances.
+      # @note Note that this event will not maintain any Ruby state, i.e. the actual Ruby instance and/or any instance
+      #       variables thereof will not be transferred through the event messaging system. Only state managed by the wrapped
+      #       C\++ event instance will persist.
+      # @param [Wx::RT::ThreadEvent] evt event instance to be queued
+      # @return [void]
+      def queue_event(evt); end
+
+    end
+
+  end
+
+  class EvtHandler < Wx::Object
+
+    # Returns a Ractor-safe shareable event handler reference.
+    # @see Wx::RT::SharedEvtHandler
+    # @see Wx::RT::ThreadEvent
+    # @return [Wx::RTT::SharedEvtHandler]
+    def make_shared; end
+
+  end
+
+end

data/lib/wx/doc/rt/thread_event.rb

@@ -0,0 +1,28 @@
+# :stopdoc:
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+
+# Shared event handler methods documentation stubs.
+# :startdoc:
+
+
+
+module Wx
+
+  module RT
+
+    class ThreadEvent < Event
+
+      # Constructor.
+      # @param eventType [Integer]
+      # @param id [Integer]
+      # @return [Wx::RT::ThreadEvent]
+      def initialize(eventType=Wx::EVT_THREAD, id=Wx::StandardID::ID_ANY) end
+
+    end
+
+  end
+
+end

data/lib/wx/doc/stream.rb

@@ -17,12 +17,16 @@ module Wx
     #   Reads bytes from stream and writes these to output stream until eof or error.
     #   @param [IO,Wx::OutputStream] output output stream to write to
     #   @return [self]
-    def read(*args); end
+    def read(*); end
 
+    # @overload read_all(size)
     #   Reads size bytes from stream (until eof or error).
     #   @param [Integer] size number of bytes to read
     #   @return [String,nil] string with bytes read (nil if none read)
-    def read_all(size); end
+    # @overload read_all()
+    #   Reads all bytes from stream (until eof or error).
+    #   @return [String,nil] string with bytes read (nil if none read)
+    def read_all(*); end
 
   end
 
@@ -36,7 +40,7 @@ module Wx
     #   Write bytes read from input stream (until eof or error)
     #   @param [IO,Wx::InputStream] input input stream to read from
     #   @return [self]
-    def write(*args); end
+    def write(*); end
 
     # Writes bytes from buffer to stream.
     # @param [String] buffer string with bytes to write

data/lib/wx/doc/webview.rb

@@ -0,0 +1,40 @@
+# :stopdoc:
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# :startdoc:
+
+
+module Wx
+
+  module WEB
+
+    class WebView < Wx::Control
+
+      # Sets emulation level.
+      #
+      # This function is useful to change the emulation level of the system browser control used for {Wx::WebView}
+      # implementation under MSW, rather than using the currently default, IE11-compatible, level (with wxRuby3).
+      #
+      # Please notice that this function works by modifying the per-user part of MSW registry, which has several
+      # implications: first, it is sufficient to call it only once (per user) as the changes done by it are persistent
+      # and, second, if you do not want them to be persistent, you need to call it with {Wx::WEB::WEBVIEWIE_EMU_DEFAULT}
+      # argument explicitly.
+      #
+      # In particular, this function should be called to allow {Wx::WEB::WebView#run_script} to work for JavaScript code
+      # returning arbitrary objects, which is not supported at the default emulation level.
+      #
+      # If set to a level higher than installed version, the highest available level will be used instead.
+      # {Wx::WEB::WEBVIEWIE_EMU_IE11} is recommended for best performance and experience.
+      #
+      # This function is MSW-specific and doesn't exist under other platforms.
+      #
+      # @param [Wx::WEB::WebViewIE_EmulationLevel] level
+      # @return [Boolean] true on success, false on failure (a warning message is also logged in the latter case).
+      # @wxrb_require WXMSW
+      def self.msw_set_ie_emulation_level(level=Wx::WEB::WEBVIEWIE_EMU_IE11); end
+    end
+
+  end
+
+end

data/lib/wx/helpers.rb

@@ -36,7 +36,7 @@ module Wx
       end
     rescue
       Kernel.raise ArgumentError,
-                   "Bad arg composition of #{args.inspect}"
+                   "Bad arg composition of #{args.inspect} (error = #{$!}, param spec = #{param_spec.inspect})"
     end
 
     unless kwargs.empty?

data/lib/wx/html/htmlhelpcontroller.rb

@@ -27,6 +27,16 @@ module Wx
 
     end
 
+    class << self
+
+      define_method :HtmlModalHelp do |parent, help_file, topic = '', style = Wx::HTML::HF_DEFAULT_STYLE|
+
+        html_modal_help(parent, help_file, topic, style)
+
+      end
+
+    end
+
   end
 
 end

data/lib/wx/keyword_defs.rb

@@ -240,6 +240,17 @@ Wx::define_keyword_ctors(Wx::TextEntryDialog) do
   wx_ctor_params :pos
 end
 
+# Dialog to get a number from the user
+Wx::define_keyword_ctors(Wx::NumberEntryDialog) do
+  wx_ctor_params :message => ''
+  wx_ctor_params :prompt => 'Number'
+  wx_ctor_params :caption => 'Please enter a number'
+  wx_ctor_params :value => 0
+  wx_ctor_params :min => 0
+  wx_ctor_params :max => 0
+  wx_ctor_params :pos
+end
+
 # wxPasswordEntryDialog 	Dialog to get a password from the user
 Wx::define_keyword_ctors(Wx::PasswordEntryDialog) do
   wx_ctor_params :message => ''

data/lib/wx/rt/require.rb

@@ -0,0 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+# Wx::RT sub package for wxRuby3
+
+require_relative './events/evt_list'
+require_relative './thread_event'

data/lib/wx/rt/thread_event.rb

@@ -0,0 +1,14 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+#
+
+module Wx
+
+  Wx::EvtHandler.register_event_type Wx::EvtHandler::EventType[
+                                       'evt_thread', 1,
+                                       Wx::RT::EVT_THREAD,
+                                       Wx::RT::ThreadEvent
+                                     ]
+
+end

data/lib/wx/rt.rb

@@ -0,0 +1,16 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+# Wx::RT sub package loader for wxRuby3
+
+
+require 'wx/core'
+
+require 'wxruby_rt'
+
+require 'wx/rt/require'
+
+::Wx.include(WxRubyStyleAccessors)
+
+::Wx.include(::Wx::RT) if defined?(::WX_GLOBAL_CONSTANTS) && ::WX_GLOBAL_CONSTANTS

data/lib/wx/version.rb

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

data/lib/wx/web/require.rb

@@ -0,0 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+# Wx::WEB sub package for wxRuby3
+
+require_relative './events/evt_list'
+require_relative './webview'

data/lib/wx/web/webview.rb

@@ -0,0 +1,106 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
+module Wx
+
+  module WEB
+
+    WEBVIEW_DEFAULT_URL_STR = 'about:blank'
+    WEBVIEW_BACKEND_WEB_KIT = 'wxWebViewWebKit'
+    WEBVIEW_BACKEND_CHROMIUM = 'wxWebViewChromium'
+    WEBVIEW_BACKEND_EDGE = 'wxWebViewEdge'
+    WEBVIEW_BACKEND_IE = 'wxWebViewIE'
+    WEBVIEW_BACKEND_DEFAULT = case Wx::PLATFORM
+                              when 'WXOSX'
+                                if Wx.has_feature?(:USE_WEBVIEW_WEBKIT)
+                                  WEBVIEW_BACKEND_WEB_KIT
+                                elsif Wx.has_feature?(:USE_WEBVIEW_CHROMIUM)
+                                  WEBVIEW_BACKEND_CHROMIUM
+                                else
+                                  ''
+                                end
+                              when 'WXMSW'
+                                if Wx.has_feature?(:USE_WEBVIEW_EDGE) || Wx.has_feature?(:USE_WEBVIEW_EDGE_STATIC)
+                                  WEBVIEW_BACKEND_EDGE
+                                elsif Wx.has_feature?(:USE_WEBVIEW_CHROMIUM)
+                                  WEBVIEW_BACKEND_CHROMIUM
+                                elsif Wx.has_feature?(:USE_WEBVIEW_IE)
+                                  WEBVIEW_BACKEND_IE
+                                else
+                                  ''
+                                end
+                              when 'WXGTK'
+                                if Wx.has_feature?(:USE_WEBVIEW_WEBKIT2) || Wx.has_feature?(:USE_WEBVIEW_WEBKIT)
+                                  WEBVIEW_BACKEND_WEB_KIT
+                                elsif Wx.has_feature?(:USE_WEBVIEW_CHROMIUM)
+                                  WEBVIEW_BACKEND_CHROMIUM
+                                else
+                                  ''
+                                end
+                              else
+                                ''
+                              end
+    WEBVIEW_NAME_STR = 'WebView'
+
+    class WebView < Wx::Control
+
+      class << self
+        # Redefine #new method to support positional and named
+        # arguments
+        WEBVIEW_NEW_PARAMS = [Wx::Parameter[:id, Wx::StandardID::ID_ANY],
+                              Wx::Parameter[:url, WEBVIEW_DEFAULT_URL_STR],
+                              Wx::Parameter[:pos, Wx::DEFAULT_POSITION],
+                              Wx::Parameter[:size, Wx::DEFAULT_SIZE],
+                              Wx::Parameter[:backend, WEBVIEW_BACKEND_DEFAULT],
+                              Wx::Parameter[:style, 0],
+                              Wx::Parameter[:name, WEBVIEW_NAME_STR]]
+
+        wx_new = instance_method(:new)
+        wx_redefine_method :new do |*args, **kwargs|
+
+          if args.size == 1 && args.first.is_a?(::String)
+            wx_new.bind(self).call(*args) # no need for keyword scanning
+          elsif ::Wx::WXWIDGETS_VERSION >= '3.3.0' && args.size == 1 && args.first.is_a?(Wx::WEB::WebViewConfiguration)
+            wx_new.bind(self).call(*args) # no need for keyword scanning
+          else
+            full_args = []
+
+            full_args << args.shift # get parent argument
+
+            begin
+              args = Wx::args_as_list(WEBVIEW_NEW_PARAMS, *args, **kwargs)
+            rescue => err
+              err.set_backtrace(caller)
+              Kernel.raise err
+            end
+
+            # update the full arguments list with the optional arguments
+            full_args.concat(args)
+
+            # Call original add with full args
+            wx_new.bind(self).call(*full_args)
+          end
+
+        end
+
+      end
+
+      # take care of GC protection for registered handlers
+      wx_register_handler = instance_method :register_handler
+      define_method(:register_handler) do |handler|
+        (@handlers ||= []) << handler
+        wx_register_handler.bind(self).call(handler)
+      end
+    end
+
+    if Wx::PLATFORM == 'WXMSW' && Wx.has_feature?(:USE_WEBVIEW_IE)
+      Wx::WEB::WebView.msw_set_ie_emulation_level # set emulation level to highest possible by default
+    end
+
+  end
+end

data/lib/wx/web.rb

@@ -0,0 +1,17 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+# Wx::WEB sub package loader for wxRuby3
+
+
+require 'wx/core'
+
+require 'wxruby_web'
+
+require_relative './web/require'
+
+::Wx.include(WxRubyStyleAccessors)
+
+::Wx.include(::Wx::WEB) if defined?(::WX_GLOBAL_CONSTANTS) && ::WX_GLOBAL_CONSTANTS
+::Wx::WEB.include((defined?(::WX_GLOBAL_CONSTANTS) && ::WX_GLOBAL_CONSTANTS) ? WxGlobalConstants : WxEnumConstants)

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

@@ -42,6 +42,16 @@ module WxRuby
           raise "Invalid version #{v} specified. Version should be '<major>.<minor>.<release>'." unless v =~ /^\d+\.\d+\.\d+$/
           Setup.options['wxversion'] = v
         end
+        opts.on('--without-webview',
+                'disable including wxWidgets WebView library (only valid with --with-wxwin)') { |v|
+          Setup.options['with-webview'] = false
+        }
+        opts.on('--with-webview[=backend]',
+                'include wxWidgets WebView library (only valid with --with-wxwin)',
+                'backend = (comma separated list of) backend(s) to include',
+                'without backend(s) specified only the default backend for the platform is included') { |v|
+          Setup.options['with-webview'] = v ? v : true
+        }
         opts.on('--swig=path',
                 "the path to swig executable [swig]")  {|v| Setup.options['swig'] = v}
         opts.on('--doxygen=path',
@@ -81,6 +91,11 @@ 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']
+        if Setup.options['with-webview'] == false
+          cfg_args << '--without-webview'
+        elsif Setup.options['with-webview']
+          cfg_args << "--with-webview#{Setup.options['with-webview'] == true ? '' : "=#{Setup.options['with-webview']}"}"
+        end
         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']

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

@@ -38,7 +38,8 @@ module WxRuby
           exit(0)
         end
         opts.on('--exclude=TEST',
-                "exclude the specified test from running")  {|v| Test.options[:excludes] << v }
+                "Exclude the specified test from running")  {|v| Test.options[:excludes] << v }
+        opts.on('--keep-going', 'Do NOT stop on error.') { Test.options[:keep_going] = true }
         opts.on('-h', '--help',
                 'Show this message.') do |v|
           puts opts
@@ -66,9 +67,14 @@ module WxRuby
                   end
                 end
         tests.each do |test|
+          rc = true
           unless Test.options[:excludes].include?(File.basename(test, '.*'))
-            exit(1) unless system(RUBY, test)
+            $stdout.puts
+            $stdout.puts "Running #{File.basename(test, '.*')} ..."
+            rc &&= system(RUBY, test)
+            exit(1) unless rc || Test.options[:keep_going]
           end
+          exit(1) unless rc
         end
       end
     end

data/lib/wx.rb

@@ -7,6 +7,7 @@
 WX_GLOBAL_CONSTANTS=true unless defined? WX_GLOBAL_CONSTANTS
 
 require 'wx/core'
+require 'wx/rt'
 require 'wx/prt' if Wx.has_feature?(:USE_PRINTING_ARCHITECTURE)
 require 'wx/rtc' if Wx.has_feature?(:USE_RICHTEXT)
 require 'wx/stc' if Wx.has_feature?(:USE_STC)
@@ -15,3 +16,4 @@ require 'wx/html' if Wx.has_feature?(:USE_HTML)
 require 'wx/aui' if Wx.has_feature?(:USE_AUI)
 require 'wx/pg' if Wx.has_feature?(:USE_PROPGRID)
 require 'wx/rbn' if Wx.has_feature?(:USE_RIBBON)
+require 'wx/web' if Wx.has_feature?(:USE_WEBVIEW)

data/rakelib/configure.rb

@@ -91,6 +91,17 @@ module WXRuby3
           CONFIG['wxversion'] = v
           CONFIG['with-wxhead'] = false
         }
+        opts.on('--without-webview',
+                'disable including wxWidgets WebView library (only valid with --with-wxwin)') { |v|
+          CONFIG['with-webview'] = false
+        }
+        opts.on('--with-webview[=backend]',
+                'include wxWidgets WebView library (only valid with --with-wxwin)',
+                'backend = (comma separated list of) backend(s) to include',
+                'without backend(s) specified only the default backend for the platform is included') { |v|
+          val = v ? v.split(',') : true
+          CONFIG['with-webview'] = val
+        }
         opts.on('--with-debug',
                 "build with debugger support [#{instance.get_config('with-debug')}]")  {|v| CONFIG['with-debug'] = true}
         opts.on('--swig=path',
@@ -161,6 +172,19 @@ module WXRuby3
       # else we're assumed to build wxWidgets ourselves so cannot test anything yet
       end
 
+      # embedded wxWidgets?
+      if get_config('with-wxwin') && get_config('with-webview').is_a?(Array)
+        # check validity of backends
+        if (v = get_config('with-webview')).is_a?(Array)
+          backends = WX_WEBVIEW_BACKENDS[instance.platform]
+          err = v.reject { |b| backends.include?(b) }
+          unless err.empty?
+            STDERR.puts "ERROR: '#{err.join("' and '")}' #{err.size>1 ? 'are not valid WebView backends' : 'is not a valid WebView backend'} for this platform."
+            exit(1)
+          end
+        end
+      end
+
       if get_cfg_string('wxxml').empty? && !get_cfg_string('wxwin').empty?
         # in case of a custom wxWidgets build and no explicit xml path check if the custom build holds this
         xml_path = File.join(get_cfg_string('wxwin'), 'docs', 'doxygen', 'out', 'xml')

data/rakelib/gem.rb

@@ -74,7 +74,8 @@ module WXRuby3
         manifest.include 'lib/wx/**/events/*.rb', 'lib/wx/**/ext/*.rb', 'lib/wx/core/font/*.rb'
         manifest.include "lib/wx/doc/gen/**/*.rb"
         if WXRuby3.config.get_config('with-wxwin')
-          manifest.include "ext/*.#{WXRuby3.config.dll_mask}"
+          manifest.include "ext/lib/*.#{WXRuby3.config.dll_mask}"
+          manifest.include "ext/lib/#{WXRuby3.config.wx_plugin_path}/**/*.#{WXRuby3.config.dll_mask}" # possible plugin libs
         end
         manifest
       end
@@ -299,7 +300,7 @@ module WXRuby3
           registry.each do |entry|
             path, mode, size, symlink = entry
             if symlink
-              FileUtils.mkdir_p(File.dirname(symlink))
+              FileUtils.mkdir_p(File.dirname(path))
               FileUtils.ln_s(symlink, path)
             else
               FileUtils.mkdir_p(File.dirname(path))

data/rakelib/install.rb

@@ -24,6 +24,7 @@ module WXRuby3
       def wxwin_shlibs
         unless @wxwin_shlibs
           @wxwin_shlibs = Rake::FileList.new
+          @wxwin_plugin_libs = {}
           # include wxWidgets shared libraries we linked with
           WXRuby3.config.wx_libs.select { |s| s.start_with?('-L') }.each do |libdir|
             libdir = libdir[2..libdir.size]
@@ -49,46 +50,72 @@ module WXRuby3
                 end
               end
             end
+            if WXRuby3.config.linux? && WXRuby3.config.wx_port == :wxgtk && WXRuby3.config.features_set?('USE_WEBVIEW')
+              # look for 'webkit_ext*.so' or 'webkit2_ext*.so' in standard plugin subdir 'wx/<wx version>/web-extensions'
+              plugin_sub_dir = File.join(WXRuby3.config.wx_plugin_path, 'web-extensions')
+              Dir.glob(File.join(libdir, plugin_sub_dir, "webkit?_ext*.#{WXRuby3.config.dll_mask}")).each do |lib|
+                @wxwin_plugin_libs[File.join(plugin_sub_dir, File.basename(lib))] = lib
+              end
+            end
           end
           @wxwin_shlibs = ::Set.new(@wxwin_shlibs.to_a)
         end
         @wxwin_shlibs
       end
 
+      def wxwin_plugin_libs
+        @wxwin_plugin_libs || {}
+      end
+
       def install_wxwin_shlibs
         if WXRuby3.config.get_config('with-wxwin')
           $stdout.print "Installing wxRuby3 extensions..." if WXRuby3.config.run_silent?
-          # prepare required wxWidgets shared libs
-          wxwin_inshlibs = []
-          WXRuby3::Install.wxwin_shlibs.each do |shlib|
-            if File.symlink?(shlib)
-              src_shlib = shlib
-              src_shlib = File.join(File.dirname(shlib), File.basename(File.readlink(src_shlib))) while File.symlink?(src_shlib)
-              FileUtils.ln_s(File.join('.', File.basename(src_shlib)), File.join('ext', File.basename(shlib)))
-            else
-              FileUtils.cp(shlib, inshlib = File.join('ext', File.basename(shlib)))
-              unless WXRuby3.config.update_shlib_loadpaths(inshlib)
+          begin
+            # make sure directory exists
+            FileUtils.mkdir_p(File.join('ext', 'lib'))
+            # prepare required wxWidgets shared libs
+            wxwin_inshlibs = []
+            WXRuby3::Install.wxwin_shlibs.each do |shlib|
+              if File.symlink?(shlib)
+                src_shlib = shlib
+                src_shlib = File.join(File.dirname(shlib), File.basename(File.readlink(src_shlib))) while File.symlink?(src_shlib)
+                FileUtils.ln_s(File.join('.', File.basename(src_shlib)), File.join('ext', 'lib', File.basename(shlib)))
+              else
+                FileUtils.cp(shlib, inshlib = File.join('ext', 'lib', File.basename(shlib)))
+                unless WXRuby3.config.update_shlib_loadpaths(inshlib)
+                  # cleanup and exit
+                  remove_wxwin_shlibs
+                  exit(1)
+                end
+                wxwin_inshlibs << File.expand_path(inshlib)
+              end
+            end
+            WXRuby3::Install.wxwin_plugin_libs.each do |lib, lib_path|
+              FileUtils.mkdir_p(File.join('ext', 'lib', File.dirname(lib)))
+              FileUtils.cp(lib_path, inshlib = File.join('ext', 'lib', lib))
+            end
+            if WXRuby3.config.windows? && WXRuby3.config.wx_port == :wxmsw && WXRuby3.config.features_set?('USE_WEBVIEW_EDGE')
+              # copy the WebView2 loader dll that should be installed
+              FileUtils.cp(File.join('ext', 'wxWidgets', WXRuby3::Config.instance.class::WEBVIEW2_LOADER), File.join('ext', 'lib'))
+            end
+            # prepare wxRuby shared libs
+            Dir["lib/*.#{WXRuby3.config.dll_mask}"].each do |shlib|
+              unless WXRuby3.config.update_shlib_loadpaths(shlib) && WXRuby3.config.update_shlib_ruby_libpath(shlib)
                 # cleanup and exit
-                FileUtils.rm_f(Dir["ext/*.#{WXRuby3.config.dll_mask}"])
+                remove_wxwin_shlibs
                 exit(1)
               end
-              wxwin_inshlibs << File.expand_path(inshlib)
-            end
-          end
-          # prepare wxRuby shared libs
-          Dir["lib/*.#{WXRuby3.config.dll_mask}"].each do |shlib|
-            unless WXRuby3.config.update_shlib_loadpaths(shlib) && WXRuby3.config.update_shlib_ruby_libpath(shlib)
-              # cleanup and exit
-              FileUtils.rm_f(Dir["ext/*.#{WXRuby3.config.dll_mask}"])
-              exit(1)
             end
-          end
-          (wxwin_inshlibs + Dir["lib/*.#{WXRuby3.config.dll_mask}"]).each do |shlib|
-            unless WXRuby3.config.update_shlib_wxwin_libpaths(shlib, WXRuby3::Install.wxwin_shlibs)
-              # cleanup and exit
-              FileUtils.rm_f(Dir["ext/*.#{WXRuby3.config.dll_mask}"])
-              exit(1)
+            (wxwin_inshlibs + Dir["lib/*.#{WXRuby3.config.dll_mask}"]).each do |shlib|
+              unless WXRuby3.config.update_shlib_wxwin_libpaths(shlib, WXRuby3::Install.wxwin_shlibs)
+                # cleanup and exit
+                remove_wxwin_shlibs
+                exit(1)
+              end
             end
+          rescue
+            remove_wxwin_shlibs
+            raise
           end
           $stdout.puts 'done!' if WXRuby3.config.run_silent?
         end
@@ -96,7 +123,7 @@ module WXRuby3
 
       def remove_wxwin_shlibs
         if WXRuby3.config.get_config('with-wxwin')
-          WXRuby3::Install.wxwin_shlibs.each { |shlib| FileUtils.rm_f(File.join('ext', File.basename(shlib))) }
+          FileUtils.rm_rf(File.join('ext', 'lib'))
         end
       end
 

data/rakelib/lib/config/macosx.rb

@@ -194,13 +194,15 @@ module WXRuby3
             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 " +
+                     "--disable-optimise --disable-sys-libs --without-liblzma --without-regex " \
+                     "--prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info " \
+                     "#{wx_with_webview? ? '--enable-webview' : '--disable-webview'} " \
                      "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 " +
+              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 " \
+                     "#{wx_with_webview? ? '--enable-webview' : '--disable-webview'} " \
                      "CFLAGS=\"-Wno-unused-but-set-variable\"")
             end
           end