wxruby3 1.6.1 → 1.7.0

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

@@ -0,0 +1,73 @@
+#-------------------------------------------------------------------------
+# This file is automatically generated by the WXRuby3 interface generator.
+# Do not alter this file.
+#-------------------------------------------------------------------------
+
+class Wx::EvtHandler
+  # from wxPropertyGridEvent
+  self.register_event_type EventType[
+      'evt_pg_selected', 1,
+      Wx::PG::EVT_PG_SELECTED,
+      Wx::PG::PropertyGridEvent
+    ]
+  self.register_event_type EventType[
+      'evt_pg_changed', 1,
+      Wx::PG::EVT_PG_CHANGED,
+      Wx::PG::PropertyGridEvent
+    ]
+  self.register_event_type EventType[
+      'evt_pg_changing', 1,
+      Wx::PG::EVT_PG_CHANGING,
+      Wx::PG::PropertyGridEvent
+    ]
+  self.register_event_type EventType[
+      'evt_pg_highlighted', 1,
+      Wx::PG::EVT_PG_HIGHLIGHTED,
+      Wx::PG::PropertyGridEvent
+    ]
+  self.register_event_type EventType[
+      'evt_pg_right_click', 1,
+      Wx::PG::EVT_PG_RIGHT_CLICK,
+      Wx::PG::PropertyGridEvent
+    ]
+  self.register_event_type EventType[
+      'evt_pg_double_click', 1,
+      Wx::PG::EVT_PG_DOUBLE_CLICK,
+      Wx::PG::PropertyGridEvent
+    ]
+  self.register_event_type EventType[
+      'evt_pg_item_collapsed', 1,
+      Wx::PG::EVT_PG_ITEM_COLLAPSED,
+      Wx::PG::PropertyGridEvent
+    ]
+  self.register_event_type EventType[
+      'evt_pg_item_expanded', 1,
+      Wx::PG::EVT_PG_ITEM_EXPANDED,
+      Wx::PG::PropertyGridEvent
+    ]
+  self.register_event_type EventType[
+      'evt_pg_label_edit_begin', 1,
+      Wx::PG::EVT_PG_LABEL_EDIT_BEGIN,
+      Wx::PG::PropertyGridEvent
+    ]
+  self.register_event_type EventType[
+      'evt_pg_label_edit_ending', 1,
+      Wx::PG::EVT_PG_LABEL_EDIT_ENDING,
+      Wx::PG::PropertyGridEvent
+    ]
+  self.register_event_type EventType[
+      'evt_pg_col_begin_drag', 1,
+      Wx::PG::EVT_PG_COL_BEGIN_DRAG,
+      Wx::PG::PropertyGridEvent
+    ]
+  self.register_event_type EventType[
+      'evt_pg_col_dragging', 1,
+      Wx::PG::EVT_PG_COL_DRAGGING,
+      Wx::PG::PropertyGridEvent
+    ]
+  self.register_event_type EventType[
+      'evt_pg_col_end_drag', 1,
+      Wx::PG::EVT_PG_COL_END_DRAG,
+      Wx::PG::PropertyGridEvent
+    ]
+end

data/lib/wx/pg/pg_property.rb

@@ -27,6 +27,32 @@ module Wx
       PG_PROGRAMMATIC_VALUE             = PGPropValFormatFlags::ProgrammaticValue
     end
 
+    # since wxWidgets 3.3.0
+    unless const_defined?(:PGPropertyFlags)
+      module PGPropertyFlags
+        PG_PROP_MODIFIED = PGFlags::Modified
+        PG_PROP_DISABLED = PGFlags::Disabled
+        PG_PROP_HIDDEN = PGFlags::Hidden
+        PG_PROP_CUSTOMIMAGE = PGFlags::CustomImage
+        PG_PROP_NOEDITOR = PGFlags::NoEditor
+        PG_PROP_COLLAPSED = PGFlags::Collapsed
+        PG_PROP_INVALID_VALUE = PGFlags::InvalidValue
+        PG_PROP_WAS_MODIFIED = PGFlags::WasModified
+        PG_PROP_AGGREGATE = PGFlags::Aggregate
+        PG_PROP_CHILDREN_ARE_COPIES = PGFlags::ChildrenAreCopies
+        PG_PROP_PROPERTY = PGFlags::Property
+        PG_PROP_CATEGORY = PGFlags::Category
+        PG_PROP_MISC_PARENT = PGFlags::MiscParent
+        PG_PROP_READONLY = PGFlags::ReadOnly
+        PG_PROP_COMPOSED_VALUE = PGFlags::ComposedValue
+        PG_PROP_USES_COMMON_VALUE = PGFlags::UsesCommonValue
+        PG_PROP_BEING_DELETED = PGFlags::BeingDeleted
+
+        PG_PROP_PARENTAL_FLAGS = PGFlags::ParentalFlags
+        PG_STRING_STORED_FLAGS = PGFlags::StringStoredFlags
+      end
+    end
+
     def self.PG_IT_CHILDREN(mask)
       mask << 16
     end

data/lib/wx/pg/property_grid_interface.rb

@@ -30,7 +30,7 @@ module Wx::PG
     end
 
     wx_each_property = instance_method :each_property
-    wx_redefine_method :each_property do |flags = Wx::PG::PG_ITERATE_DEFAULT, start = nil, reverse: false, &block|
+    wx_redefine_method :each_property do |flags = Wx::PG::PG_ITERATE_DEFAULT, start = nil, reverse = false, &block|
       if block
         wx_each_property.bind(self).call(flags.to_int, start, reverse, &block)
       else
@@ -40,7 +40,7 @@ module Wx::PG
     alias :properties :each_property
 
     def reverse_each_property(flags = Wx::PG::PG_ITERATE_DEFAULT, start = nil, &block)
-      each_property(flags, start, reverse: true, &block)
+      each_property(flags, start, true, &block)
     end
     alias :properties_reversed :reverse_each_property
 

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

@@ -0,0 +1,102 @@
+#-------------------------------------------------------------------------
+# This file is automatically generated by the WXRuby3 interface generator.
+# Do not alter this file.
+#-------------------------------------------------------------------------
+
+class Wx::EvtHandler
+  # from wxRibbonBarEvent
+  # from wxRibbonButtonBarEvent
+  # from wxRibbonGalleryEvent
+  # from wxRibbonPanelEvent
+  # from wxRibbonToolBarEvent
+  # from wxRibbonBar
+  self.register_event_type EventType[
+      'evt_ribbonbar_page_changed', 1,
+      Wx::RBN::EVT_RIBBONBAR_PAGE_CHANGED,
+      Wx::RBN::RibbonBarEvent
+    ]
+  self.register_event_type EventType[
+      'evt_ribbonbar_page_changing', 1,
+      Wx::RBN::EVT_RIBBONBAR_PAGE_CHANGING,
+      Wx::RBN::RibbonBarEvent
+    ]
+  self.register_event_type EventType[
+      'evt_ribbonbar_tab_middle_down', 1,
+      Wx::RBN::EVT_RIBBONBAR_TAB_MIDDLE_DOWN,
+      Wx::RBN::RibbonBarEvent
+    ]
+  self.register_event_type EventType[
+      'evt_ribbonbar_tab_middle_up', 1,
+      Wx::RBN::EVT_RIBBONBAR_TAB_MIDDLE_UP,
+      Wx::RBN::RibbonBarEvent
+    ]
+  self.register_event_type EventType[
+      'evt_ribbonbar_tab_right_down', 1,
+      Wx::RBN::EVT_RIBBONBAR_TAB_RIGHT_DOWN,
+      Wx::RBN::RibbonBarEvent
+    ]
+  self.register_event_type EventType[
+      'evt_ribbonbar_tab_right_up', 1,
+      Wx::RBN::EVT_RIBBONBAR_TAB_RIGHT_UP,
+      Wx::RBN::RibbonBarEvent
+    ]
+  self.register_event_type EventType[
+      'evt_ribbonbar_tab_left_dclick', 1,
+      Wx::RBN::EVT_RIBBONBAR_TAB_LEFT_DCLICK,
+      Wx::RBN::RibbonBarEvent
+    ]
+  self.register_event_type EventType[
+      'evt_ribbonbar_toggled', 1,
+      Wx::RBN::EVT_RIBBONBAR_TOGGLED,
+      Wx::RBN::RibbonBarEvent
+    ]
+  self.register_event_type EventType[
+      'evt_ribbonbar_help_click', 1,
+      Wx::RBN::EVT_RIBBONBAR_HELP_CLICK,
+      Wx::RBN::RibbonBarEvent
+    ]
+  # from wxRibbonGallery
+  self.register_event_type EventType[
+      'evt_ribbongallery_selected', 1,
+      Wx::RBN::EVT_RIBBONGALLERY_SELECTED,
+      Wx::RBN::RibbonGalleryEvent
+    ]
+  self.register_event_type EventType[
+      'evt_ribbongallery_clicked', 1,
+      Wx::RBN::EVT_RIBBONGALLERY_CLICKED,
+      Wx::RBN::RibbonGalleryEvent
+    ]
+  self.register_event_type EventType[
+      'evt_ribbongallery_hover_changed', 1,
+      Wx::RBN::EVT_RIBBONGALLERY_HOVER_CHANGED,
+      Wx::RBN::RibbonGalleryEvent
+    ]
+  # from wxRibbonPanel
+  self.register_event_type EventType[
+      'evt_ribbonpanel_extbutton_activated', 1,
+      Wx::RBN::EVT_RIBBONPANEL_EXTBUTTON_ACTIVATED,
+      Wx::RBN::RibbonPanelEvent
+    ]
+  # from wxRibbonToolBar
+  self.register_event_type EventType[
+      'evt_ribbontoolbar_clicked', 1,
+      Wx::RBN::EVT_RIBBONTOOLBAR_CLICKED,
+      Wx::RBN::RibbonToolBarEvent
+    ]
+  self.register_event_type EventType[
+      'evt_ribbontoolbar_dropdown_clicked', 1,
+      Wx::RBN::EVT_RIBBONTOOLBAR_DROPDOWN_CLICKED,
+      Wx::RBN::RibbonToolBarEvent
+    ]
+  # from wxRibbonButtonBar
+  self.register_event_type EventType[
+      'evt_ribbonbuttonbar_clicked', 1,
+      Wx::RBN::EVT_RIBBONBUTTONBAR_CLICKED,
+      Wx::RBN::RibbonButtonBarEvent
+    ]
+  self.register_event_type EventType[
+      'evt_ribbonbuttonbar_dropdown_clicked', 1,
+      Wx::RBN::EVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED,
+      Wx::RBN::RibbonButtonBarEvent
+    ]
+end

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

@@ -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/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