wxruby3 0.9.0.pre.rc.3 → 0.9.1

data/rakelib/lib/director/caret.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/check_listbox.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './ctrl_with_items'

data/rakelib/lib/director/choice.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './ctrl_with_items'

data/rakelib/lib/director/clipboard.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/collapsible_pane.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/collapsible_pane_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'

data/rakelib/lib/director/colour.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -16,6 +19,11 @@ module WXRuby3
           wxColour::GetPixel wxTransparentColour wxColour::operator!=
           wxBLACK wxBLUE wxCYAN wxGREEN wxYELLOW wxLIGHT_GREY wxRED wxWHITE
           ])
+        spec.map 'unsigned char *' => 'Integer' do
+          map_in temp: 'unsigned char tmp', code: 'tmp = NUM2UINT($input); $1 = &tmp;'
+          map_argout code: '$result = SWIG_Ruby_AppendOutput($result, UINT2NUM(tmp$argnum));'
+          map_typecheck precedence: 'POINTER', code: '$1 = (TYPE($input) == T_FIXNUM);'
+        end
         # rename static method to prevent masking the instance method
         spec.rename_for_ruby 'create_disabled' => 'wxColour::MakeDisabled(unsigned char *r, unsigned char *g, unsigned char *b, unsigned char brightness=255)',
                              # for consistency

data/rakelib/lib/director/colour_picker_ctrl.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/combobox.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './ctrl_with_items'

data/rakelib/lib/director/comboctrl.rb

@@ -0,0 +1,94 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class ComboCtrl < Window
+
+      def setup
+        super
+        spec.items << 'wxComboPopup' << 'wxOwnerDrawnComboBox' << 'wxItemContainer'
+        # mixin TextEntry
+        spec.include_mixin 'wxComboCtrl', { 'Wx::TextEntry' => 'wxTextEntryBase' }
+        spec.override_inheritance_chain('wxComboCtrl',
+                                        %w[wxControl
+                                           wxWindow
+                                           wxEvtHandler
+                                           wxObject])
+        spec.regard %w[
+          wxComboCtrl::AnimateShow
+          wxComboCtrl::DoSetPopupControl
+          wxComboCtrl::DoShowPopup
+        ]
+        # turn wxComboPopup into a mixin module
+        spec.make_mixin 'wxComboPopup'
+        # override inheritance chain
+        spec.override_inheritance_chain('wxOwnerDrawnComboBox', %w[wxComboCtrl wxControl wxWindow wxEvtHandler wxObject])
+        spec.fold_bases('wxOwnerDrawnComboBox' => %w[wxItemContainer])
+        spec.regard %w[
+          wxOwnerDrawnComboBox::OnDrawBackground
+          wxOwnerDrawnComboBox::OnDrawItem
+          wxOwnerDrawnComboBox::OnMeasureItem
+          wxOwnerDrawnComboBox::OnMeasureItemWidth
+        ]
+        # unuseful overloads
+        spec.ignore 'wxOwnerDrawnComboBox::wxOwnerDrawnComboBox(wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, int, const wxString [], long, const wxValidator &, const wxString &)',
+                    'wxOwnerDrawnComboBox::Create(wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, int, const wxString [], long, const wxValidator &, const wxString &)'
+        spec.ignore('wxItemContainer::Append(const wxString &, wxClientData *)',
+                    'wxItemContainer::Append(const std::vector< wxString > &)',
+                    'wxItemContainer::Append(const wxArrayString &, wxClientData **)',
+                    'wxItemContainer::Append(unsigned int, const wxString *)',
+                    'wxItemContainer::Append(unsigned int, const wxString *, void **)',
+                    'wxItemContainer::Append(unsigned int, const wxString *, wxClientData **)',
+                    'wxItemContainer::Insert(const wxString &, unsigned int, wxClientData *)',
+                    'wxItemContainer::Insert(const std::vector< wxString > &)',
+                    'wxItemContainer::Insert(const wxArrayString &, unsigned int, wxClientData **)',
+                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int)',
+                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, void **)',
+                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, wxClientData **)',
+                    'wxItemContainer::Set(const std::vector< wxString > &)',
+                    'wxItemContainer::Set(const wxArrayString &, wxClientData **)',
+                    'wxItemContainer::Set(unsigned int, const wxString *)',
+                    'wxItemContainer::Set(unsigned int, const wxString *, void **)',
+                    'wxItemContainer::Set(unsigned int, const wxString *, wxClientData **)',
+                    'wxItemContainer::DetachClientObject',
+                    'wxItemContainer::HasClientObjectData',
+                    'wxItemContainer::GetClientObject',
+                    'wxItemContainer::SetClientObject',
+                    'wxItemContainer::HasClientUntypedData',
+                    'wxItemContainer::Clear')
+        spec.ignore('wxItemContainer::Append(const wxArrayString &, void **)',
+                    'wxItemContainer::Insert(const wxArrayString &, unsigned int, void **)',
+                    'wxItemContainer::Set(const wxArrayString &, void **)', ignore_doc: false)
+        # ambiguous
+        spec.ignore 'wxOwnerDrawnComboBox::IsEmpty', ignore_doc: false
+        # for doc only
+        spec.map 'void** clientData' => 'Array', swig: false do
+          map_in code: ''
+        end
+        spec.ignore(%w[wxItemContainer::GetClientData wxItemContainer::SetClientData], ignore_doc: false) # keep docs
+        # Replace the old Wx definition of this method (which segfaults)
+        # Only need the setter as we cache data in Ruby and the getter
+        # therefor can be pure Ruby
+        spec.add_extend_code 'wxOwnerDrawnComboBox', <<~__HEREDOC
+            VALUE set_client_data(int n, VALUE item_data) {
+              self->SetClientData(n, (void *)item_data);
+              return item_data;
+            }
+        __HEREDOC
+      end
+
+    end # class ComboCtrl
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/config_base.rb

@@ -0,0 +1,135 @@
+# 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 ConfigBase < Director
+
+      def setup
+        super
+        spec.items.clear
+        spec.add_header_code <<~__HEREDOC
+          #include "wxruby-Config.h"
+
+          static const char * __iv_ConfigBase_sc_config = "@config";
+
+          static VALUE config_base_get(int argc, VALUE *argv, VALUE self)
+          {
+            bool autoCreate = true;
+            if (argc > 0)
+            {
+              if (argc > 1)
+              {
+                rb_raise(rb_eArgError, "Expected a single boolean argument");
+                return Qnil;
+              }
+              autoCreate = !(argv[0] == Qfalse || argv[0] == Qnil);
+            }
+
+            VALUE cConfigBase_Singleton = rb_funcall(g_cConfigBase, rb_intern("singleton_class"), 0, 0);
+            VALUE curConfig = rb_iv_get(cConfigBase_Singleton, __iv_ConfigBase_sc_config);
+            // create new config instance if none exists and autoCreate is true
+            if (NIL_P(curConfig) && autoCreate)
+            {
+              // create new ConfigBase instance
+              curConfig = rb_class_new_instance(0, 0, g_cConfig);
+              // set global wxConfigBase instance to a new Ruby Config wrapper
+              wxConfigBase::Set(wxRuby_Ruby2ConfigBase(curConfig));
+              // store global ConfigBase instance as Ruby instance variable of ConfigBase singleton class
+              // (keeps it safe from GC)
+              VALUE cConfigBase_Singleton = rb_funcall(g_cConfigBase, rb_intern("singleton_class"), 0, 0);
+              rb_iv_set(cConfigBase_Singleton, __iv_ConfigBase_sc_config, curConfig);
+            }
+            return curConfig;
+          }
+
+          static VALUE config_base_create(int argc, VALUE *argv, VALUE self)
+          {
+            if (argc>0)
+            {
+              rb_raise(rb_eArgError, "No arguments allowed.");
+              return Qnil;
+            }
+            return config_base_get(0, 0, self);
+          }
+
+          static VALUE config_base_set(int argc, VALUE *argv, VALUE self)
+          {
+            VALUE newCfg = Qnil;
+            if (argc>0)
+            {
+              if (argc > 1)
+              {
+                rb_raise(rb_eArgError, "Expected a single argument.");
+                return Qnil;
+              }
+              newCfg = argv[0];
+              if (!NIL_P(newCfg) && rb_obj_is_kind_of(newCfg, g_cConfig) != Qtrue)
+              {
+                rb_raise(rb_eArgError, "Expected a Wx::Config instance");
+                return Qnil;
+              }
+            }
+
+            // get existing config (if any) 
+            VALUE cConfigBase_Singleton = rb_funcall(g_cConfigBase, rb_intern("singleton_class"), 0, 0);
+            VALUE curConfig = rb_iv_get(cConfigBase_Singleton, __iv_ConfigBase_sc_config);
+            // set new config instance (could be nil)
+            if (!NIL_P(newCfg))
+            {
+              // set global wxConfigBase instance to a (new) Ruby Hash wrapper
+              wxConfigBase::Set(wxRuby_Ruby2ConfigBase(newCfg));
+            }
+            rb_iv_set(cConfigBase_Singleton, __iv_ConfigBase_sc_config, newCfg);
+
+            return curConfig; // return old config (if any)
+          }
+          __HEREDOC
+        spec.add_wrapper_code <<~__HEREDOC
+          SWIGINTERN void 
+          _free_config(void* cfg)
+          {
+            if (cfg)
+            {
+              wxRbHashConfig* config = (wxRbHashConfig*)cfg;
+              delete config;
+            }
+          }
+
+          SWIGINTERN VALUE
+          #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+          config_allocate(VALUE self)
+          #else
+          config_allocate(int argc, VALUE *argv, VALUE self)
+          #endif
+          {
+            VALUE vresult = Data_Wrap_Struct(g_cConfig, 0, _free_config, 0);
+          #ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+            rb_obj_call_init(vresult, argc, argv);
+          #endif
+            return vresult;
+          }
+          __HEREDOC
+        spec.add_init_code <<~__HEREDOC
+          g_cConfigBase = rb_define_class_under(mWxCore, "ConfigBase", rb_cObject);
+          rb_define_module_function(g_cConfigBase, "create", VALUEFUNC(config_base_create), -1);
+          rb_define_module_function(g_cConfigBase, "get", VALUEFUNC(config_base_get), -1);
+          rb_define_module_function(g_cConfigBase, "set", VALUEFUNC(config_base_set), -1);
+
+          g_cConfig = rb_define_class_under(mWxCore, "Config", g_cConfigBase);
+          rb_define_alloc_func(g_cConfig, config_allocate);
+          __HEREDOC
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/director/context_help_button.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './button'

data/rakelib/lib/director/control.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/ctrl_with_items.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -15,6 +18,7 @@ module WXRuby3
         super
         if spec.module_name == 'wxControlWithItems'
           spec.items.replace %w[wxControlWithItems wxItemContainer wxItemContainerImmutable]
+          spec.no_proxy 'wxControlWithItems'
           spec.fold_bases('wxControlWithItems' => %w[wxItemContainer wxItemContainerImmutable])
           spec.override_inheritance_chain('wxControlWithItems',
                                           %w[wxControl

data/rakelib/lib/director/cursor.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -17,7 +20,8 @@ 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[])'
+        spec.ignore 'wxCursor::wxCursor(const char[],int,int,int,int,const char[])',
+                    'wxCursor::wxCursor(const char *const *)'
         # ignore stock object (see RubyStockObjects.i)
         spec.ignore %w[wxSTANDARD_CURSOR wxHOURGLASS_CURSOR wxCROSS_CURSOR]
         super

data/rakelib/lib/director/data_format.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/data_object.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/data_object_simple_base.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -102,8 +105,7 @@ module WXRuby3
               }
               else
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError, 
-                                                           "get_data_here should return a string, or nil on failure");
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, "get_data_here should return a string, or nil on failure");
               }
             }
             else

data/rakelib/lib/director/date_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'
@@ -98,7 +101,7 @@ module WXRuby3
             {
                 if (ruby_value == Qnil)
                 {
-                    return new wxDateTime();
+                    return new wxDateTime(wxDefaultDateTime.GetValue());
                 }
                 else
                 {
@@ -130,6 +133,10 @@ module WXRuby3
             __HEREDOC
         elsif spec.module_name == 'wxCalendarEvent'
           spec.override_inheritance_chain('wxCalendarEvent', 'wxDateEvent', {'wxCommandEvent' => 'wxEvent'}, 'wxEvent', 'wxObject', doc_override: false)
+          spec.ignore 'wxCalendarEvent::SetWeekDay' # only internal use; saves us from exposing/mapping wxDateTime::WeekDay
+          spec.map 'wxDateTime::WeekDay' => 'Integer' do
+            map_out code: '$result = INT2NUM(static_cast<int> ($1));'
+          end
           # inconsistent definitions
           spec.add_swig_code %Q{%constant wxEventType wxEVT_CALENDAR = wxEVT_CALENDAR_DOUBLECLICKED;}
         end

data/rakelib/lib/director/date_picker_ctrl.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/dc.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -13,11 +16,18 @@ module WXRuby3
 
       def setup
         super
+        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
         # as we cannot capture their deletion in anyway this would leave the tracked items
         # registered and reused when future stack allocated DC's happen to have the same address
         spec.gc_as_untracked
+        spec.regard 'wxFontMetrics::height',
+                    'wxFontMetrics::ascent',
+                    'wxFontMetrics::descent',
+                    'wxFontMetrics::internalLeading',
+                    'wxFontMetrics::externalLeading',
+                    'wxFontMetrics::averageWidth'
         spec.ignore [
           'wxDC::GetPartialTextExtents',
           'wxDC::DrawLines(const wxPointList *,wxCoord,wxCoord)',
@@ -26,6 +36,12 @@ 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.rename_for_ruby({
           'GetDimensions' => 'wxDC::GetSize(wxCoord *, wxCoord *) const',
@@ -47,6 +63,8 @@ module WXRuby3
             return rb_result;
           }
           __HEREDOC
+        # for GetUserScale and GetLogicalScale
+        spec.map_apply 'double * OUTPUT' => 'double *'
         spec.swig_import 'swig/classes/include/wxGDICommon.h'
       end
     end # class DC

data/rakelib/lib/director/defs.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Defs director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/derived_dc.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -179,7 +182,7 @@ module WXRuby3
               }
               return rc;
             }
-            static VALUE draw_on(wxWindow* tgt, wxBitmap &buffer=wxNullBitmap, int style=wxBUFFER_CLIENT_AREA)
+            static VALUE draw_on(wxWindow* tgt, wxBitmap &buffer, int style=wxBUFFER_CLIENT_AREA)
             {
               if (!wxRuby_IsAppRunning()) 
                 rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
@@ -275,6 +278,28 @@ module WXRuby3
           # 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
+          unless Config.platform == :linux
+            spec.add_extend_code 'wxGCDC', <<~__HEREDOC
+              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 ())
+                {
+                  // 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(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;
+              }
+              __HEREDOC
+          end
           spec.add_extend_code 'wxGCDC', <<~__HEREDOC
             static VALUE draw_on(const wxWindowDC& dc)
             {
@@ -312,24 +337,6 @@ module WXRuby3
               }
               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 ())
-              {
-                // 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(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(wxGraphicsContext* gc)
             {
               if (!wxRuby_IsAppRunning())