wxruby3 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db9a443c40a2d1cd6ea3d993fe894ad61d1ce737c2a871877ef88ca06d39a629
-  data.tar.gz: 43cd46e0283fb6c6706362caa9c6c098bc2cff55216e1d98509c04912afdcf6b
+  metadata.gz: ba2a7c48f9f24e515c6891a059c0b1801f91bd11fe0dcc4d2d82c76fb810da0b
+  data.tar.gz: 9bb9ada532a116f6826dc394a0f418f278115c65b7c80702f15c80274bc44628
 SHA512:
-  metadata.gz: 67d5f62560609aa87f68563a8a51304e87242ca9a084d74ce7f4b2bb65e8765a0d349530c04716d5e34a22e0d62a61e1a2f127fc4a6ebc05f0b4b1591357fd66
-  data.tar.gz: bafef4ef1d2f06912ccb0c0dad7d86ed236b6c81862c0309e05fad54de634448d18d78f78bef43d70d1952abaeb38fafb86c7624f015597e6ed5aa46e3dbc602
+  metadata.gz: ed03bde1136e78acd711d2b1ffc696306840ca3f5032d8cd90b64f4eba005772c8de0a475035c0441537302f33a28b981f391f992715ef72207ed451b3e4bf74
+  data.tar.gz: a4e78a5adafd2cc15e05b113a2146de556bf86312d3cc2f7709b13103ecc7248c150127ff710547e63deb8055e4cf220df7ec963265a3e5b07582bbf6b5802be

data/lib/wx/core/evthandler.rb

@@ -298,6 +298,14 @@ module Wx
       evt_mousewheel(*args, &block)
     end
 
+    # Convenience evt_handler to listen to all joystick events.
+    def evt_joystick_events(*args, &block)
+      evt_joy_button_down(*args, &block)
+      evt_joy_button_up(*args, &block)
+      evt_joy_move(*args, &block)
+      evt_joy_zmove(*args, &block)
+    end
+
     # Convenience evt handler to listen to all scrollwin events.
     def evt_scrollwin(meth = nil, &block)
       evt_scrollwin_top(meth, &block)

data/lib/wx/doc/evthandler.rb

@@ -99,29 +99,6 @@ module Wx
     # @yieldparam [Wx::CommandEvent] event event to handle
     def evt_command_range(id1, id2, evt_id, meth = nil, &block) end
 
-    # Convenience evt_handler to listen to all mouse events.
-    # @yieldparam [Wx::MouseEvent] event event to handle
-    def evt_mouse_events(*args, &block) end
-
-    # Convenience evt handler to listen to all scrollwin events
-    # (from Wx::ScrolledWindow).
-    # @param [String,Symbol,Method,Proc] meth (name of) method or event handling proc
-    # @yieldparam [Wx::ScrollWinEvent] event event to handle
-    def evt_scrollwin(meth = nil, &block) end
-
-    # Convenience evt handler to listen to all scroll events
-    # (from Wx::Slider and Wx::ScrollBar).
-    # @param [String,Symbol,Method,Proc] meth (name of) method or event handling proc
-    # @yieldparam [Wx::ScrollWinEvent] event event to handle
-    def evt_scroll(meth = nil, &block) end
-
-    # Convenience evt handler to listen to all scroll events
-    # (from Wx::Slider and Wx::ScrollBar) with an id.
-    # @param [Integer] id window identifier
-    # @param [String,Symbol,Method,Proc] meth (name of) method or event handling proc
-    # @yieldparam [Wx::ScrollWinEvent] event event to handle
-    def evt_scroll_command(id, meth = nil, &block) end
-
     # Processes Wx::WindowDestroyEvent events.
     # In wxRuby Wx::Event#skipped will be forced to true after the provided
     # handler has finished to make sure the event is propagated as it is

data/lib/wx/version.rb

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

data/rakelib/lib/config/macosx.rb

@@ -158,10 +158,37 @@ module WXRuby3
           private
 
           def wx_configure
-            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 " +
-                   "CFLAGS=\"-Wno-unused-but-set-variable\"")
+            wxw_ver = nil
+            if WXRuby3.config.sysinfo.os.release >= '15'
+              # try to detect wxWidgets version
+              verfile = File.join(ext_path, 'wxWidgets', 'include', 'wx', 'version.h')
+              if File.exist?(verfile)
+                v_major = v_minor = v_release = nil
+                File.foreach(verfile) do |line|
+                  case line
+                  when /\#define\s+wxMAJOR_VERSION\s+(\d+)/
+                    v_major = $1.to_i
+                  when /\#define\s+wxMINOR_VERSION\s+(\d+)/
+                    v_minor = $1.to_i
+                  when /\#define\s+wxRELEASE_NUMBER\s+(\d+)/
+                    v_release = $1.to_i
+                  end
+                end
+                wxw_ver = "#{v_major}.#{v_minor}.#{v_release}"
+              end
+            end
+            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 " +
+                     "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 " +
+                     "CFLAGS=\"-Wno-unused-but-set-variable\"")
+            end
           end
 
           def wx_make

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

@@ -30,6 +30,13 @@ module WXRuby3
             self
           end
 
+          def alias(distro, release, alias_distro, alias_release)
+            if @dependencies.has_key?(distro) && @dependencies[distro].has_key?(release)
+              @dependencies[alias_distro][alias_release] = @dependencies[distro][release]
+            end
+            self
+          end
+
           def get(distro, release: nil)
             @dependencies[distro][release]
           end
@@ -37,7 +44,8 @@ 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('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'),
+                                      .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'),
           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])

data/rakelib/lib/core/package.rb

@@ -526,28 +526,6 @@ module WXRuby3
         end
       end
 
-      def generate_event_types(fout, item, evts_handled)
-        fout.puts "  # from #{item.name}"
-        item.event_types.each do |evt_hnd, evt_type, evt_arity, evt_klass, _|
-          evh_name = evt_hnd.downcase
-          unless evts_handled.include?(evh_name)
-            evt_klass ||= if item.event
-                            item.name
-                          else
-                            raise "Don't know Event class for #{evh_name} event type (from #{item.name})"
-                          end
-            fout.puts '  '+<<~__HEREDOC.split("\n").join("\n  ")
-              self.register_event_type EventType[
-                  '#{evh_name}', #{evt_arity},
-                  #{fullname}::#{evt_type},
-                  #{fullname}::#{evt_klass.sub(/\Awx/i, '')}
-                ] if #{fullname}.const_defined?(:#{evt_type})
-            __HEREDOC
-            evts_handled << evh_name
-          end
-        end
-      end
-
       class << self
         # need to share these over all packages since events may be defined in multiple
         def generated_events
@@ -561,6 +539,46 @@ module WXRuby3
           end
           @event_list_packages
         end
+
+        # some event handler (catch-all) macros need custom coding so we need to skip
+        # them when generating
+        def ignored_event_handlers
+          @ignored_event_handlers ||= Set.new
+        end
+
+        def full_docs?
+          if @full_docs.nil?
+            @full_docs = !!ENV['WXRUBY_FULLDOCS']
+          end
+          @full_docs
+        end
+      end
+
+      def generate_event_types(fout, item, evts_handled)
+        fout.puts "  # from #{item.name}"
+        item.event_types.each do |evt_hnd, evt_type, evt_arity, evt_klass, _|
+          unless Package.ignored_event_handlers.include?(evt_hnd)
+            evh_name = evt_hnd.downcase
+            unless evts_handled.include?(evh_name)
+              evt_klass ||= item.name if item.event
+              # skip if we do not have an actually existing event class
+              if (item.event && item.name == evt_klass) ||
+                    (evt_klass && included_directors.any? { |dir| dir.defmod.find_item(evt_klass) })
+
+                evt_klass ||= item.name
+                fout.puts '  '+<<~__HEREDOC.split("\n").join("\n  ")
+                  self.register_event_type EventType[
+                      '#{evh_name}', #{evt_arity},
+                      #{fullname}::#{evt_type},
+                      #{fullname}::#{evt_klass.sub(/\Awx/i, '')}
+                    ]
+                __HEREDOC
+                evts_handled << evh_name
+
+              end
+            end
+          end
+        end
       end
 
       def generate_event_list
@@ -635,31 +653,36 @@ module WXRuby3
         item.event_types.each do |evt_hnd, evt_type, evt_arity, evt_klass, evt_nodoc|
           evh_name = evt_hnd.downcase
           unless evts_handled.include?(evh_name)
-            evt_klass ||= item.name
-            evh_args, evh_docstr = evt_nodoc ? nil : find_event_doc(evh_name)
-            fdoc.doc.puts evh_docstr if evh_docstr
-            fdoc.doc.puts "Processes a {#{fullname}::#{evt_type}} event." unless /Process.*\s(event|command)/ =~ evh_docstr
-            case evt_arity
-            when 0
-              evh_args = 'meth = nil, &block' unless evh_args
-            when 1
-              evh_args = 'id, meth = nil, &block' unless evh_args
-              argnms = evh_args.split(',')
-              fdoc.doc.puts "@param [Integer,Wx::Enum,Wx::Window,Wx::MenuItem,Wx::ToolBarTool,Wx::Timer] #{argnms.shift.strip} window/control id"
-            when 2
-              evh_args = 'first_id, last_id, meth = nil, &block' unless evh_args
-              argnms = evh_args.split(',')
-              fdoc.doc.puts "@param [Integer,Wx::Enum,Wx::Window,Wx::MenuItem,Wx::ToolBarTool,Wx::Timer] #{argnms.shift.strip} first window/control id of range"
-              fdoc.doc.puts "@param [Integer,Wx::Enum,Wx::Window,Wx::MenuItem,Wx::ToolBarTool,Wx::Timer] #{argnms.shift.strip} last window/control id of range"
-            end
-            fdoc.doc.puts "@param [String,Symbol,Method,Proc] meth (name of) method or handler proc"
-            #fdoc.doc.puts "@param [Proc] block handler block"
-            fdoc.doc.puts "@yieldparam [#{fullname}::#{evt_klass.sub(/\Awx/i, '')}] event the event to handle"
+            evt_klass ||= item.name if item.event
+            # skip if we do not have an actually existing event class (for this platform)
+            if Package.full_docs? || (item.event && item.name == evt_klass) ||
+              (evt_klass && included_directors.any? { |dir| dir.defmod.find_item(evt_klass) })
+
+              evh_args, evh_docstr = evt_nodoc ? nil : find_event_doc(evh_name)
+              fdoc.doc.puts evh_docstr if evh_docstr
+              fdoc.doc.puts "Processes a {#{fullname}::#{evt_type}} event." unless /Process.*\s(event|command)/ =~ evh_docstr
+              case evt_arity
+              when 0
+                evh_args = 'meth = nil, &block' unless evh_args
+              when 1
+                evh_args = 'id, meth = nil, &block' unless evh_args
+                argnms = evh_args.split(',')
+                fdoc.doc.puts "@param [Integer,Wx::Enum,Wx::Window,Wx::MenuItem,Wx::ToolBarTool,Wx::Timer] #{argnms.shift.strip} window/control id"
+              when 2
+                evh_args = 'first_id, last_id, meth = nil, &block' unless evh_args
+                argnms = evh_args.split(',')
+                fdoc.doc.puts "@param [Integer,Wx::Enum,Wx::Window,Wx::MenuItem,Wx::ToolBarTool,Wx::Timer] #{argnms.shift.strip} first window/control id of range"
+                fdoc.doc.puts "@param [Integer,Wx::Enum,Wx::Window,Wx::MenuItem,Wx::ToolBarTool,Wx::Timer] #{argnms.shift.strip} last window/control id of range"
+              end
+              fdoc.doc.puts "@param [String,Symbol,Method,Proc] meth (name of) method or handler proc"
+              #fdoc.doc.puts "@param [Proc] block handler block"
+              fdoc.doc.puts "@yieldparam [#{fullname}::#{evt_klass.sub(/\Awx/i, '')}] event the event to handle"
 
-            fdoc.puts "def #{evh_name}(#{evh_args}) end"
-            fdoc.puts
+              fdoc.puts "def #{evh_name}(#{evh_args}) end"
+              fdoc.puts
 
-            evts_handled << evh_name
+              evts_handled << evh_name
+            end
           end
         end
       end
@@ -788,10 +811,6 @@ module WXRuby3
       end
       private :generate_core_doc
 
-      def self.full_docs?
-        !!ENV['WXRUBY_FULLDOCS']
-      end
-
       def generate_docs
         # make sure all modules have been extracted from xml
         included_directors.each {|dir| dir.extract_interface(false, gendoc: true) }

data/rakelib/lib/director/events.rb

@@ -23,10 +23,12 @@ module WXRuby3
           wxSizeEvent wxMoveEvent wxPaintEvent wxEraseEvent wxFocusEvent wxActivateEvent
           wxInitDialogEvent wxMenuEvent wxCloseEvent wxShowEvent wxIconizeEvent wxMaximizeEvent
           wxFullScreenEvent wxJoystickEvent wxDropFilesEvent wxUpdateUIEvent wxSysColourChangedEvent
-          wxMouseCaptureChangedEvent wxMouseCaptureLostEvent wxDisplayChangedEvent wxDPIChangedEvent
-          wxPaletteChangedEvent wxQueryNewPaletteEvent wxNavigationKeyEvent wxWindowCreateEvent
-          wxWindowDestroyEvent wxHelpEvent wxClipboardTextEvent wxContextMenuEvent wxChildFocusEvent
+          wxDPIChangedEvent wxPaletteChangedEvent wxQueryNewPaletteEvent wxNavigationKeyEvent
+          wxWindowCreateEvent wxWindowDestroyEvent wxHelpEvent wxClipboardTextEvent wxContextMenuEvent wxChildFocusEvent
           ])
+        if Config.instance.features_set?('WXMSW')
+          spec.items.concat %w[wxMouseCaptureChangedEvent wxMouseCaptureLostEvent wxDisplayChangedEvent]
+        end
         spec.fold_bases('wxMouseEvent' => %w[wxMouseState wxKeyboardState], 'wxKeyEvent' => 'wxKeyboardState')
         spec.ignore 'wxShowEvent::GetShow', 'wxIconizeEvent::Iconized'
         spec.ignore 'wxKeyEvent::GetPosition(wxCoord *,wxCoord *) const'

data/rakelib/lib/director/grid_ctrl.rb

@@ -554,9 +554,33 @@ module WXRuby3
                            '%constant char* wxGRID_VALUE_DATE = "date";',
                            '%constant char* wxGRID_VALUE_TEXT = "string";',
                            '%constant char* wxGRID_VALUE_LONG = "long";'
+        # fix naming mismatch with #evt_grid_cmd_col_size
+        spec.add_swig_code '%constant int EVT_GRID_CMD_COL_SIZE = wxEVT_GRID_COL_SIZE;',
+                           '%constant int EVT_GRID_CMD_ROW_SIZE = wxEVT_GRID_ROW_SIZE;',
+                           '%constant int EVT_GRID_CMD_EDITOR_CREATED = wxEVT_GRID_EDITOR_CREATED;',
+                           '%constant int EVT_GRID_CMD_RANGE_SELECTING = wxEVT_GRID_RANGE_SELECTING;',
+                           '%constant int EVT_GRID_CMD_RANGE_SELECTED = wxEVT_GRID_RANGE_SELECTED;'
+      end
+
+      def doc_generator
+        GridCtrlDocGenerator.new(self)
       end
     end # class GridCtrl
 
   end # class Director
 
+  class GridCtrlDocGenerator < DocGenerator
+
+    protected def gen_constants_doc(fdoc)
+      super
+      xref_table = package.all_modules.reduce(DocGenerator.constants_db) { |db, mod| db[mod] }
+      gen_constant_doc(fdoc, 'EVT_GRID_CMD_COL_SIZE', xref_table['EVT_GRID_COL_SIZE'], 'wxRuby specific alias for Wx::EVT_GRID_COL_SIZE')
+      gen_constant_doc(fdoc, 'EVT_GRID_CMD_ROW_SIZE', xref_table['EVT_GRID_ROW_SIZE'], 'wxRuby specific alias for Wx::EVT_GRID_ROW_SIZE')
+      gen_constant_doc(fdoc, 'EVT_GRID_CMD_EDITOR_CREATED', xref_table['EVT_GRID_EDITOR_CREATED'], 'wxRuby specific alias for Wx::EVT_GRID_EDITOR_CREATED')
+      gen_constant_doc(fdoc, 'EVT_GRID_CMD_RANGE_SELECTING', xref_table['EVT_GRID_RANGE_SELECTING'], 'wxRuby specific alias for Wx::wxEVT_GRID_RANGE_SELECTING')
+      gen_constant_doc(fdoc, 'EVT_GRID_CMD_RANGE_SELECTED', xref_table['EVT_GRID_RANGE_SELECTED'], 'wxRuby specific alias for Wx::wxEVT_GRID_RANGE_SELECTED')
+    end
+
+  end
+
 end # module WXRuby3

data/rakelib/lib/director/html_printout.rb

@@ -12,6 +12,8 @@ module WXRuby3
 
     class HtmlPrintout < Director
 
+      include Typemap::PrintPageRange
+
       def setup
         super
         spec.override_inheritance_chain('wxHtmlPrintout', {'wxPrintout' => 'wxPrinter'}, 'wxObject')

data/rakelib/lib/director/print_data.rb

@@ -12,6 +12,8 @@ module WXRuby3
 
     class PrintData < Director
 
+      include Typemap::PrintPageRange
+
       def setup
         super
         spec.gc_as_untracked
@@ -21,6 +23,11 @@ module WXRuby3
         # only keep the const version
         spec.ignore 'wxPageSetupDialogData::GetPrintData'
         spec.regard 'wxPageSetupDialogData::GetPrintData() const'
+        if Config.instance.wx_version >= '3.3.0'
+          # new since 3.3.0
+          spec.items << 'wxPrintPageRange'
+          spec.regard 'wxPrintPageRange::fromPage', 'wxPrintPageRange::toPage' # include public attributes
+        end
         # for GetPrintData methods
         spec.map 'wxPrintData&' => 'Wx::PrintData' do
           map_out code: '$result = SWIG_NewPointerObj(SWIG_as_voidptr(new wxPrintData(*$1)), SWIGTYPE_p_wxPrintData, SWIG_POINTER_OWN);'

data/rakelib/lib/director/printer.rb

@@ -12,6 +12,8 @@ module WXRuby3
 
     class Printer < Director
 
+      include Typemap::PrintPageRange
+
       def setup
         super
         spec.items << 'wxPrintout' << 'wxPrintPreview'

data/rakelib/lib/director/richtext_printing.rb

@@ -12,6 +12,8 @@ module WXRuby3
 
     class RichTextPrinting < Director
 
+      include Typemap::PrintPageRange
+
       def setup
         spec.items << 'wxRichTextPrintout'
         super

data/rakelib/lib/director/splitter_window.rb

@@ -20,9 +20,26 @@ module WXRuby3
         # is missing from the XML docs
         spec.extend_interface('wxSplitterWindow', 'virtual void OnInternalIdle()')
         super
+        # fix naming mismatch with #evt_splitter_dclick
+        spec.add_swig_code '%constant int EVT_SPLITTER_DCLICK = wxEVT_SPLITTER_DOUBLECLICKED;'
       end
+
+      def doc_generator
+        SplitterWindowDocGenerator.new(self)
+      end
+
     end # class SplitterWindow
 
   end # class Director
 
+  class SplitterWindowDocGenerator < DocGenerator
+
+    protected def gen_constants_doc(fdoc)
+      super
+      xref_table = package.all_modules.reduce(DocGenerator.constants_db) { |db, mod| db[mod] }
+      gen_constant_doc(fdoc, 'EVT_SPLITTER_DCLICK', xref_table['EVT_SPLITTER_DOUBLECLICKED'], 'wxRuby specific alias for Wx::EVT_SPLITTER_DOUBLECLICKED')
+    end
+
+  end
+
 end # module WXRuby3

data/rakelib/lib/director/textctrl.rb

@@ -24,11 +24,28 @@ module WXRuby3
           spec.ignore 'wxTextCtrl::GTKGetTextBuffer',
                       'wxTextCtrl::GTKGetEditable'
         end
-        if Config.instance.wx_version >= '3.3.0' && Config.instance.wx_port == :wxmsw
+        if Config.instance.wx_version >= '3.3.0'
           spec.items << 'wxTextSearch' << 'wxTextSearchResult'
-          spec.regard 'wxTextSearchResult::m_start', 'wxTextSearchResult::m_end'
-          spec.make_readonly 'wxTextSearchResult::m_start', 'wxTextSearchResult::m_end'
-          spec.rename_for_ruby 'start' => 'wxTextSearchResult::m_start',
+          spec.regard 'wxTextSearch::m_searchValue',
+                      'wxTextSearch::m_startingPosition',
+                      'wxTextSearch::m_matchCase',
+                      'wxTextSearch::m_wholeWord',
+                      'wxTextSearch::m_direction',
+                      'wxTextSearchResult::m_start',
+                      'wxTextSearchResult::m_end'
+          spec.make_readonly 'wxTextSearch::m_searchValue',
+                             'wxTextSearch::m_startingPosition',
+                             'wxTextSearch::m_matchCase',
+                             'wxTextSearch::m_wholeWord',
+                             'wxTextSearch::m_direction',
+                             'wxTextSearchResult::m_start',
+                             'wxTextSearchResult::m_end'
+          spec.rename_for_ruby 'get_search_value' => 'wxTextSearch::m_searchValue',
+                               'get_starting_position' => 'wxTextSearch::m_startingPosition',
+                               'match_case?' => 'wxTextSearch::m_matchCase',
+                               'whole_word?' => 'wxTextSearch::m_wholeWord',
+                               'get_direction' => 'wxTextSearch::m_direction',
+                               'start' => 'wxTextSearchResult::m_start',
                                'end' => 'wxTextSearchResult::m_end'
         end
         if Config.instance.wx_port == :wxqt

data/rakelib/lib/specs/interfaces.rb

@@ -8,6 +8,14 @@
 
 module WXRuby3
 
+  Director::Package.ignored_event_handlers.merge(%w[
+    EVT_SCROLL
+    EVT_COMMAND_SCROLL
+    EVT_SCROLLWIN
+    EVT_MOUSE_EVENTS
+    EVT_JOYSTICK_EVENTS
+  ])
+
   Director.Package('Wx') { |pkg|
     Director.Spec(pkg, 'wxDefs')
     Director.Spec(pkg, 'wxFunctions')

data/rakelib/lib/typemap/print_page_range.rb

@@ -0,0 +1,97 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 PrintPageRange array typemap definition
+###
+
+require_relative '../core/mapping'
+
+module WXRuby3
+
+  module Typemap
+
+    # Typemaps for converting returned PGCell references to
+    # either the correct wxRuby class
+    module PrintPageRange
+
+      include Typemap::Module
+
+      define do
+
+        if Config.instance.wx_version >= '3.3.0'
+          map 'const std::vector<wxPrintPageRange> &' => 'Array<Wx::PRT::PrintPageRange>' do
+            map_out code: <<~__CODE
+                $result = rb_ary_new();
+                for (const wxPrintPageRange& range : *$1)
+                {
+                  VALUE r_range = SWIG_NewPointerObj(new wxPrintPageRange(range), SWIGTYPE_p_wxPrintPageRange, SWIG_POINTER_OWN);
+                  rb_ary_push($result, r_range);
+                }
+                __CODE
+            map_in temp: 'std::vector<wxPrintPageRange> tmp', code: <<~__CODE
+                if (TYPE($input) == T_ARRAY)
+                {
+                  $1 = &tmp;
+                  for (int i = 0; i < RARRAY_LEN($input); i++)
+                  {
+                    void *ptr;
+                    VALUE r_range = rb_ary_entry($input, i);
+                    int res = SWIG_ConvertPtr(r_range, &ptr, SWIGTYPE_p_wxPrintPageRange, 0);
+                    if (!SWIG_IsOK(res) || !ptr) {
+                      rb_raise(rb_eTypeError, "Expected Array of Wx::PRT::PrintPageRange for 1");
+                    }
+                    wxPrintPageRange *range = reinterpret_cast< wxPrintPageRange * >(ptr);
+                    $1->push_back(*range);
+                  }
+                }
+                else {
+                  rb_raise(rb_eArgError, "Expected Array of Wx::PRT::PrintPageRange for 1");
+                }      
+                __CODE
+          end
+
+          map 'std::vector<wxPrintPageRange> &' => 'Array<Wx::PRT::PrintPageRange>' do
+
+            map_in temp: 'std::vector<wxPrintPageRange> tmp_vector', code: '$1 = &tmp_vector;'
+
+            map_argout code: <<~__CODE
+                for (const wxPrintPageRange& range : *$1)
+                {
+                  VALUE r_range = SWIG_NewPointerObj(new wxPrintPageRange(range), SWIGTYPE_p_wxPrintPageRange, SWIG_POINTER_OWN);
+                  rb_ary_push($input, r_range);
+                }
+                __CODE
+
+            map_directorin code: '$input = rb_ary_new();'
+
+            map_directorargout code: <<~__CODE
+                for (int i = 0; i < RARRAY_LEN($result); i++)
+                {
+                  void *ptr;
+                  VALUE r_range = rb_ary_entry($result, i);
+                  int res = SWIG_ConvertPtr(r_range, &ptr, SWIGTYPE_p_wxPrintPageRange, 0);
+                  if (!SWIG_IsOK(res) || !ptr) {
+                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, 
+                                                               "expected Array of Wx::PRT::PrintPageRange in argument 1");
+                  }
+                  wxPrintPageRange *range = reinterpret_cast< wxPrintPageRange * >(ptr);
+                  $1.push_back(*range);
+                }
+                __CODE
+
+          end
+        end
+        # Doc only mapping def
+        map 'std::vector<wxPrintPageRange> &' => 'Array<Wx::PRT::PrintPageRange>', swig: false do
+          map_in
+        end
+
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Martin Corino
 bindir: bin
 cert_chain: []
-date: 2024-12-29 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -820,6 +820,7 @@ files:
 - rakelib/lib/typemap/pgprop_arg.rb
 - rakelib/lib/typemap/pgproperty.rb
 - rakelib/lib/typemap/points_list.rb
+- rakelib/lib/typemap/print_page_range.rb
 - rakelib/lib/typemap/richtext.rb
 - rakelib/lib/typemap/tree_itemid.rb
 - rakelib/lib/util/string.rb