wxruby3 1.7.0 → 1.8.0

data/lib/wx/doc/mbconv.rb

@@ -0,0 +1,108 @@
+# :stopdoc:
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# :startdoc:
+
+
+module Wx
+
+  # This class is the base class of a hierarchy of classes capable of converting text strings between multibyte
+  # (SBCS or DBCS) encodings and Unicode.
+  #
+  # This is an abstract base class which defines the operations implemented by all different conversion classes.
+  #
+  # @note Note that in wxRuby these classes only provide types without any operations as these are not required
+  #       as Ruby provides its own perfectly good encoding conversion methods. These types are therefor only required
+  #       to provide as argument to certain methods of the wrapped wxWidgets classes (see for example {Wx::WEB::WebViewHandlerResponse}).
+  class MBConv
+    protected def initialize; end
+  end
+
+  # This class converts between any character set supported by the system and Unicode.
+  class CSConv < MBConv
+
+  end
+
+  # This class implements a Unicode to/from multibyte converter capable of automatically recognizing the encoding of the
+  # multibyte text on input.
+  #
+  # The logic used is very simple: the class uses the BOM (byte order mark) if it's present and tries to interpret the
+  # input as UTF-8 otherwise. If this fails, the input is interpreted as being in the default multibyte encoding which
+  # can be specified in the constructor of a {Wx::ConvAuto} instance and, in turn, defaults to a fallback encoding if not
+  # explicitly given.
+  #
+  # For the conversion from Unicode to multibyte, the same encoding as was previously used for multibyte to Unicode conversion is reused. If there had been no previous multibyte to Unicode conversion, UTF-8 is used by default. Notice that once the multibyte encoding is automatically detected, it doesn't change any more, i.e. it is entirely determined by the first use of wxConvAuto object in the multibyte-to-Unicode direction. However creating a copy of wxConvAuto object, either via the usual copy constructor or assignment operator, or using wxMBConv::Clone(), resets the automatically detected encoding so that the new copy will try to detect the encoding of the input on first use.
+  #
+  # This class is used by default in wxWidgets classes and functions reading text from files such as wxFile, wxFFile, wxTextFile, wxFileConfig and various stream classes so the encoding set with its SetFallbackEncoding() method will affect how these classes treat input files. In particular, use this method to change the fall-back multibyte encoding used to interpret the contents of the files whose contents isn't valid UTF-8 or to disallow it completely.
+  class ConvAuto < MBConv
+
+    # Constructs a new Wx::ConvAuto instance.
+    #
+    # The object will try to detect the input of the given multibyte text automatically but if the automatic detection
+    # of Unicode encodings fails, the fall-back encoding enc will be used to interpret it as multibyte text.
+    #
+    # The default value of enc, {Wx::FONTENCODING_DEFAULT}, means that the global default value (which can be set using
+    # {Wx::ConvAuto#set_fallback_encoding}) should be used. As with that method, passing Wx::FONTENCODING_MAX inhibits
+    # using this encoding completely so the input multibyte text will always be interpreted as UTF-8 in the absence of
+    # BOM and the conversion will fail if the input doesn't form valid UTF-8 sequence.
+    #
+    # Another special value is {Wx::FONTENCODING_SYSTEM} which means to use the encoding currently used on the user system,
+    # i.e. the encoding returned by {Wx::Locale#get_system_encoding}. Any other encoding will be used as is, e.g. passing
+    # {Wx::FONTENCODING_ISO8859_1} ensures that non-UTF-8 input will be treated as latin1.
+    # @param [Wx::FontEncoding] enc
+    def initialize(enc=Wx::FONTENCODING_DEFAULT); end
+
+    # Disable the use of the fallback encoding: if the input doesn't have a BOM and is not valid UTF-8, the conversion
+    # will fail.
+    def self.disable_fallback_encoding; end
+
+    # Returns the encoding used by default by {Wx::ConvAuto} if no other encoding is explicitly specified in constructor.
+    #
+    # By default, returns {Wx::FONTENCODING_ISO8859_1} but can be changed using #set_fallback_encoding.
+    # @return [Wx::FontEncoding]
+    def self.get_fallback_encoding; end
+
+    # Changes the encoding used by default by {Wx::ConvAuto} if no other encoding is explicitly specified in constructor.
+    #
+    # The default value, which can be retrieved using #get_fallback_encoding, is {Wx::FONTENCODING_ISO8859_1}.
+    #
+    # Special values of {Wx::FONTENCODING_SYSTEM} or {Wx::FONTENCODING_MAX} can be used for the enc parameter to use
+    # the encoding of the current user locale as fall back or not use any encoding for fall back at all, respectively
+    # (just as with the similar constructor parameter). However, {Wx::FONTENCODING_DEFAULT} can't be used here.
+    # @param [Wx::FontEncoding] enc
+    def self.set_fallback_encoding(enc); end
+  end
+
+  # This class is used to convert between multibyte encodings and UTF-16 Unicode encoding (also known as UCS-2).
+  #
+  # Unlike UTF-8 encoding, UTF-16 uses words and not bytes and hence depends on the byte ordering: big or little endian.
+  # Hence this class is provided in a little endian version and a big endian version. {Wx::MBConvUTF16} always provides
+  # the implementation native to the current platform (e.g. LE under Windows and BE under Mac).
+  class MBConvUTF16 < MBConv
+    def initialize; end
+  end
+
+  #This class is used to convert between multibyte encodings and UTF-32 Unicode encoding (also known as UCS-4).
+  #
+  # Unlike UTF-8 encoding, UTF-32 uses (double) words and not bytes and hence depends on the byte ordering: big or
+  # little endian. Hence this class is provided in in a little endian version and a big endian version. {Wx::MBConvUTF32}
+  # always provides the implementation native to the current platform (e.g. LE under Windows and BE under Mac).
+  class MBConvUTF32 < MBConv
+    def initialize; end
+  end
+
+  # This class converts between the UTF-7 encoding and Unicode.
+  #
+  # Notice that, unlike all the other conversion objects, this converter is stateful, and therefor <b>not</b> thread-safe.
+  # It has one predefined instance, Wx::ConvUTF7.
+  class MBConvUTF7 < MBConv
+    def initialize; end
+  end
+
+  # This class converts between the UTF-8 encoding and Unicode.
+  # It has one predefined instance, Wx::ConvUTF8.
+  class MBConvUTF8 < MBConv
+    def initialize; end
+  end
+end

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/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/events/evt_list.rb

@@ -0,0 +1,8 @@
+#-------------------------------------------------------------------------
+# This file is automatically generated by the WXRuby3 interface generator.
+# Do not alter this file.
+#-------------------------------------------------------------------------
+
+class Wx::EvtHandler
+  # from wxThreadEvent
+end

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.0'
 end

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

@@ -0,0 +1,74 @@
+#-------------------------------------------------------------------------
+# This file is automatically generated by the WXRuby3 interface generator.
+# Do not alter this file.
+#-------------------------------------------------------------------------
+
+class Wx::EvtHandler
+  # from wxWebViewEvent
+  self.register_event_type EventType[
+      'evt_webview_created', 1,
+      Wx::WEB::EVT_WEBVIEW_CREATED,
+      Wx::WEB::WebViewEvent
+    ]
+  self.register_event_type EventType[
+      'evt_webview_navigating', 1,
+      Wx::WEB::EVT_WEBVIEW_NAVIGATING,
+      Wx::WEB::WebViewEvent
+    ]
+  self.register_event_type EventType[
+      'evt_webview_navigated', 1,
+      Wx::WEB::EVT_WEBVIEW_NAVIGATED,
+      Wx::WEB::WebViewEvent
+    ]
+  self.register_event_type EventType[
+      'evt_webview_loaded', 1,
+      Wx::WEB::EVT_WEBVIEW_LOADED,
+      Wx::WEB::WebViewEvent
+    ]
+  self.register_event_type EventType[
+      'evt_webview_error', 1,
+      Wx::WEB::EVT_WEBVIEW_ERROR,
+      Wx::WEB::WebViewEvent
+    ]
+  self.register_event_type EventType[
+      'evt_webview_newwindow', 1,
+      Wx::WEB::EVT_WEBVIEW_NEWWINDOW,
+      Wx::WEB::WebViewEvent
+    ]
+  self.register_event_type EventType[
+      'evt_webview_newwindow_features', 1,
+      Wx::WEB::EVT_WEBVIEW_NEWWINDOW_FEATURES,
+      Wx::WEB::WebViewEvent
+    ]
+  self.register_event_type EventType[
+      'evt_webview_window_close_requested', 1,
+      Wx::WEB::EVT_WEBVIEW_WINDOW_CLOSE_REQUESTED,
+      Wx::WEB::WebViewEvent
+    ]
+  self.register_event_type EventType[
+      'evt_webview_title_changed', 1,
+      Wx::WEB::EVT_WEBVIEW_TITLE_CHANGED,
+      Wx::WEB::WebViewEvent
+    ]
+  self.register_event_type EventType[
+      'evt_webview_fullscreen_changed', 1,
+      Wx::WEB::EVT_WEBVIEW_FULLSCREEN_CHANGED,
+      Wx::WEB::WebViewEvent
+    ]
+  self.register_event_type EventType[
+      'evt_webview_script_message_received', 1,
+      Wx::WEB::EVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED,
+      Wx::WEB::WebViewEvent
+    ]
+  self.register_event_type EventType[
+      'evt_webview_script_result', 1,
+      Wx::WEB::EVT_WEBVIEW_SCRIPT_RESULT,
+      Wx::WEB::WebViewEvent
+    ]
+  self.register_event_type EventType[
+      'evt_webview_browsing_data_cleared', 1,
+      Wx::WEB::EVT_WEBVIEW_BROWSING_DATA_CLEARED,
+      Wx::WEB::WebViewEvent
+    ]
+  # from wxWebView
+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.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))