wxruby3 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22f63fb730a7c17f84eac51d892cad2f35ef33211d88fafde508fe7c222712e6
-  data.tar.gz: 2cf9e0b4026e8c00b24873e77af5f4d5676e5af3181e6459104b5c6fef0675d1
+  metadata.gz: '079f38ae02dfcba5a96738f73c678e0d9a5396920739cb370c47d79b6bb81adf'
+  data.tar.gz: 510b7637e541b981deb048d4b0aa3898ea8152900b570ead984dcb9c6daee534
 SHA512:
-  metadata.gz: 48cce7a08e4f4bd15380178cab3ab38b53af6942d5054af617806d5b01bea0aabc26887ec26fc07a6bb6c2d9802ec512d59396a2361c88a12635ebf80b066d91
-  data.tar.gz: eba7856af27dcfe0e4eb50662bae9bb00af12f29258e0eb4b2d446c3351446651926e2e5c0eec017038fef2545671e8ac47faea0f75c1bb3efd54c751585ae08
+  metadata.gz: 4b3c4ad6e1c31636d658cd9f0d986c57caf6bc6f72af19af449b7d371c3b9af45b229533f1ae3593b7c23b2b29bf74dfaac8e88740fcca0699dc093f40b29d8f
+  data.tar.gz: 827044bb4256d7afc741e77209096cd527f2c77688c0b619fd72cf1ad0bf03992de4e3c60ec93e17795835345b15932ae2773381de85177d941d8b205ab120f7

data/README.md

@@ -101,7 +101,7 @@ Currently the following are fully supported:
 
 | Platform                                                                                                                           | Ruby version(s)                                     | wxWidgets version(s) |
 |------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------|----------------------|
-| Windows 10 (tested)<br>(most likely also Windows 11)                                                                               | Ruby >= 2.5<br>(RubyInstaller MSYS2-DevKit)         | wxWidgets >= 3.2     |
+| Windows >= 10                                                                                                                      | Ruby >= 2.5<br>(RubyInstaller MSYS2-DevKit)         | wxWidgets >= 3.2     |
 | Linux (tested; all major AMD64 and ARM64 distributions: Ubuntu, Debian, Fedora, OpenSuSE and ArchLinux)<br>(most likely also i686) | Ruby >= 2.5                                         | wxWidgets >= 3.2     |
 | MacOS >= 10.10 using Cocoa (tested on AMD64 and ARM64 M1/M2 Chip)                                                                  | Ruby >= 2.5 (MacPorts, Homebrew, ruby-install, RVM) | wxWidgets >= 3.2     |
 

data/ext/wxruby3/swig/common.i

@@ -42,6 +42,14 @@
  * wxWidgets we define our own.
  */
 
+#if defined(__GNUC__)
+#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#    ifndef GCC_HASCLASSVISIBILITY
+#      define GCC_HASCLASSVISIBILITY
+#    endif
+#  endif
+#endif
+
 #ifndef WXRB_EXPORT_FLAG
 # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 #   if defined(WXRUBY_STATIC_BUILD)

data/lib/wx/version.rb

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

data/rakelib/build.rb

@@ -55,8 +55,18 @@ if WXRuby3.is_bootstrapped?
         pkg.generate_initializer
       end
 
-      # Target to run the linker to create a final .so/.dll wxruby3 package library
-      file pkg.lib_target => [*pkg.all_obj_files, *pkg.dep_libs] do | t |
+      # only for MacOSX
+      file pkg.initializer_loader_src => pkg.initializer_src do
+        pkg.generate_initializer_loader
+      end
+
+      # Target to run the linker to create a final wxruby package shared library (MacOSX only)
+      file pkg.shlib_target => [*pkg.all_obj_files, *pkg.dep_libs] do |t|
+        WXRuby3.config.do_shlib_link(pkg)
+      end
+
+      # Target to run the linker to create a final .so/.dll/.bundle wxruby3 package library
+      file pkg.lib_target => pkg.lib_target_deps do | t |
         WXRuby3.config.do_link(pkg)
       end
 

data/rakelib/gem.rake

@@ -79,7 +79,7 @@ file WXRuby3::Gem.gem_file => WXRuby3::Gem.manifest do
     gem.add_dependency 'rake'
     gem.add_dependency 'minitest', '~> 5.15'
     gem.add_dependency 'test-unit', '~> 3.5'
-    gem.add_dependency 'plat4m', '~> 1.0'
+    gem.add_dependency 'plat4m', '~> 1.1'
     gem.rdoc_options <<
       '--exclude=\\.dll' <<
       '--exclude=\\.so' <<

data/rakelib/install.rb

@@ -152,7 +152,10 @@ module WXRuby3
         [File.join(WXRuby3.config.get_cfg_string('siterubyver'), 'wx'), ['lib/wx'], 0644],
       ]
       # add wxRuby shared libraries
-      WXRuby3::Director.each_package { |pkg| specs << [WXRuby3.config.get_cfg_string('siterubyverarch'), [pkg.lib_target], 0555] }
+      WXRuby3::Director.each_package do |pkg|
+        specs << [WXRuby3.config.get_cfg_string('siterubyverarch'), [pkg.lib_target], 0555]
+        specs << [WXRuby3.config.get_cfg_string('siterubyverarch'), [pkg.lib_target.sub(/\.#{WXRuby3.config.dll_ext}\Z/, '.dylib')], 0555] if WXRuby3.config.macosx?
+      end
       if WXRuby3.config.get_config('with-wxwin')
         specs << [WXRuby3.config.get_cfg_string('siterubyverarch'), Install.wxwin_shlibs, 0555]
       end

data/rakelib/lib/config/macosx.rb

@@ -46,6 +46,19 @@ module WXRuby3
           end
           protected :patch_rpath
 
+          # add deployment lookup paths for wxruby shared libraries
+          # and make loadpath for initializer dylibs relative
+          def update_shlib_loadpaths(shlib)
+            # in case of a .bundle library
+            if /\.bundle\Z/ =~ shlib
+              # change the full path of the complementary initializer .dylib to a path relative to any rpath-s
+              dylib = "lib#{File.basename(shlib, '.bundle')}.dylib"
+              dylib_path = File.expand_path(File.join(Config.instance.dest_dir, dylib))
+              sh("install_name_tool -change #{dylib_path} '@rpath/#{dylib}' #{shlib}")
+            end
+            super
+          end
+
           # add Ruby library path for wxruby shared libraries
           def update_shlib_ruby_libpath(shlib)
             # fix lookup for the Ruby shared library
@@ -123,10 +136,23 @@ module WXRuby3
             wx_libset.collect { |s| s.dup }
           end
 
-          def do_link(pkg)
+          def do_shlib_link(pkg)
             objs = pkg.all_obj_files.collect { |o| File.join('..', o) }.join(' ') + ' '
-            sh "cd lib && #{WXRuby3.config.ld} #{WXRuby3.config.ldflags(pkg.lib_target)} #{objs} " +
-                 "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}"
+            depsh = pkg.dep_libs.join(' ')
+            ldsh = WXRuby3.config.ld.sub(/-bundle/, '')
+            ldsh.sub!(/-dynamic/, '-dynamiclib')
+            sh "cd lib && " +
+                 "#{ldsh} #{WXRuby3.config.ldflags(pkg.lib_target)} #{objs} #{depsh} " +
+                 "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.shlib_target}",
+               fail_on_error: true
+          end
+
+          def do_link(pkg)
+            sh "cd lib && " +
+                 "#{WXRuby3.config.ld} #{WXRuby3.config.ldflags(pkg.lib_target)} #{File.join('..', pkg.init_obj_file)} " +
+                    "-L. -l#{pkg.libname} " +
+                    "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}",
+               fail_on_error: true
           end
 
           private
@@ -151,15 +177,14 @@ module WXRuby3
 
         if @wx_version
           @cpp.sub!(/-std=gnu\+\+11/, '-std=gnu++14')
-          @ld.sub!(/-o\s*\Z/, '')
+          # on Mac OSX this differs from the wxWidgets linking setup
+          @ld = RB_CONFIG['LDSHAREDXX'] || 'g++ -std=gnu++14 -dynamic -bundle'
+          @ld.sub!(/-std=gnu\+\+11/, '-std=gnu++14')
 
           @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-sometimes-uninitialized
                                   -Wno-overloaded-virtual -Wno-deprecated-copy]
           @extra_cflags << ' -Wno-deprecated-declarations' unless @no_deprecated
 
-          # create a .dylib binary
-          @extra_ldflags << '-dynamic -bundle'
-
           unless @wx_path.empty?
             libdirs = @wx_libs.select {|s| s.start_with?('-L')}.collect {|s| s.sub(/^-L/,'')}
             @exec_env['DYLD_LIBRARY_PATH'] = "#{ENV['DYLD_LIBRARY_PATH']}:#{dest_dir}:#{libdirs.join(':')}"

data/rakelib/lib/config/mingw.rb

@@ -7,6 +7,7 @@
 ###
 
 require_relative './unixish'
+require_relative 'pkgman/mingw'
 
 require 'uri'
 
@@ -26,13 +27,6 @@ module WXRuby3
 
     module Platform
 
-      SWIG_URL = 'https://sourceforge.net/projects/swig/files/swigwin/swigwin-4.2.0/swigwin-4.2.0.zip/download'
-      SWIG_ZIP = 'swigwin-4.2.0.zip'
-
-      DOXYGEN_URL = 'https://www.doxygen.nl/files/doxygen-1.10.0.windows.x64.bin.zip'
-
-      GIT_URL = 'https://github.com/git-for-windows/git/releases/download/v2.43.0.windows.1/MinGit-2.43.0-64-bit.zip'
-
       def self.included(base)
         base.class_eval do
           include Config::UnixLike
@@ -85,71 +79,10 @@ module WXRuby3
 
           def install_prerequisites
             pkg_deps = super
-            unless pkg_deps.empty?
-              # autoinstall or not?
-              unless wants_autoinstall?
-                STDERR.puts <<~__ERROR_TXT
-                  ERROR: This system lacks installed versions of the following required software packages:
-                    #{pkg_deps.join(', ')}
-                    
-                    Install these packages and try again.
-                  __ERROR_TXT
-                exit(1)
-              end
-              # if SWIG was not found in the PATH
-              if pkg_deps.include?('swig')
-                $stdout.print 'Installing SWIG...' if run_silent?
-                # download and install SWIG
-                fname = download_and_install(SWIG_URL, SWIG_ZIP, 'swig.exe')
-                $stdout.puts 'done!' if run_silent?
-                Config.instance.log_progress("Installed #{fname}")
-                set_config('swig', fname)
-                Config.save
-              end
-              # if doxygen was not found in the PATH
-              if pkg_deps.include?('doxygen')
-                $stdout.print 'Installing Doxygen...' if run_silent?
-                # download and install doxygen
-                fname = download_and_install(DOXYGEN_URL, File.basename(URI(DOXYGEN_URL).path), 'doxygen.exe', 'doxygen')
-                $stdout.puts 'done!' if run_silent?
-                Config.instance.log_progress("Installed #{fname}")
-                set_config('doxygen', fname)
-                Config.save
-              end
-              # if git was not found in the PATH
-              if pkg_deps.include?('git')
-                $stdout.print 'Installing Git...' if run_silent?
-                # download and install doxygen
-                fname = download_and_install(GIT_URL, File.basename(URI(GIT_URL).path), 'git.exe', 'git')
-                $stdout.puts 'done!' if run_silent?
-                Config.instance.log_progress("Installed #{fname}")
-                set_config('git', fname)
-                Config.save
-              end
-            end
+            PkgManager.install(pkg_deps)
             []
           end
 
-          # only called after src gem build
-          def cleanup_prerequisites
-            tmp_tool_root = File.join(ENV['HOME'].gsub("\\", '/'), '.wxruby3')
-            path = get_cfg_string('swig')
-            unless path.empty? || !path.start_with?(tmp_tool_root)
-              path = File.dirname(path) while File.dirname(path) != tmp_tool_root
-              rm_rf(path)
-            end
-            path = get_cfg_string('doxygen')
-            unless path.empty? || !path.start_with?(tmp_tool_root)
-              path = File.dirname(path) while File.dirname(path) != tmp_tool_root
-              rm_rf(path)
-            end
-            path = get_cfg_string('git')
-            unless path.empty? || !path.start_with?(tmp_tool_root)
-              path = File.dirname(path) while File.dirname(path) != tmp_tool_root
-              rm_rf(path)
-            end
-          end
-
           def expand(cmd)
             super("bash -c \"#{cmd}\"")
           end
@@ -164,38 +97,8 @@ module WXRuby3
 
           private
 
-          def download_and_install(url, zip, exe, unpack_to=nil)
-            # make sure the download destination exists
-            tmp_tool_root = File.join(ENV['HOME'].gsub("\\", '/'), '.wxruby3')
-            dest = unpack_to ? File.join(tmp_tool_root, unpack_to) : File.join(tmp_tool_root, File.basename(zip, '.*'))
-            mkdir(tmp_tool_root) unless File.directory?(tmp_tool_root)
-            # download
-            chdir(tmp_tool_root) do
-              unless download_file(url, zip)
-                STDERR.puts "ERROR: Failed to download installation package for #{exe}"
-                exit(1)
-              end
-              # unpack
-              unless sh("powershell Expand-Archive -LiteralPath '#{zip}' -DestinationPath #{dest} -Force")
-                STDERR.puts "ERROR: Failed to unpack installation package for #{exe}"
-                exit(1)
-              end
-              # cleanup
-              rm_f(zip)
-            end
-            # find executable
-            find_exe(dest, exe)
-          end
-
-          def find_exe(path, exe)
-            fp = Dir.glob(File.join(path, '*')).find { |p| File.file?(p) && File.basename(p) == exe }
-            unless fp
-              Dir.glob(File.join(path, '*')).each do |p|
-                fp = find_exe(p, exe) if File.directory?(p)
-                return fp if fp
-              end
-            end
-            fp
+          def wx_configure
+            bash('./configure --prefix=`pwd`/install --disable-tests --without-subdirs --without-regex --with-expat=builtin --with-zlib=builtin --disable-debug_info')
           end
 
           def wx_make

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

@@ -14,11 +14,33 @@ module WXRuby3
 
       module PkgManager
 
+        class PlatformDependencies
+          def initialize(*defaults)
+            @dependencies = ::Hash.new
+            @dependencies.default = ::Hash.new(defaults.flatten)
+          end
+
+          def add(distro, *deps, release: nil)
+            @dependencies[distro] ||= ::Hash.new
+            if release
+              @dependencies[distro][release] = deps.flatten
+            else
+              @dependencies[distro].default = deps.flatten
+            end
+            self
+          end
+
+          def get(distro, release: nil)
+            @dependencies[distro][release]
+          end
+        end
+
         PLATFORM_DEPS = {
-          debian: %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],
-          rhel: %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: %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: %w[pkg-config gtk3 webkit2gtk gspell libunwind gstreamer curl libsecret libnotify libpng12]
+          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'),
+          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])
         }
         PLATFORM_ALTS = {
           suse: { 'g++' => 'gcc-c++' },
@@ -41,7 +63,7 @@ module WXRuby3
   
                   Make sure the following packages (or equivalent) are installed and than try again with `--no-autoinstall`:
                   #{pkgs.join(', ')}
-                  __ERROR_TXT
+                __ERROR_TXT
                 exit(1)
               end
               # can we install?
@@ -63,7 +85,7 @@ module WXRuby3
                       #{pkgs.join(', ')}
                       
                     Install these packages and try again.
-                    __ERROR_TXT
+                  __ERROR_TXT
                   exit(1)
                 end
                 # do the actual install
@@ -73,7 +95,7 @@ module WXRuby3
                     #{pkgs.join(', ')}
                     
                     Fix any problems or install these packages yourself and try again.
-                    __ERROR_TXT
+                  __ERROR_TXT
                   if WXRuby3.config.run_silent?
                     $stderr.puts "For error details check #{WXRuby3.config.silent_log_name}"
                   end
@@ -90,7 +112,8 @@ module WXRuby3
           end
 
           def platform_pkgs
-            PLATFORM_DEPS[WXRuby3.config.sysinfo.os.variant.to_sym] || []
+            deps = PLATFORM_DEPS[WXRuby3.config.sysinfo.os.variant.to_sym]
+            deps ? deps.get(WXRuby3.config.sysinfo.os.distro, release: WXRuby3.config.sysinfo.os.release) : []
           end
 
           def add_platform_pkgs(pkgs)

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

@@ -0,0 +1,112 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 buildtools platform pkg manager base
+###
+
+module WXRuby3
+
+  module Config
+
+    module Platform
+
+      module PkgManager
+
+        XTRA_PLATFORM_DEPS = %w[python]
+
+        class << self
+
+          def install(pkgs)
+            # do we need to install anything?
+            if !pkgs.empty? || builds_wxwidgets?
+              # check windows distro compatibility
+              unless no_autoinstall? || pkgman
+                # do we need to build wxWidgets?
+                pkgs.concat(XTRA_PLATFORM_DEPS) if builds_wxwidgets?
+                $stderr.puts <<~__ERROR_TXT
+                  ERROR: Do not know how to install required packages for distro type '#{WXRuby3.config.sysinfo.os.variant}'.
+  
+                  Make sure the following packages (or equivalent) are installed and than try again with `--no-autoinstall`:
+                  #{pkgs.join(', ')}
+                __ERROR_TXT
+                exit(1)
+              end
+              # can we install?
+              unless no_autoinstall? || pkgman
+                $stderr.puts 'ERROR: Do not know how to check for or install required packages. Please install manually and than try again with `--no-autoinstall`.'
+                exit(1)
+              end
+              # do we need to build wxWidgets?
+              if builds_wxwidgets?
+                # add platform specific packages for wxWidgets
+                pkgs.concat(XTRA_PLATFORM_DEPS)
+              end
+              # do we actually have any packages to install?
+              unless pkgs.empty?
+                # autoinstall or not?
+                unless wants_autoinstall?
+                  $stderr.puts <<~__ERROR_TXT
+                    ERROR: This system may lack installed versions of the following required software packages:
+                      #{pkgs.join(', ')}
+                      
+                    Install these packages and try again.
+                  __ERROR_TXT
+                  exit(1)
+                end
+                # do the actual install
+                unless run(pkgman.make_install_command(*pkgs))
+                  $stderr.puts <<~__ERROR_TXT
+                    ERROR: Failed to install all or some of the following required software packages:
+                    #{pkgs.join(', ')}
+                    
+                    Fix any problems or install these packages yourself and try again.
+                  __ERROR_TXT
+                  if WXRuby3.config.run_silent?
+                    $stderr.puts "For error details check #{WXRuby3.config.silent_log_name}"
+                  end
+                  exit(1)
+                end
+              end
+            end
+          end
+
+          private
+
+          def pkgman
+            @pkgman ||= WXRuby3.config.sysinfo.os.pkgman
+          end
+
+          def builds_wxwidgets?
+            Config.get_config('with-wxwin') && Config.get_cfg_string('wxwin').empty?
+          end
+
+          def no_autoinstall?
+            Config.get_config('autoinstall') == false
+          end
+
+          def wants_autoinstall?
+            WXRuby3.config.wants_autoinstall?
+          end
+
+          def run(cmd)
+            $stdout.print "Running #{cmd}..."
+            rc = WXRuby3.config.bash(cmd)
+            $stderr.puts(rc ? 'done!' : 'FAILED!')
+            rc
+          end
+
+          def expand(cmd)
+            `#{is_root? ? '' : 'sudo '}#{cmd}`
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/core/package.rb

@@ -69,6 +69,10 @@ module WXRuby3
         File.join(Config.instance.dest_dir, "#{libname}.#{Config.instance.dll_ext}")
       end
 
+      def shlib_target
+        Config.instance.macosx? ? File.join(Config.instance.dest_dir, "lib#{libname}.dylib") : nil
+      end
+
       def package(pkgname)
         subpackages[pkgname] ||= Package.new(pkgname, self)
       end
@@ -156,9 +160,30 @@ module WXRuby3
         @all_obj_files
       end
 
+      # only used for MacOSX
+      def init_obj_file
+        if Config.instance.macosx?
+          File.join(Config.instance.obj_dir, "#{libname}_init_loader.#{Config.instance.obj_ext}")
+        else
+          File.join(Config.instance.obj_dir, "#{libname}_init.#{Config.instance.obj_ext}")
+        end
+      end
+
+      def lib_target_deps
+        if Config.instance.macosx?
+          [init_obj_file, shlib_target, *dep_libs]
+        else
+          [*all_obj_files, *dep_libs]
+        end
+      end
+
       def dep_libs
         if parent
-          parent.dep_libs + [File.join(Config.instance.dest_dir, "#{parent.libname}.#{Config.instance.dll_ext}")]
+          parent.dep_libs + if Config.instance.macosx?
+                              [parent.shlib_target]
+                            else
+                              [parent.lib_target]
+                            end
         else
           []
         end
@@ -176,6 +201,11 @@ module WXRuby3
         File.join(Config.instance.src_dir, "#{libname}_init.cpp")
       end
 
+      # only for MacOSX
+      def initializer_loader_src
+        File.join(Config.instance.src_dir, "#{libname}_init_loader.cpp")
+      end
+
       def is_dir_with_fulfilled_deps?(dir, cls_set)
         if (modreg = Spec.module_registry[dir.spec.module_name]) && !modreg.empty?
           # check if all base classes are defined previously or part of the same director or outside the current package
@@ -286,6 +316,14 @@ module WXRuby3
           fsrc.puts '#include <ruby.h>'
           fsrc.puts '#include <ruby/version.h>'
           fsrc.puts <<~__HEREDOC
+            #if defined(__GNUC__)
+            #  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+            #    ifndef GCC_HASCLASSVISIBILITY
+            #      define GCC_HASCLASSVISIBILITY
+            #    endif
+            #  endif
+            #endif
+
             #ifndef WXRB_EXPORT_FLAG
             # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
             #   if defined(WXRUBY_STATIC_BUILD)
@@ -338,7 +376,11 @@ module WXRuby3
           fsrc.puts '#ifdef __cplusplus'
           fsrc.puts 'extern "C"'
           fsrc.puts '#endif'
-          fsrc.puts "WXRB_EXPORT_FLAG void Init_#{libname}()"
+          if Config.instance.macosx?
+            fsrc.puts "WXRB_EXPORT_FLAG void wxruby_init_#{libname}()"
+          else
+            fsrc.puts "WXRB_EXPORT_FLAG void Init_#{libname}()"
+          end
           fsrc.puts '{'
           fsrc.indent do
             fsrc.puts 'static bool initialized;'
@@ -357,7 +399,7 @@ module WXRuby3
               fsrc << <<~__HERDOC
                 // define Enum class
                 wx_define_Enum_class();
-                __HERDOC
+              __HERDOC
               fsrc.puts
               # generate constant definitions for feature defines from setup.h
               fsrc.puts %Q{VALUE mWxSetup = rb_define_module_under(#{module_variable}, "Setup");}
@@ -391,6 +433,72 @@ module WXRuby3
         generate_event_list if included_directors.any? {|dir| dir.has_events? }
       end
 
+      # only for MacOSX
+      def generate_initializer_loader
+        STDERR.puts "* generating package #{name} initializer : #{initializer_src}" if Director.verbose?
+
+        Stream.transaction do
+          fsrc = CodeStream.new(initializer_loader_src)
+          fsrc.puts '#include <ruby.h>'
+          fsrc.puts '#include <ruby/version.h>'
+          fsrc.puts <<~__HEREDOC
+            #if defined(__GNUC__)
+            #  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+            #    ifndef GCC_HASCLASSVISIBILITY
+            #      define GCC_HASCLASSVISIBILITY
+            #    endif
+            #  endif
+            #endif
+
+            #ifndef WXRB_EXPORT_FLAG
+            # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+            #   if defined(WXRUBY_STATIC_BUILD)
+            #     define WXRB_EXPORT_FLAG
+            #   else
+            #     define WXRB_EXPORT_FLAG __declspec(dllexport)
+            #   endif
+            # else
+            #   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+            #     define WXRB_EXPORT_FLAG __attribute__ ((visibility("default")))
+            #   else
+            #     define WXRB_EXPORT_FLAG
+            #   endif
+            # endif
+            #endif
+
+            #ifndef WXRB_IMPORT_FLAG
+            # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+            #   if defined(WXRUBY_STATIC_BUILD)
+            #     define WXRB_IMPORT_FLAG
+            #   else
+            #     define WXRB_IMPORT_FLAG __declspec(dllimport)
+            #   endif
+            # else
+            #   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+            #     define WXRB_IMPORT_FLAG __attribute__ ((visibility("default")))
+            #   else
+            #     define WXRB_IMPORT_FLAG
+            #   endif
+            # endif
+            #endif
+            __HEREDOC
+          fsrc.puts '#ifdef __cplusplus'
+          fsrc.puts 'extern "C"'
+          fsrc.puts '#endif'
+          fsrc.puts "WXRB_IMPORT_FLAG void wxruby_init_#{libname}();"
+          fsrc.puts
+          fsrc.puts '#ifdef __cplusplus'
+          fsrc.puts 'extern "C"'
+          fsrc.puts '#endif'
+          fsrc.puts "WXRB_EXPORT_FLAG void Init_#{libname}()"
+          fsrc.puts '{'
+          fsrc.indent do
+            fsrc.puts "wxruby_init_#{libname}();"
+          end
+          fsrc.puts '}'
+        end
+      end
+
       def extract(*mods, genint: true)
         included_directors.each do |dir|
           dir.extract_interface(genint) if (mods.empty? || mods.include?(dir.spec.name))
@@ -420,11 +528,11 @@ module WXRuby3
                             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})
+              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
@@ -562,7 +670,7 @@ module WXRuby3
 
               class EvtHandler
 
-            __HEREDOC
+          __HEREDOC
           fdoc.indent(2) do
             fdoc.doc.puts "@!group #{name} Event handler methods"
             fdoc.puts
@@ -651,7 +759,7 @@ module WXRuby3
             
             end
             __HEREDOC
-          __SCRIPT
+        __SCRIPT
         begin
           tmpfile = Tempfile.new('script')
           ftmp_name = tmpfile.path.dup

data/rakelib/lib/director/aui_tab_art.rb

@@ -16,6 +16,7 @@ module WXRuby3
         super
         spec.items << 'wxAuiDefaultTabArt' << 'wxAuiSimpleTabArt'
         spec.gc_as_object
+        spec.disable_proxies
         # missing from interface documentation
         spec.extend_interface('wxAuiTabArt',
                               'virtual ~wxAuiTabArt ()',

data/rakelib/lib/director/aui_toolbar_art.rb

@@ -16,7 +16,8 @@ module WXRuby3
         super
         spec.items << 'wxAuiDefaultToolBarArt'
         spec.gc_as_object
-        spec.extend_interface('wxAuiToolBarArt', 'virtual ~wxAuiToolBarArt ()')
+        spec.make_abstract 'wxAuiToolBarArt'
+        spec.disable_proxies
         spec.suppress_warning(473, 'wxAuiToolBarArt::Clone', 'wxAuiDefaultToolBarArt::Clone')
         spec.map 'const wxAuiToolBarItemArray&' => 'Array<Wx::AUI::AuiToolBarItem>,nil' do
           map_in temp: 'wxAuiToolBarItemArray tmp', code: <<~__CODE

data/rakelib/lib/director/dc.rb

@@ -16,6 +16,13 @@ module WXRuby3
 
       def setup
         super
+        _readDC = if Config.instance.wx_version >= '3.3.0'
+                    spec.items.unshift 'wxReadOnlyDC' # prepend before wxDC
+                    spec.items << 'wxInfoDC'
+                    'wxReadOnlyDC'
+                  else
+                    'wxDC'
+                  end
         spec.items << 'wxFontMetrics'
         # it's not safe to track DC objects as these are often created on the stack in C++
         # before being passed to Ruby methods
@@ -29,22 +36,24 @@ module WXRuby3
                     'wxFontMetrics::externalLeading',
                     'wxFontMetrics::averageWidth'
         spec.ignore [
-          'wxDC::GetPartialTextExtents',
-          'wxDC::DrawLines(const wxPointList *,wxCoord,wxCoord)',
-          'wxDC::DrawPolygon(const wxPointList *,wxCoord,wxCoord,wxPolygonFillMode)',
-          'wxDC::DrawSpline(const wxPointList *)',
-          'wxDC::GetLogicalOrigin(wxCoord *,wxCoord *) const',
-          'wxDC::GetHandle'
+                      'wxDC::DrawLines(const wxPointList *,wxCoord,wxCoord)',
+                      'wxDC::DrawPolygon(const wxPointList *,wxCoord,wxCoord,wxPolygonFillMode)',
+                      'wxDC::DrawSpline(const wxPointList *)',
+                      'wxDC::GetHandle'
+                    ]
+        spec.ignore [
+          "#{_readDC}::GetPartialTextExtents",
+          "#{_readDC}::GetLogicalOrigin(wxCoord *,wxCoord *) const",
         ]
+        spec.rename_for_ruby({
+           'GetDimensions' => "#{_readDC}::GetSize(wxCoord *, wxCoord *) const",
+           'GetDimensionsMM' => "#{_readDC}::GetSizeMM(wxCoord *, wxCoord *) const",
+           'GetTextSize' => "#{_readDC}::GetTextExtent(const wxString &) const",
+           'GetMultiLineTextSize' => "#{_readDC}::GetMultiLineTextExtent(const wxString &) const"
+         })
         spec.disable_proxies
         spec.disown 'wxGraphicsContext *ctx'
-        spec.rename_for_ruby({
-          'GetDimensions' => 'wxDC::GetSize(wxCoord *, wxCoord *) const',
-          'GetDimensionsMM' => 'wxDC::GetSizeMM(wxCoord *, wxCoord *) const',
-          'GetTextSize' => 'wxDC::GetTextExtent(const wxString &) const',
-          'GetMultiLineTextSize' => 'wxDC::GetMultiLineTextExtent(const wxString &) const'
-        })
-        spec.add_extend_code 'wxDC', <<~__HEREDOC
+        spec.add_extend_code _readDC, <<~__HEREDOC
           // Needs to return input parameter with list of lengths
           VALUE get_partial_text_extents(VALUE text) {
             wxString str = wxString(StringValuePtr(text), wxConvUTF8);
@@ -57,10 +66,31 @@ module WXRuby3
               }
             return rb_result;
           }
-          __HEREDOC
+        __HEREDOC
         # for GetUserScale and GetLogicalScale
         spec.map_apply 'double * OUTPUT' => 'double *'
         spec.swig_import 'swig/classes/include/wxGDICommon.h'
+        if Config.instance.wx_version >= '3.3.0'
+          # add similar block-style creator as #draw_on methods
+          spec.add_extend_code 'wxInfoDC', <<~__HEREDOC
+            static VALUE inform_on(wxWindow* win)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              if (!win)
+                rb_raise(rb_eRuntimeError, "A running valid Wx::Window is required for argument.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxInfoDC info_dc(win);
+                wxReadOnlyDC* dc_ptr = &info_dc; // wxInfoDC::operator&() returns wxReadOnlyDC*
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxInfoDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+          __HEREDOC
+        end
       end
     end # class DC
 

data/rakelib/lib/director/derived_dc.rb

@@ -18,6 +18,7 @@ module WXRuby3
         spec.gc_as_untracked spec.module_name
         case spec.module_name
         when 'wxScreenDC'
+          spec.override_inheritance_chain('wxScreenDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxScreenDC'
           # as a ScreenDC should always be a temporary stack object
           # we do not allow creation in Ruby but rather provide a class
@@ -43,6 +44,7 @@ module WXRuby3
                       'wxScreenDC::EndDrawingOnTop',
                       'wxScreenDC::wxScreenDC'
         when 'wxClientDC'
+          spec.override_inheritance_chain('wxClientDC', ['wxWindowDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxClientDC'
           spec.ignore 'wxClientDC::wxClientDC'
           # as a ClientDC should best always be a temporary stack object
@@ -65,6 +67,7 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxPaintDC'
+          spec.override_inheritance_chain('wxPaintDC', ['wxClientDC', 'wxWindowDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxPaintDC'
           spec.ignore 'wxPaintDC::wxPaintDC'
           spec.add_header_code <<~__HEREDOC
@@ -89,7 +92,10 @@ module WXRuby3
             __HEREDOC
         when 'wxMemoryDC'
           spec.items << 'wxBufferedDC' << 'wxBufferedPaintDC'
+          spec.override_inheritance_chain('wxMemoryDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.gc_as_untracked %w[wxBufferedDC wxBufferedPaintDC]
+          spec.override_inheritance_chain('wxBufferedDC', ['wxMemoryDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain('wxBufferedPaintDC', ['wxBufferedDC', 'wxMemoryDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxMemoryDC'
           spec.make_abstract 'wxBufferedDC'
           spec.make_abstract 'wxBufferedPaintDC'
@@ -218,6 +224,7 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxMirrorDC'
+          spec.override_inheritance_chain('wxMirrorDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxMirrorDC'
           spec.ignore 'wxMirrorDC::wxMirrorDC'
           # as a MirrorDC should best always be a temporary stack object
@@ -240,6 +247,7 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxSVGFileDC'
+          spec.override_inheritance_chain('wxSVGFileDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.items.concat %w[wxSVGBitmapHandler wxSVGBitmapFileHandler wxSVGBitmapEmbedHandler]
           spec.make_abstract 'wxSVGFileDC'
           spec.ignore 'wxSVGFileDC::wxSVGFileDC'
@@ -277,6 +285,7 @@ module WXRuby3
                       'wxSVGFileDC::StartPage',
                       'wxSVGFileDC::EndPage'
         when 'wxGCDC'
+          spec.override_inheritance_chain('wxGCDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxGCDC'
           spec.ignore 'wxGCDC::wxGCDC'
           # like all DC this should best always be a temporary stack object
@@ -382,7 +391,11 @@ module WXRuby3
           spec.ignore 'wxGCDC::wxGCDC(const wxEnhMetaFileDC &)'
         when 'wxScaledDC'
           spec.items.clear # wxRuby extension; no XML docs
-          spec.override_inheritance_chain('wxScaledDC', %w[wxDC wxObject])
+          if Config.instance.wx_version >= '3.3.0'
+            spec.override_inheritance_chain('wxScaledDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject'])
+          else
+            spec.override_inheritance_chain('wxScaledDC', %w[wxDC wxObject])
+          end
           # as there are no dependencies parsed from XML make sure we're initialized after Wx::DC
           spec.initialize_at_end = true
           spec.no_proxy 'wxScaledDC'
@@ -422,6 +435,7 @@ module WXRuby3
             };
             __HEREDOC
         when 'wxPrinterDC'
+          spec.override_inheritance_chain('wxPrinterDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxPrinterDC'
           spec.ignore 'wxPrinterDC::wxPrinterDC'
           # as a PrinterDC should best always be a temporary stack object
@@ -444,6 +458,7 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxPostScriptDC'
+          spec.override_inheritance_chain('wxPostScriptDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxPostScriptDC'
           spec.ignore 'wxPostScriptDC::wxPostScriptDC'
           # as a PostScriptDC should best always be a temporary stack object
@@ -499,7 +514,44 @@ module WXRuby3
               return rc;
             }
             __HEREDOC
+          if Config.instance.wx_version >= '3.3.0'
+            spec.items << 'wxOverlayDC'
+            spec.override_inheritance_chain('wxOverlayDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject'])
+            spec.make_abstract 'wxOverlayDC'
+            spec.ignore 'wxOverlayDC::wxOverlayDC'
+            spec.add_extend_code 'wxOverlayDC', <<~__HEREDOC
+            static VALUE draw_on(wxOverlay &overlay, wxWindow *win)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxOverlayDC ovl_dc(overlay, win);
+                wxOverlayDC* ovl_dc_ptr = &ovl_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxOverlayDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            static VALUE draw_on(wxOverlay &overlay, wxWindow *win, const wxRect &rect)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxOverlayDC ovl_dc(overlay, win, rect);
+                wxOverlayDC* ovl_dc_ptr = &ovl_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxOverlayDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            __HEREDOC
+          end
         else
+          spec.override_inheritance_chain(spec.module_name, ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           # ctors of all other derived DC require a running App
           spec.require_app spec.module_name
         end

data/rakelib/lib/director/ribbon_art_provider.rb

@@ -16,7 +16,9 @@ module WXRuby3
         spec.items << 'wxRibbonPageTabInfo' << 'wxRibbonMSWArtProvider' << 'wxRibbonAUIArtProvider'
         super
         spec.gc_as_object 'wxRibbonArtProvider'
+        spec.make_abstract 'wxRibbonArtProvider'
         spec.gc_as_untracked 'wxRibbonPageTabInfo'
+        spec.disable_proxies
         spec.suppress_warning(473,
                               'wxRibbonArtProvider::Clone',
                               'wxRibbonMSWArtProvider::Clone',

data/rakelib/lib/director/richtext_buffer.rb

@@ -20,6 +20,22 @@ module WXRuby3
         super
         spec.items << 'wxRichTextFontTable' << 'wxRichTextFieldType' << 'wxRichTextFieldTypeStandard' << 'wxRichTextDrawingHandler'
         spec.make_abstract 'wxRichTextFieldType'
+        if Config.instance.wx_version >= '3.3.0'
+          # make Ruby director and wrappers use custom implementation
+          spec.use_class_implementation('wxRichTextFieldType', 'wxRubyRichTextFieldType')
+          spec.add_header_code <<~__HEREDOC
+            class wxRubyRichTextFieldType : public wxRichTextFieldType
+            {
+            public:
+              virtual ~wxRubyRichTextFieldType() {}
+              wxRubyRichTextFieldType(const wxString &name=wxEmptyString) : wxRichTextFieldType(name) {}
+              wxRubyRichTextFieldType(const wxRichTextFieldType &fieldType) : wxRichTextFieldType(fieldType) {}
+              virtual bool Draw(wxRichTextField *, wxDC &, wxRichTextDrawingContext &, const wxRichTextRange &, const wxRichTextSelection &, const wxRect &, int , int ) { return false; }
+              virtual bool Layout(wxRichTextField *, wxReadOnlyDC &, wxRichTextDrawingContext &, const wxRect &, const wxRect &, int) { return false; }
+              virtual bool GetRangeSize(wxRichTextField *, const wxRichTextRange &, wxSize &, int &, wxReadOnlyDC &, wxRichTextDrawingContext &, int, const wxPoint &, const wxSize &, wxArrayInt *) const { return false; }
+            };
+            __HEREDOC
+        end
         spec.no_proxy 'wxRichTextFontTable'
         spec.include 'wx/richtext/richtextstyles.h'
         spec.ignore %w[

data/rakelib/lib/director/window.rb

@@ -120,6 +120,7 @@ module WXRuby3
           end
           if Config.instance.wx_version >= '3.3.0'
             spec.ignore_unless('WXMSW', 'wxWindow::MSWDisableComposited')
+            spec.ignore('wxWindow::GTKGetWin32Handle')
           end
           if Config.instance.features_set?('USE_ACCESSIBILITY')
             spec.disown 'wxAccessible *accessible'
@@ -315,6 +316,11 @@ module WXRuby3
                           "#{spec.class_name(citem)}::WarpPointer",
                           "#{spec.class_name(citem)}::AdjustForLayoutDirection",
                           "#{spec.class_name(citem)}::IsTransparentBackgroundSupported")
+            if Config.instance.features_set?('USE_ACCESSIBILITY')
+              if Config.instance.wx_version > '3.2.4'
+                spec.no_proxy "#{spec.class_name(citem)}::CreateAccessible"
+              end
+            end
           end
         end
         if spec.module_name == 'wxWindow'

data/tests/test_gdi_object.rb

@@ -12,14 +12,14 @@ class TestGDIObjects < Test::Unit::TestCase
     frame = Wx::Frame.new(nil)
     frame.set_icon(ico)
     GC.start
-    ico_cpy = frame.get_icon
+    ico_cpy = frame.get_icons.get_icon_by_index(0)
     GC.start
     assert(ico_cpy.ok?)
     assert_not_equal(ico.object_id, ico_cpy.object_id)
     ico = nil
     ico_cpy = nil
     GC.start
-    ico_cpy = frame.get_icon
+    ico_cpy = frame.get_icons.get_icon_by_index(0)
     GC.start
     assert(ico_cpy.ok?)
     assert_not_equal(ico.object_id, ico_cpy.object_id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 description: wxRuby3 is a Ruby library providing an extension for the wxWidgets C++
   UI framework
 email: mcorino@m2c-software.nl
@@ -425,6 +425,7 @@ files:
 - rakelib/lib/config/mingw.rb
 - rakelib/lib/config/pkgman/linux.rb
 - rakelib/lib/config/pkgman/macosx.rb
+- rakelib/lib/config/pkgman/mingw.rb
 - rakelib/lib/config/unixish.rb
 - rakelib/lib/config/unknown.rb
 - rakelib/lib/core/include/client_data.inc
@@ -1190,7 +1191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: wxWidgets extension for Ruby