wxruby3 0.9.0.pre.beta.14 → 0.9.0.pre.rc.1

data/rakelib/lib/director/derived_dc.rb

@@ -12,24 +12,24 @@ module WXRuby3
       def setup
         super
         spec.disable_proxies
+        spec.gc_as_untracked spec.module_name
         if spec.module_name == 'wxScreenDC'
           spec.make_abstract 'wxScreenDC'
-          spec.gc_never 'wxScreenDC'
           # as a ScreenDC should always be a temporary stack object
           # we do not allow creation in Ruby but rather provide a class
           # method for block execution on a temp dc
           spec.add_extend_code 'wxScreenDC', <<~__HEREDOC
-            static VALUE paint(VALUE proc)
+            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 ())
               {
                 wxScreenDC screen_dc;
-                wxDC* dc_ptr = &screen_dc;
+                wxScreenDC* dc_ptr = &screen_dc;
                 VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxScreenDC, 0);
                 rc = rb_yield(rb_dc);
-                SWIG_RubyRemoveTracking((void *)dc_ptr);
-                DATA_PTR(rb_dc) = NULL;
               }
               return rc;
             }
@@ -38,8 +38,223 @@ module WXRuby3
           spec.ignore 'wxScreenDC::StartDrawingOnTop',
                       'wxScreenDC::EndDrawingOnTop',
                       'wxScreenDC::wxScreenDC'
+        elsif spec.module_name == 'wxClientDC'
+          spec.make_abstract 'wxClientDC'
+          spec.ignore 'wxClientDC::wxClientDC'
+          # as a ClientDC should best always be a temporary stack object
+          # we do not allow creation in Ruby but rather provide a class
+          # method for block execution on a temp dc
+          spec.add_extend_code 'wxClientDC', <<~__HEREDOC
+            static VALUE draw_on(wxWindow* win)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxClientDC client_dc(win);
+                wxClientDC* dc_ptr = &client_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxClientDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+          __HEREDOC
+        elsif spec.module_name == 'wxPaintDC'
+          spec.make_abstract 'wxPaintDC'
+          spec.ignore 'wxPaintDC::wxPaintDC'
+        elsif spec.module_name == 'wxMemoryDC'
+          spec.items << 'wxBufferedDC' << 'wxBufferedPaintDC' << 'wxAutoBufferedPaintDC'
+          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'
+          # 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
+          spec.add_extend_code 'wxMemoryDC', <<~__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 ())
+              {
+                wxMemoryDC mem_dc;
+                wxMemoryDC* dc_ptr = &mem_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxMemoryDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            static VALUE draw_on(wxDC* tgt)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxMemoryDC mem_dc(tgt);
+                wxMemoryDC* dc_ptr = &mem_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxMemoryDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            static VALUE draw_on(wxBitmap& tgt)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxMemoryDC mem_dc(tgt);
+                wxMemoryDC* dc_ptr = &mem_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxMemoryDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+          __HEREDOC
+          spec.add_extend_code 'wxBufferedDC', <<~__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 ())
+              {
+                wxBufferedDC dc;
+                wxBufferedDC* dc_ptr = &dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxBufferedDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            static VALUE draw_on(wxDC* tgt, const wxSize &area, int style=wxBUFFER_CLIENT_AREA)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxBufferedDC dc(tgt, area, style);
+                wxBufferedDC* dc_ptr = &dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxBufferedDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            static VALUE draw_on(wxDC* tgt, wxBitmap &buffer=wxNullBitmap, int style=wxBUFFER_CLIENT_AREA)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxBufferedDC dc(tgt, buffer, style);
+                wxBufferedDC* dc_ptr = &dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxBufferedDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+          __HEREDOC
+          spec.add_extend_code 'wxBufferedPaintDC', <<~__HEREDOC
+            static VALUE draw_on(wxWindow* tgt, int style=wxBUFFER_CLIENT_AREA)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxBufferedPaintDC dc(tgt, style);
+                wxBufferedPaintDC* dc_ptr = &dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxBufferedPaintDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            static VALUE draw_on(wxWindow* tgt, wxBitmap &buffer=wxNullBitmap, int style=wxBUFFER_CLIENT_AREA)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxBufferedPaintDC dc(tgt, buffer, style);
+                wxBufferedPaintDC* dc_ptr = &dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxBufferedPaintDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              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'
+          spec.make_abstract 'wxMirrorDC'
+          spec.ignore 'wxMirrorDC::wxMirrorDC'
+          # as a MirrorDC should best always be a temporary stack object
+          # we do not allow creation in Ruby but rather provide a class
+          # method for block execution on a temp dc
+          spec.add_extend_code 'wxMirrorDC', <<~__HEREDOC
+            static VALUE draw_on(wxDC* dc, bool mirror)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxMirrorDC dc(dc, mirror);
+                wxMirrorDC* dc_ptr = &dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxMirrorDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+          __HEREDOC
         elsif spec.module_name == 'wxSVGFileDC'
           spec.items.concat %w[wxSVGBitmapHandler wxSVGBitmapFileHandler wxSVGBitmapEmbedHandler]
+          spec.make_abstract 'wxSVGFileDC'
+          spec.ignore 'wxSVGFileDC::wxSVGFileDC'
+          # like all DC this should best always be a temporary stack object
+          # we do not allow creation in Ruby but rather provide a class
+          # method for block execution on a temp dc
+          spec.add_extend_code 'wxSVGFileDC', <<~__HEREDOC
+            static VALUE draw_on(const wxString &filename, int width=320, int height=240, double dpi=72, const wxString &title=wxString())
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxSVGFileDC dc(filename, width, height, dpi, title);
+                wxSVGFileDC* dc_ptr = &dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxSVGFileDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+          __HEREDOC
           spec.disown 'wxSVGBitmapHandler *handler'
           # all inherited from wxDC; only documented since they are not implemented for this DC class
           spec.ignore 'wxSVGFileDC::DestroyClippingRegion',
@@ -56,13 +271,15 @@ module WXRuby3
                       'wxSVGFileDC::EndPage'
         elsif spec.module_name == 'wxGCDC'
           spec.make_abstract 'wxGCDC'
-          spec.gc_never 'wxGCDC'
-          # as a GCDC should always be a temporary stack object
+          spec.ignore 'wxGCDC::wxGCDC'
+          # like all DC this should best always be a temporary stack object
           # we do not allow creation in Ruby but rather provide class
           # methods for block execution on a temp dc
           spec.add_extend_code 'wxGCDC', <<~__HEREDOC
             static VALUE draw_on(const wxWindowDC& dc)
             {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
               VALUE rc = Qnil;
               if (rb_block_given_p ())
               {
@@ -70,19 +287,17 @@ module WXRuby3
                 // 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.
-                VALUE gc_on = rb_gc_disable();
                 wxGCDC gc_dc(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);
-                SWIG_RubyRemoveTracking((void *)dc_ptr);
-                DATA_PTR(rb_dc) = NULL;
-                if (gc_on == Qtrue) rb_gc_enable();
               }
               return rc;
             }
             static VALUE draw_on(const wxMemoryDC& dc)
             {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
               VALUE rc = Qnil;
               if (rb_block_given_p ())
               {
@@ -90,19 +305,17 @@ module WXRuby3
                 // 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.
-                VALUE gc_on = rb_gc_disable();
                 wxGCDC gc_dc(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);
-                SWIG_RubyRemoveTracking((void *)dc_ptr);
-                DATA_PTR(rb_dc) = NULL;
-                if (gc_on == Qtrue) rb_gc_enable();
               }
               return rc;
             }
             static VALUE draw_on(const wxPrinterDC& dc)
             {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
               VALUE rc = Qnil;
               if (rb_block_given_p ())
               {
@@ -110,19 +323,17 @@ module WXRuby3
                 // 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.
-                VALUE gc_on = rb_gc_disable();
                 wxGCDC gc_dc(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);
-                SWIG_RubyRemoveTracking((void *)dc_ptr);
-                DATA_PTR(rb_dc) = NULL;
-                if (gc_on == Qtrue) rb_gc_enable();
               }
               return rc;
             }
             static VALUE draw_on(wxGraphicsContext* gc)
             {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
               VALUE rc = Qnil;
               if (rb_block_given_p ())
               {
@@ -130,14 +341,10 @@ module WXRuby3
                 // 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.
-                VALUE gc_on = rb_gc_disable();
                 wxGCDC gc_dc(gc);
                 wxGCDC* dc_ptr = &gc_dc;
                 VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxGCDC, 0);
                 rc = rb_yield(rb_dc);
-                SWIG_RubyRemoveTracking((void *)dc_ptr);
-                DATA_PTR(rb_dc) = NULL;
-                if (gc_on == Qtrue) rb_gc_enable();
               }
               return rc;
             }
@@ -148,7 +355,6 @@ module WXRuby3
           spec.override_inheritance_chain('wxScaledDC', %w[wxDC wxObject])
           # as there are no dependencies parsed from XML make sure we're initialized after Wx::DC
           spec.initialize_at_end = true
-          spec.gc_never 'wxScaledDC'
           spec.no_proxy 'wxScaledDC'
           spec.include 'wxruby-ScaledDC.h'
           # wxScaledDc should ever only be used in a restricted scope
@@ -160,6 +366,8 @@ module WXRuby3
             %extend wxScaledDC {
             static VALUE draw_on(wxDC& target, double scale)
             {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
               VALUE rc = Qnil;
               if (rb_block_given_p())
               {
@@ -167,8 +375,6 @@ module WXRuby3
                 wxScaledDC* p_scaled_dc = &scaled_dc;                        
                 VALUE rb_scaled_dc = SWIG_NewPointerObj(SWIG_as_voidptr(p_scaled_dc), SWIGTYPE_p_wxScaledDC, 0);
                 rc = rb_yield(rb_scaled_dc);
-                SWIG_RubyRemoveTracking((void *)p_scaled_dc);
-                DATA_PTR(rb_scaled_dc) = NULL;
               }
               return rc;
             }
@@ -180,10 +386,55 @@ module WXRuby3
             class wxScaledDC : public wxDC
             {
             public:
-              wxScaledDC(wxDC& target, double scale);
               virtual ~wxScaledDC() = 0;
+            protected:
+              wxScaledDC(wxDC& target, double scale);
             };
             __HEREDOC
+        elsif spec.module_name == 'wxPrinterDC'
+          spec.make_abstract 'wxPrinterDC'
+          spec.ignore 'wxPrinterDC::wxPrinterDC'
+          # as a PrinterDC should best always be a temporary stack object
+          # we do not allow creation in Ruby but rather provide a class
+          # method for block execution on a temp dc
+          spec.add_extend_code 'wxPrinterDC', <<~__HEREDOC
+            static VALUE draw_on(const wxPrintData &printData)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxPrinterDC dc(printData);
+                wxPrinterDC* dc_ptr = &dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxPrinterDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+          __HEREDOC
+        elsif spec.module_name == 'wxPostScriptDC'
+          spec.make_abstract 'wxPostScriptDC'
+          spec.ignore 'wxPostScriptDC::wxPostScriptDC'
+          # as a PostScriptDC should best always be a temporary stack object
+          # we do not allow creation in Ruby but rather provide a class
+          # method for block execution on a temp dc
+          spec.add_extend_code 'wxPostScriptDC', <<~__HEREDOC
+            static VALUE draw_on(const wxPrintData &printData)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxPostScriptDC dc(printData);
+                wxPostScriptDC* dc_ptr = &dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxPostScriptDC, 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

@@ -64,9 +64,12 @@ module WXRuby3
             __HEREDOC
         when 'wxFindReplaceDialog'
           spec.ignore 'wxFindReplaceDialog::wxFindReplaceDialog()'
-          spec.map_apply 'SWIGTYPE *DISOWN' => 'wxFindReplaceData* data'
+          # add undocumented method
+          spec.extend_interface 'wxFindReplaceDialog', 'void SetData(wxFindReplaceData *data)'
           spec.do_not_generate(:variables, :enums)
         when 'wxColourDialog'
+          spec.items << 'wxColourData'
+          spec.gc_as_untracked 'wxColourData'
           # make interface GC-safe
           spec.ignore 'wxColourDialog::GetColourData'
           spec.add_extend_code 'wxColourDialog', <<~__HEREDOC

data/rakelib/lib/director/dir_picker_ctrl.rb

@@ -13,7 +13,7 @@ module WXRuby3
 
       def setup
         super
-        spec.add_swig_code '%feature("notabstract") wxDirPickerCtrl;'
+        spec.make_concrete 'wxDirPickerCtrl'
         spec.do_not_generate(:variables, :defines, :enums, :functions) # with FileDirPickerEvent
       end
     end # class DirPickerCtrl

data/rakelib/lib/director/event.rb

@@ -29,7 +29,7 @@ module WXRuby3
           spec.no_proxy 'wxEvent::Clone'
           spec.regard 'wxEvent::Clone', regard_doc: false # need updated doc
           # need this to force alloc func
-          spec.add_swig_code '%feature("notabstract") wxEvent;'
+          spec.make_concrete 'wxEvent'
           # type mapping for result #clone
           spec.map 'wxEvent*' => 'Wx::Event' do
             map_out code: <<~__CODE
@@ -143,7 +143,7 @@ module WXRuby3
             wxCommandEvent::GetExtraLong
           }
           # need this to force alloc func
-          spec.add_swig_code '%feature("notabstract") wxCommandEvent;'
+          spec.make_concrete 'wxCommandEvent'
           spec.add_header_code <<~__HEREDOC
             // Cf wxEvent - has to be written as a C+++ subclass to ensure correct
             // GC/thread protection of Ruby instance variables when user-written
@@ -222,7 +222,7 @@ module WXRuby3
                 spec.make_abstract(citem)
               else
                 # need this to force alloc func
-                spec.add_swig_code "%feature(\"notabstract\") #{citem};"
+                spec.make_concrete(citem)
               end
             end
           end

data/rakelib/lib/director/event_blocker.rb

@@ -0,0 +1,41 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class EventBlocker < Director
+
+      def setup
+        super
+        spec.gc_as_untracked # no tracking
+        spec.make_abstract('wxEventBlocker')
+        spec.ignore 'wxEventBlocker::wxEventBlocker'
+        spec.no_proxy 'wxEventBlocker'
+        # needs construction on stack so make abstract and add factory class method for block execution
+        spec.add_extend_code 'wxEventBlocker', <<~__HEREDOC
+          static VALUE blocked_for(wxWindow* win, wxEventType evt_type = wxEVT_ANY) 
+          {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxEventBlocker blkr(win, evt_type);
+                wxEventBlocker *blk_p = &blkr;
+                VALUE rb_blkr = SWIG_NewPointerObj(SWIG_as_voidptr(blk_p), SWIGTYPE_p_wxEventBlocker, 0);
+                rc = rb_yield(rb_blkr);
+              }
+              return rc;
+          }
+          __HEREDOC
+        spec.do_not_generate :variables, :defines, :enums, :functions
+      end
+    end # class EventBlocker
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/event_filter.rb

@@ -0,0 +1,20 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class EventFilter < Director
+
+      def setup
+        super
+        spec.gc_as_untracked # no tracking
+      end
+    end # class EventFilter
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/event_handler.rb

@@ -64,6 +64,32 @@ module WXRuby3
               $1 = wx_ev;
               __CODE
           end
+          # add special mapping for event filters so we can accept the app instance as well
+          # although Wx::App is not derived from Wx::EventFilter in wxRuby (no multiple inheritance)
+          spec.map 'wxEventFilter*' => 'Wx::EventFilter,Wx::App' do
+            map_in code: <<~__CODE
+              int res = SWIG_ERROR; 
+              void *argp = 0;
+              if (rb_obj_is_kind_of($input, ((swig_class*)SWIGTYPE_p_wxEventFilter->clientdata)->klass))
+              {
+                res = SWIG_ConvertPtr($input, &argp, SWIGTYPE_p_wxEventFilter, 0);  
+                if (SWIG_IsOK(res)) $1 = reinterpret_cast< wxEventFilter * >(argp);
+              }
+              else
+              {
+                VALUE app_klass = rb_eval_string("Wx::App");
+                if (rb_obj_is_kind_of($input, app_klass))
+                {
+                  res = SWIG_ConvertPtr($input, &argp, wxRuby_GetSwigTypeForClass(app_klass), 0);
+                  if (SWIG_IsOK(res)) $1 = reinterpret_cast< wxApp * >(argp);
+                }
+              }
+              if (!SWIG_IsOK(res)) 
+              {
+                SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "wxEventFilter *","wxEvtHandler::$symname", 1, $input)); 
+              }
+              __CODE
+          end
           spec.add_runtime_code <<~__HEREDOC
             static swig_class wxRuby_GetSwigClassWxEvtHandler();
             WXRUBY_EXPORT VALUE wxRuby_GetEventTypeClassMap();
@@ -324,8 +350,9 @@ module WXRuby3
             }     
   
             WXRUBY_EXPORT VALUE wxRuby_GetEventTypeClassMap() {
-              VALUE map_name = rb_str_new2("EVENT_TYPE_CLASS_MAP");
-              return rb_const_get(wxRuby_GetSwigClassWxEvtHandler().klass, rb_to_id(map_name)); 
+              return rb_funcall(wxRuby_GetSwigClassWxEvtHandler().klass, 
+                                rb_intern("send"), 
+                                1, ID2SYM(rb_intern("get_event_type_class_map")), 0);
             }
             __HEREDOC
           spec.do_not_generate :typedefs, :variables, :enums, :defines, :functions

data/rakelib/lib/director/file_picker_ctrl.rb

@@ -13,7 +13,7 @@ module WXRuby3
 
       def setup
         super
-        spec.add_swig_code '%feature("notabstract") wxFilePickerCtrl;'
+        spec.make_concrete 'wxFilePickerCtrl'
         spec.do_not_generate(:variables, :defines, :enums, :functions) # with FileDirPickerEvent
       end
     end # class FilePickerCtrl

data/rakelib/lib/director/find_replace_data.rb

@@ -11,6 +11,7 @@ module WXRuby3
 
       def setup
         super
+        spec.gc_as_object 'wxFindReplaceData'
         spec.do_not_generate(:variables, :enums)
       end
     end # class FindReplaceData

data/rakelib/lib/director/font.rb

@@ -12,7 +12,8 @@ module WXRuby3
       def setup
         super
         spec.items << 'wxFontInfo'
-        spec.gc_as_temporary 'wxFontInfo'
+        spec.gc_as_untracked 'wxFontInfo'
+        spec.gc_as_untracked 'wxFont'
         # all but the default ctor require a running App
         spec.require_app 'wxFont::wxFont(const wxFont &)',
                          'wxFont::wxFont(const wxFontInfo &)',

data/rakelib/lib/director/font_data.rb

@@ -11,6 +11,7 @@ module WXRuby3
 
       def setup
         super
+        spec.gc_as_untracked 'wxFontData'
         # add copy ctor missing from XML docs
         spec.extend_interface 'wxFontData',
                               'wxFontData(const wxFontData & other)'

data/rakelib/lib/director/font_picker_ctrl.rb

@@ -13,7 +13,7 @@ module WXRuby3
 
       def setup
         super
-        spec.add_swig_code '%feature("notabstract") wxFontPickerCtrl;'
+        spec.make_concrete 'wxFontPickerCtrl'
         spec.do_not_generate(:variables, :defines, :enums, :functions) # with FontPickerEvent
       end
     end # class FontPickerCtrl

data/rakelib/lib/director/gdi_object.rb

@@ -12,6 +12,7 @@ module WXRuby3
       def setup
         spec.make_abstract('wxGDIObject')
         spec.no_proxy('wxGDIObject')
+        spec.gc_as_untracked 'wxGDIObject'
         super
       end
     end # class GDIObject