wxruby3 0.9.8 → 1.0.0

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/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',

data/rakelib/lib/director/derived_dc.rb

@@ -16,7 +16,8 @@ module WXRuby3
         super
         spec.disable_proxies
         spec.gc_as_untracked spec.module_name
-        if spec.module_name == 'wxScreenDC'
+        case spec.module_name
+        when 'wxScreenDC'
           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
@@ -41,7 +42,7 @@ module WXRuby3
           spec.ignore 'wxScreenDC::StartDrawingOnTop',
                       'wxScreenDC::EndDrawingOnTop',
                       'wxScreenDC::wxScreenDC'
-        elsif spec.module_name == 'wxClientDC'
+        when 'wxClientDC'
           spec.make_abstract 'wxClientDC'
           spec.ignore 'wxClientDC::wxClientDC'
           # as a ClientDC should best always be a temporary stack object
@@ -63,19 +64,38 @@ module WXRuby3
               return rc;
             }
           __HEREDOC
-        elsif spec.module_name == 'wxPaintDC'
+        when 'wxPaintDC'
           spec.make_abstract 'wxPaintDC'
           spec.ignore 'wxPaintDC::wxPaintDC'
-        elsif spec.module_name == 'wxMemoryDC'
-          spec.items << 'wxBufferedDC' << 'wxBufferedPaintDC' << 'wxAutoBufferedPaintDC'
+          spec.add_header_code <<~__HEREDOC
+            // we need this static method here because we do not want SWIG to parse the preprocessor 
+            // statements (#if/#else/#endif) which it does in %extend blocks
+            #include "wx/dcbuffer.h"
+            static VALUE do_check_native_double_buffer()
+            {
+            #if wxALWAYS_NATIVE_DOUBLE_BUFFER
+              return Qtrue;
+            #else
+              return Qfalse;
+            #endif
+            }
+            __HEREDOC
+          spec.add_extend_code 'wxPaintDC', <<~__HEREDOC
+            #include "wx/dcbuffer.h"
+            static VALUE has_native_double_buffer()
+            {
+              return do_check_native_double_buffer();
+            }  
+            __HEREDOC
+        when 'wxMemoryDC'
+          spec.items << 'wxBufferedDC' << 'wxBufferedPaintDC'
+          spec.gc_as_untracked %w[wxBufferedDC wxBufferedPaintDC]
           spec.make_abstract 'wxMemoryDC'
           spec.make_abstract 'wxBufferedDC'
           spec.make_abstract 'wxBufferedPaintDC'
-          spec.make_abstract 'wxAutoBufferedPaintDC'
           spec.ignore 'wxMemoryDC::wxMemoryDC',
                       'wxBufferedDC::wxBufferedDC',
-                      'wxBufferedPaintDC::wxBufferedPaintDC',
-                      'wxAutoBufferedPaintDC::wxAutoBufferedPaintDC'
+                      'wxBufferedPaintDC::wxBufferedPaintDC'
           # like all DC's these should best always be a temporary stack objects
           # we do not allow creation in Ruby but rather provide a class
           # method for block execution on a temp dc
@@ -197,23 +217,7 @@ module WXRuby3
               return rc;
             }
           __HEREDOC
-          spec.add_extend_code 'wxAutoBufferedPaintDC', <<~__HEREDOC
-            static VALUE draw_on(wxWindow* tgt)
-            {
-              if (!wxRuby_IsAppRunning()) 
-                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
-              VALUE rc = Qnil;
-              if (rb_block_given_p ())
-              {
-                wxAutoBufferedPaintDC dc(tgt);
-                wxAutoBufferedPaintDC* dc_ptr = &dc;
-                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxAutoBufferedPaintDC, 0);
-                rc = rb_yield(rb_dc);
-              }
-              return rc;
-            }
-          __HEREDOC
-        elsif spec.module_name == 'wxMirrorDC'
+        when 'wxMirrorDC'
           spec.make_abstract 'wxMirrorDC'
           spec.ignore 'wxMirrorDC::wxMirrorDC'
           # as a MirrorDC should best always be a temporary stack object
@@ -235,7 +239,7 @@ module WXRuby3
               return rc;
             }
           __HEREDOC
-        elsif spec.module_name == 'wxSVGFileDC'
+        when 'wxSVGFileDC'
           spec.items.concat %w[wxSVGBitmapHandler wxSVGBitmapFileHandler wxSVGBitmapEmbedHandler]
           spec.make_abstract 'wxSVGFileDC'
           spec.ignore 'wxSVGFileDC::wxSVGFileDC'
@@ -272,7 +276,7 @@ module WXRuby3
                       'wxSVGFileDC::EndDoc',
                       'wxSVGFileDC::StartPage',
                       'wxSVGFileDC::EndPage'
-        elsif spec.module_name == 'wxGCDC'
+        when 'wxGCDC'
           spec.make_abstract 'wxGCDC'
           spec.ignore 'wxGCDC::wxGCDC'
           # like all DC this should best always be a temporary stack object
@@ -301,6 +305,24 @@ module WXRuby3
               __HEREDOC
           end
           spec.add_extend_code 'wxGCDC', <<~__HEREDOC
+            static VALUE draw_on()
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                // Somehow there seems to be a problem with the Ruby GCDC value 
+                // being GC-ed unless we block GC for the duration of the block
+                // execution. Unclear why. We have similar code for other objects
+                // where this issue does not come up.
+                wxGCDC gc_dc;
+                wxGCDC* dc_ptr = &gc_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxGCDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
             static VALUE draw_on(const wxWindowDC& dc)
             {
               if (!wxRuby_IsAppRunning()) 
@@ -355,9 +377,10 @@ module WXRuby3
               }
               return rc;
             }
-          __HEREDOC
+            __HEREDOC
+          spec.disown 'wxGraphicsContext *gc'
           spec.ignore 'wxGCDC::wxGCDC(const wxEnhMetaFileDC &)'
-        elsif spec.module_name == 'wxScaledDC'
+        when 'wxScaledDC'
           spec.items.clear # wxRuby extension; no XML docs
           spec.override_inheritance_chain('wxScaledDC', %w[wxDC wxObject])
           # as there are no dependencies parsed from XML make sure we're initialized after Wx::DC
@@ -398,7 +421,7 @@ module WXRuby3
               wxScaledDC(wxDC& target, double scale);
             };
             __HEREDOC
-        elsif spec.module_name == 'wxPrinterDC'
+        when 'wxPrinterDC'
           spec.make_abstract 'wxPrinterDC'
           spec.ignore 'wxPrinterDC::wxPrinterDC'
           # as a PrinterDC should best always be a temporary stack object
@@ -420,7 +443,7 @@ module WXRuby3
               return rc;
             }
           __HEREDOC
-        elsif spec.module_name == 'wxPostScriptDC'
+        when 'wxPostScriptDC'
           spec.make_abstract 'wxPostScriptDC'
           spec.ignore 'wxPostScriptDC::wxPostScriptDC'
           # as a PostScriptDC should best always be a temporary stack object
@@ -442,6 +465,40 @@ module WXRuby3
               return rc;
             }
           __HEREDOC
+        when 'wxDCOverlay'
+          spec.items << 'wxOverlay'
+          spec.make_abstract 'wxDCOverlay'
+          spec.ignore 'wxDCOverlay::wxDCOverlay'
+          spec.add_extend_code 'wxDCOverlay', <<~__HEREDOC
+            static VALUE draw_on(wxOverlay &overlay, wxDC *dc)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxDCOverlay ovl_dc(overlay, dc);
+                wxDCOverlay* ovl_dc_ptr = &ovl_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxDCOverlay, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            static VALUE draw_on(wxOverlay &overlay, wxDC *dc, int x, int y, int width, int height)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxDCOverlay ovl_dc(overlay, dc, x, y, width, height);
+                wxDCOverlay* ovl_dc_ptr = &ovl_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxDCOverlay, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            __HEREDOC
         else
           # ctors of all other derived DC require a running App
           spec.require_app spec.module_name

data/rakelib/lib/director/dialog.rb

@@ -212,14 +212,6 @@ module WXRuby3
                 return Qfalse;
             }
             __HEREDOC
-        when 'wxSymbolPickerDialog'
-          # redefine these to prevent problematic handling of title/caption defaults
-          spec.ignore 'wxSymbolPickerDialog::wxSymbolPickerDialog(const wxString &, const wxString &, const wxString &, wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, long)',
-                      'wxSymbolPickerDialog::Create',
-                      ignore_doc: false
-          spec.extend_interface 'wxSymbolPickerDialog',
-                                'wxSymbolPickerDialog(const wxString &symbol, const wxString &initialFont, const wxString &normalTextFont, wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style)',
-                                'bool Create(const wxString &symbol, const wxString &initialFont, const wxString &normalTextFont, wxWindow *parent, wxWindowID id, const wxString &caption, const wxPoint &pos, const wxSize &size, long style)'
         when 'wxWizard'
           # special handling
           spec.ignore 'wxWizard::GetBitmap'