wxruby3 0.9.8 → 1.0.1

data/rakelib/gem.rb

@@ -93,12 +93,13 @@ module WXRuby3
       end
 
       def make_bin_name
+        basename = "wxruby3#{WXRuby3.config.with_wxhead? ? '-head' : ''}"
         os = WXRuby3.config.sysinfo.os
         case os.id
         when :windows
-          "wxruby3_#{os.distro}_ruby#{WXRuby3::Config.rb_ver_major}#{WXRuby3::Config.rb_ver_minor}"
+          "#{basename}_#{os.distro}_ruby#{WXRuby3::Config.rb_ver_major}#{WXRuby3::Config.rb_ver_minor}"
         else
-          "wxruby3_#{os.distro}_#{os.release || '0'}_ruby#{WXRuby3::Config.rb_ver_major}#{WXRuby3::Config.rb_ver_minor}"
+          "#{basename}_#{os.distro}_#{os.release || '0'}_ruby#{WXRuby3::Config.rb_ver_major}#{WXRuby3::Config.rb_ver_minor}"
         end
       end
       private :make_bin_name

data/rakelib/lib/config/linux.rb

@@ -81,7 +81,7 @@ module WXRuby3
         @dll_pfx = 'lib'
 
         if @wx_version
-          @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-maybe-uninitialized]
+          @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-maybe-uninitialized -Wno-deprecated-copy]
           @extra_cflags << ' -Wno-deprecated-declarations' unless @no_deprecated
 
           @ruby_ldflags << '-s' if @release_build  # strip debug symbols for release build

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/config/unixish.rb

@@ -92,11 +92,10 @@ module WXRuby3
         chdir(ext_path) do
           if (rc = sh("#{get_cfg_string('git')} clone https://github.com/wxWidgets/wxWidgets.git"))
             chdir('wxWidgets') do
-              tag = if @wx_version
-                      "v#{@wx_version}"
-                    else
-                      expand("#{get_cfg_string('git')} tag").split("\n").select { |t| (/\Av3\.(\d+)/ =~ t) && $1.to_i >= 2  }.max
-                    end
+              tag = wx_gitref ||
+                expand("#{get_cfg_string('git')} tag").split("\n").select do |t|
+                  (/\Av(\d+)\.(\d+)\.\d+\Z/ =~ t) && (($1.to_i == 3 && $2.to_i >= 2) || $1.to_i > 3)
+                end.max
               # checkout the version we are building against
               rc = sh("#{get_cfg_string('git')} checkout #{tag}")
             end
@@ -220,8 +219,8 @@ module WXRuby3
           # add ruby defined shared ruby lib(s); not any other flags
           @ruby_libs.concat RB_CONFIG['LIBRUBYARG_SHARED'].split(' ').select { |s| s.start_with?('-l')}
 
-          # maintain minimum compatibility with ABI 3.0.0
-          @wx_abi_version = [ @wx_version, "3.0.0" ].min
+          # maintain minimum compatibility with ABI 3.0.1
+          @wx_abi_version = [ @wx_version, "3.0.1" ].min
           @wx_cppflags << "-DwxABI_VERSION=%s" % @wx_abi_version.tr(".", "0")
         end
       end

data/rakelib/lib/config.rb

@@ -313,7 +313,7 @@ module WXRuby3
     private :make_ruby_cmd
 
     def execute(*cmd)
-      do_run(*cmd.flatten)
+      sh(exec_env.merge({'RUBYLIB'=>rb_lib_path}), cmd.flatten.join(' '), fail_on_error: true)
     end
 
     def run(*cmd, capture: nil, verbose: true)
@@ -720,6 +720,10 @@ module WXRuby3
             get_config('with-wxwin')
           end
 
+          def with_wxhead?
+            get_config('with-wxhead')
+          end
+
           def wx_version
             @wx_version || ''
           end
@@ -760,6 +764,17 @@ module WXRuby3
             [ rake_deps_path, src_path, src_gen_path, obj_path, classes_path, common_path, interface_path ]
           end
 
+          def wx_gitref
+            if @wx_version
+              "v#{@wx_version}"
+            elsif get_config('with-wxhead')
+              'master'
+            else
+              nil
+            end
+          end
+          private :wx_gitref
+
           def do_bootstrap
             install_prerequisites
             # do we have a local wxWidgets tree already?
@@ -832,9 +847,15 @@ module WXRuby3
             features = {}
 
             if is_configured? && wxwidgets_setup_h
-              File.read(wxwidgets_setup_h).scan(/^\s*#define\s+(wx\w+|__\w+__)\s+([01])/) do | define |
-                feat_val = $2.to_i.zero? ? false : true
-                feat_id = $1.sub(/\Awx/i, '').gsub(/\A__|__\Z/, '')
+              File.read(wxwidgets_setup_h).scan(/^\s*#define\s+(wx\w+|__\w+__)\s+([01]|wx\w+)/) do | define |
+                val_str = $2
+                feat_str = $1
+                if val_str.start_with?('wx')
+                  feat_val = !!features[val_str.sub(/\Awx/i, '')]
+                else
+                  feat_val = val_str.to_i.zero? ? false : true
+                end
+                feat_id = feat_str.sub(/\Awx/i, '').gsub(/\A__|__\Z/, '')
                 features[feat_id] = feat_val
               end
               # make sure correct platform defines are included as well which will not be the case always

data/rakelib/lib/core/include/enum.inc

@@ -177,6 +177,7 @@ static VALUE wx_Enum_sc_create_enum_class(int argc, VALUE *argv, VALUE self)
   ID id_to_i = rb_intern("to_i");
   ID id_const_set = rb_intern("const_set");
   VALUE enum_klass = rb_funcall(rb_cClass, id_new, 1, cWxEnum, 0);
+  VALUE enum_singleton_klass = rb_funcall(enum_klass, rb_intern("singleton_class"), 0, 0);
   VALUE enum_values = rb_funcall(argv[1], rb_intern("keys"), 0, 0);
   for (int i=0; i<RARRAY_LEN(enum_values) ;++i)
   {
@@ -184,6 +185,8 @@ static VALUE wx_Enum_sc_create_enum_class(int argc, VALUE *argv, VALUE self)
     VALUE enum_value_num = rb_funcall(rb_hash_aref(argv[1], enum_value_name), id_to_i, 0, 0);
     VALUE enum_value = rb_funcall(enum_klass, id_new, 1, enum_value_num, 0);
     rb_funcall(enum_klass, id_const_set, 2, enum_value_name, enum_value, 0);
+    rb_hash_aset(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values), enum_value_num, enum_value);
+    rb_hash_aset(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name), rb_to_symbol(enum_value_name), enum_value);
   }
   rb_hash_aset(rb_iv_get(cEnum_Singleton, __iv_Enum_sc_enums), enum_name, enum_klass);
   return enum_klass;
@@ -230,10 +233,31 @@ static VALUE wx_Enum_sc_get_enum_value(int argc, VALUE *argv, VALUE self)
   return rb_hash_aref(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name), rb_to_symbol(argv[0]));
 }
 
+static VALUE wx_Enum_sc_get_enum_values(VALUE self)
+{
+  VALUE enum_singleton_klass = rb_funcall(self, rb_intern("singleton_class"), 0, 0);
+  return rb_iv_get(enum_singleton_klass, __iv_enum_klass_values);
+}
+
+static VALUE wx_Enum_sc_get_enum_values_by_name(VALUE self)
+{
+  VALUE enum_singleton_klass = rb_funcall(self, rb_intern("singleton_class"), 0, 0);
+  return rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name);
+}
+
+static VALUE wx_Enum_sc_get_enum_names_by_value(VALUE self)
+{
+  VALUE enum_singleton_klass = rb_funcall(self, rb_intern("singleton_class"), 0, 0);
+  return rb_funcall(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name), rb_intern("invert"), 0);
+}
+
 WXRB_EXPORT_FLAG VALUE wxRuby_CreateEnumClass(const char* enum_class_name_cstr)
 {
   VALUE enum_klass = rb_funcall(rb_cClass, rb_intern("new"), 1, cWxEnum, 0);
   rb_define_singleton_method(enum_klass, "[]", VALUEFUNC(wx_Enum_sc_get_enum_value), -1);
+  rb_define_singleton_method(enum_klass, "values", VALUEFUNC(wx_Enum_sc_get_enum_values), 0);
+  rb_define_singleton_method(enum_klass, "values_by_name", VALUEFUNC(wx_Enum_sc_get_enum_values_by_name), 0);
+  rb_define_singleton_method(enum_klass, "names_by_value", VALUEFUNC(wx_Enum_sc_get_enum_names_by_value), 0);
   VALUE enum_singleton_klass = rb_funcall(enum_klass, rb_intern("singleton_class"), 0, 0);
   rb_iv_set(enum_singleton_klass, __iv_enum_klass_values, rb_hash_new());
   rb_iv_set(enum_singleton_klass, __iv_enum_klass_values_by_name, rb_hash_new());
@@ -266,7 +290,13 @@ WXRB_EXPORT_FLAG VALUE wxRuby_GetEnumValueObject(const char* enum_wx_class_name_
     VALUE enum_klass = rb_hash_aref(enum_hash, ID2SYM(rb_intern(enum_class_name)));
     VALUE enum_singleton_klass = rb_funcall(enum_klass, rb_intern("singleton_class"), 0, 0);
     VALUE enum_values_hash = rb_iv_get(enum_singleton_klass, __iv_enum_klass_values);
-    return rb_hash_aref(enum_values_hash, INT2NUM(enum_val));
+    VALUE rc = rb_hash_aref(enum_values_hash, INT2NUM(enum_val));
+    if (NIL_P(rc))
+    {
+      VALUE args[1] = { INT2NUM(enum_val) };
+      rc = rb_class_new_instance(1, args, enum_klass);
+    }
+    return rc;
   }
   return Qnil;
 }

data/rakelib/lib/director/affine_matrix.rb

@@ -0,0 +1,51 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+module WXRuby3
+
+  class Director
+
+    class AffineMatrix2D < Director
+
+      def setup
+        spec.items.unshift('wxAffineMatrix2DBase') << 'wxMatrix2D'
+
+        spec.make_abstract 'wxAffineMatrix2DBase'
+        spec.disable_proxies
+
+        spec.map_apply 'int * OUTPUT' => ['wxDouble *']
+        spec.map 'wxPoint2DDouble *' => 'Wx::Point2DDouble' do
+          map_in ignore: true, temp: 'wxPoint2DDouble tmp', code: '$1 = &tmp;'
+
+          map_argout code: <<~__CODE
+            $result = SWIG_Ruby_AppendOutput($result, SWIG_NewPointerObj(new wxPoint2DDouble(tmp$argnum), SWIGTYPE_p_wxPoint2DDouble, SWIG_POINTER_OWN));
+            __CODE
+        end
+        spec.map 'wxMatrix2D *' => 'Wx::Matrix2D' do
+          map_in ignore: true, temp: 'wxMatrix2D tmp', code: '$1 = &tmp;'
+
+          map_argout code: <<~__CODE
+            $result = SWIG_Ruby_AppendOutput($result, SWIG_NewPointerObj(new wxMatrix2D(tmp$argnum), SWIGTYPE_p_wxPoint2DDouble, SWIG_POINTER_OWN));
+            __CODE
+        end
+
+        spec.ignore 'wxAffineMatrix2D::Mirror',
+                    'wxAffineMatrix2D::TransformPoint',
+                    'wxAffineMatrix2D::TransformDistance',
+                    'wxAffineMatrix2D::IsEqual'
+
+        spec.regard 'wxMatrix2D::m_11', 'wxMatrix2D::m_12',
+                    'wxMatrix2D::m_21', 'wxMatrix2D::m_22'
+
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/director/app.rb

@@ -87,31 +87,47 @@ module WXRuby3
           }
           __HEREDOC
         if Config.platform == :macosx
-          # add accessor methods for the standard OSX menu items
+          # add static accessor methods for the standard OSX menu items
           spec.add_extend_code 'wxApp', <<~__HEREDOC
-            void set_mac_about_menu_itemid(long menu_itemid)
+            static void set_mac_about_menu_itemid(long menu_itemid)
             {
-              $self->s_macAboutMenuItemId = menu_itemid;
+              wxApp::s_macAboutMenuItemId = menu_itemid;
             }
-            long get_mac_about_menu_itemid(long menu_itemid)
+            static long get_mac_about_menu_itemid(long menu_itemid)
             {
-              return $self->s_macAboutMenuItemId;
+              return wxApp::s_macAboutMenuItemId;
             }
-            void set_mac_preferences_menu_itemid(long menu_itemid)
+            static void set_mac_preferences_menu_itemid(long menu_itemid)
             {
-              $self->s_macPreferencesMenuItemId = menu_itemid;
+              wxApp::s_macPreferencesMenuItemId = menu_itemid;
             }
-            long get_mac_preferences_menu_itemid(long menu_itemid)
+            static long get_mac_preferences_menu_itemid(long menu_itemid)
             {
-              return $self->s_macPreferencesMenuItemId;
+              return wxApp::s_macPreferencesMenuItemId;
             }
-            void set_mac_exit_menu_itemid(long menu_itemid)
+            static void set_mac_exit_menu_itemid(long menu_itemid)
             {
-              $self->s_macExitMenuItemId = menu_itemid;
+              wxApp::s_macExitMenuItemId = menu_itemid;
             }
-            long get_mac_exit_menu_itemid(long menu_itemid)
+            static long get_mac_exit_menu_itemid(long menu_itemid)
             {
-              return $self->s_macExitMenuItemId;
+              return wxApp::s_macExitMenuItemId;
+            }
+            static void set_mac_help_menu_title(const wxString& title)
+            {
+              wxApp::s_macHelpMenuTitleName = title;
+            }
+            static const wxString& get_mac_help_menu_title()
+            {
+              return wxApp::s_macHelpMenuTitleName;
+            }
+            static void set_mac_window_menu_title(const wxString& title)
+            {
+              wxApp::s_macWindowMenuTitleName = title;
+            }
+            static const wxString& get_mac_window_menu_title()
+            {
+              return wxApp::s_macWindowMenuTitleName;
             }
             __HEREDOC
         end

data/rakelib/lib/director/art_provider.rb

@@ -28,6 +28,10 @@ module WXRuby3
           // ArtId and ArtClient are basically just strings ...
           typedef wxString wxArtID;
           typedef wxString wxArtClient;
+
+          // Missing from docs
+          %constant const char* wxART_STOP = wxART_STOP;
+          %constant const char* wxART_REFRESH = wxART_REFRESH;
           __HEREDOC
         spec.map *%w[wxArtID wxArtClient], as: 'String', swig: false do
           map_in

data/rakelib/lib/director/cursor.rb

@@ -20,8 +20,12 @@ module WXRuby3
                          'wxCursor::wxCursor(const wxImage &)',
                          'wxCursor::wxCursor(const char *const *)',
                          'wxCursor::wxCursor(const wxCursor &)'
-        spec.ignore 'wxCursor::wxCursor(const char[],int,int,int,int,const char[])',
-                    'wxCursor::wxCursor(const char *const *)'
+        spec.ignore 'wxCursor::wxCursor(const char *const *)'
+        if Config.instance.wx_version >= '3.3.0'
+          spec.ignore 'wxCursor::wxCursor(const char[],int,int,int,int,const char[], const wxColour*, const wxColour*)'
+        else
+          spec.ignore 'wxCursor::wxCursor(const char[],int,int,int,int,const char[])'
+        end
         # ignore stock object (see RubyStockObjects.i)
         spec.ignore %w[wxSTANDARD_CURSOR wxHOURGLASS_CURSOR wxCROSS_CURSOR]
         super

data/rakelib/lib/director/dc.rb

@@ -36,13 +36,8 @@ module WXRuby3
           'wxDC::GetLogicalOrigin(wxCoord *,wxCoord *) const',
           'wxDC::GetHandle'
         ]
-        # ignore Matrix Transformation methods until someone asks for them
-        # TODO : possibly wrap at a later time
-        spec.ignore 'wxDC::SetTransformMatrix',
-                    'wxDC::GetTransformMatrix',
-                    'wxDC::ResetTransformMatrix',
-                    'wxDC::CanUseTransformMatrix'
         spec.disable_proxies
+        spec.disown 'wxGraphicsContext *ctx'
         spec.rename_for_ruby({
           'GetDimensions' => 'wxDC::GetSize(wxCoord *, wxCoord *) const',
           'GetDimensionsMM' => 'wxDC::GetSizeMM(wxCoord *, wxCoord *) const',