wxruby3 1.6.1 → 1.8.0

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

@@ -0,0 +1,98 @@
+#-------------------------------------------------------------------------
+# This file is automatically generated by the WXRuby3 interface generator.
+# Do not alter this file.
+#-------------------------------------------------------------------------
+
+class Wx::EvtHandler
+  # from wxRichTextEvent
+  self.register_event_type EventType[
+      'evt_richtext_left_click', 1,
+      Wx::RTC::EVT_RICHTEXT_LEFT_CLICK,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_right_click', 1,
+      Wx::RTC::EVT_RICHTEXT_RIGHT_CLICK,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_middle_click', 1,
+      Wx::RTC::EVT_RICHTEXT_MIDDLE_CLICK,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_left_dclick', 1,
+      Wx::RTC::EVT_RICHTEXT_LEFT_DCLICK,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_return', 1,
+      Wx::RTC::EVT_RICHTEXT_RETURN,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_character', 1,
+      Wx::RTC::EVT_RICHTEXT_CHARACTER,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_consuming_character', 1,
+      Wx::RTC::EVT_RICHTEXT_CONSUMING_CHARACTER,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_delete', 1,
+      Wx::RTC::EVT_RICHTEXT_DELETE,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_style_changed', 1,
+      Wx::RTC::EVT_RICHTEXT_STYLE_CHANGED,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_stylesheet_changed', 1,
+      Wx::RTC::EVT_RICHTEXT_STYLESHEET_CHANGING,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_stylesheet_replacing', 1,
+      Wx::RTC::EVT_RICHTEXT_STYLESHEET_REPLACING,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_stylesheet_replaced', 1,
+      Wx::RTC::EVT_RICHTEXT_STYLESHEET_REPLACED,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_properties_changed', 1,
+      Wx::RTC::EVT_RICHTEXT_PROPERTIES_CHANGED,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_content_inserted', 1,
+      Wx::RTC::EVT_RICHTEXT_CONTENT_INSERTED,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_content_deleted', 1,
+      Wx::RTC::EVT_RICHTEXT_CONTENT_DELETED,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_buffer_reset', 1,
+      Wx::RTC::EVT_RICHTEXT_BUFFER_RESET,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_selection_changed', 1,
+      Wx::RTC::EVT_RICHTEXT_SELECTION_CHANGED,
+      Wx::RTC::RichTextEvent
+    ]
+  self.register_event_type EventType[
+      'evt_richtext_focus_object_changed', 1,
+      Wx::RTC::EVT_RICHTEXT_FOCUS_OBJECT_CHANGED,
+      Wx::RTC::RichTextEvent
+    ]
+end

data/lib/wx/rtc/ext/rich_text_ctrl.rb

@@ -0,0 +1,24 @@
+# ----------------------------------------------------------------------------
+# This file is automatically generated by the WXRuby3 code 
+# generator. Do not alter this file.
+# ----------------------------------------------------------------------------
+
+module Wx
+  module RTC
+
+  RICHTEXT_DEFAULT_OVERALL_SIZE = Wx::Size.new(-1, -1)
+
+  RICHTEXT_DEFAULT_IMAGE_SIZE = Wx::Size.new(80, 80)
+
+  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_UNFOCUSSED_BACKGROUND, 'Wx::Colour.new(175, 175, 175)') { Wx::Colour.new(175, 175, 175) }
+
+  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_FOCUSSED_BACKGROUND, 'Wx::Colour.new(140, 140, 140)') { Wx::Colour.new(140, 140, 140) }
+
+  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_UNSELECTED_BACKGROUND, 'Wx::SystemSettings.get_colour(Wx::SYS_COLOUR_3DFACE)') { Wx::SystemSettings.get_colour(Wx::SYS_COLOUR_3DFACE) }
+
+  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_TYPE_COLOUR, 'Wx::Colour.new(0, 0, 200)') { Wx::Colour.new(0, 0, 200) }
+
+  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_FOCUS_RECT_COLOUR, 'Wx::Colour.new(100, 80, 80)') { Wx::Colour.new(100, 80, 80) }
+
+  end
+end

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.1'
+  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

@@ -37,6 +37,21 @@ 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('--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',
@@ -76,6 +91,12 @@ 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']
         cfg_args << "--git=#{Setup.options['git']}" if Setup.options['git']

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

@@ -82,8 +82,26 @@ 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('--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',
@@ -107,6 +125,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
@@ -152,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.rake

@@ -79,9 +79,10 @@ file WXRuby3::Gem.gemspec_file => WXRuby3::Gem.manifest do |t|
       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 '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' <<

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))